aboutsummaryrefslogtreecommitdiffstats
path: root/git-rediff
diff options
context:
space:
mode:
authorMattias Andrée <m@maandree.se>2026-09-22 20:57:52 +0200
committerMattias Andrée <m@maandree.se>2026-09-22 20:57:52 +0200
commit24403502251b8fb786e87c9f733603399852f49f (patch)
treeb7d19d605efe27ea6bd3eb599d1e501ba36cc42c /git-rediff
parentUpdate librecrypt to version 1.1.1.1 (diff)
downloadaur-packages-24403502251b8fb786e87c9f733603399852f49f.tar.gz
aur-packages-24403502251b8fb786e87c9f733603399852f49f.tar.bz2
aur-packages-24403502251b8fb786e87c9f733603399852f49f.tar.xz
Update git-rediff to version 1.1HEADmaster
Signed-off-by: Mattias Andrée <m@maandree.se>
Diffstat (limited to 'git-rediff')
-rw-r--r--git-rediff/PKGBUILD9
1 files changed, 7 insertions, 2 deletions
diff --git a/git-rediff/PKGBUILD b/git-rediff/PKGBUILD
index 0067eb4..e14940c 100644
--- a/git-rediff/PKGBUILD
+++ b/git-rediff/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se>
pkgname=git-rediff
-pkgver=1.0.5
+pkgver=1.1
pkgrel=1
pkgdesc='Reduce partially resolved merge conflicts'
url='https://codeberg.org/maandree/git-rediff'
@@ -10,13 +10,18 @@ license=('custom:ISC')
depends=(diffutils libsimple)
makedepends=(libsimple)
source=($pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz)
-sha256sums=(73c73757388344fa03d7e0d7315b24ce4e7bd9e85a3b7d48353823305cad9243)
+sha256sums=(364999ef8f438f5e43e9fbce3f3594e8543ca78967276369bea850a493daad42)
build () {
cd "$srcdir/git-rediff"
make PREFIX=/usr
}
+check () {
+ cd "$srcdir/git-rediff"
+ make PREFIX=/usr check
+}
+
package () {
cd "$srcdir/git-rediff"
make PREFIX=/usr DESTDIR="$pkgdir" install