summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann Büchau2022-12-22 11:20:42 +0100
committerYann Büchau2022-12-22 11:20:42 +0100
commitb65a14179a65d7e2d4ebc0eb3a3edb75fb26c312 (patch)
tree51d239ea07ffb7a1d75959c598a4f80ba54e937b
parentfa18f150a939721240b62d8fe2e8b6720d9d5a56 (diff)
downloadaur-b65a14179a65d7e2d4ebc0eb3a3edb75fb26c312.tar.gz
🤷 Add -dev to pkgname as git-annex-git is already taken
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD11
2 files changed, 8 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6a63b6bc8b21..f867ac7504a4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = git-annex-git
+pkgbase = git-annex-dev-git
pkgdesc = Manage files with git, without checking their contents into git (dev version)
pkgver = 10.20221212.r24.gac6ccb513
pkgrel = 1
@@ -96,4 +96,4 @@ pkgbase = git-annex-git
source = git+https://git.joeyh.name/git/git-annex.git
sha512sums = SKIP
-pkgname = git-annex-git
+pkgname = git-annex-dev-git
diff --git a/PKGBUILD b/PKGBUILD
index e82b90a3d58e..c952d1a4d0fd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,15 +2,16 @@
# Contributor: Felix Yan <felixonmars@archlinux.org>
# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-pkgname=git-annex-git
+# pkgname git-annex-git already taken somehow and can't be adopted, so added this '-dev' bit...
+pkgname=git-annex-dev-git
pkgver=10.20221212.r24.gac6ccb513
pkgrel=1
pkgdesc="Manage files with git, without checking their contents into git (dev version)"
url="https://git-annex.branchable.com/"
license=("AGPL3")
arch=('x86_64')
-provides=("${pkgname%-git}")
-conflicts=("${pkgname%-git}" 'git-annex-standalone')
+provides=("${pkgname%-dev-git}")
+conflicts=("${pkgname%-dev-git}" 'git-annex-standalone')
depends=('git' 'lsof' 'rsync' 'ghc-libs' 'haskell-aeson' 'haskell-ansi-terminal' 'haskell-async'
'haskell-aws' 'haskell-blaze-builder' 'haskell-bloomfilter' 'haskell-byteable'
'haskell-case-insensitive' 'haskell-clientsession' 'haskell-concurrent-output'
@@ -36,7 +37,7 @@ source=("git+https://git.joeyh.name/git/git-annex.git")
sha512sums=('SKIP')
pkgver() {
- cd "$srcdir"/"${pkgname%-git}"
+ cd "$srcdir"/"${pkgname%-dev-git}"
git describe --long --tags --always | sed 's/^[^0-9]\+//g;s/\([^-]*-g\)/r\1/;s/-/./g'
}
@@ -49,7 +50,7 @@ prepare() {
build() {
cd git-annex
- sed -e 's|--ghc-options|-O --prefix=/usr --enable-executable-dynamic --disable-library-vanilla --docdir=/usr/share/doc/'${pkgname%-git}' --ghc-options|' \
+ sed -e 's|--ghc-options|-O --prefix=/usr --enable-executable-dynamic --disable-library-vanilla --docdir=/usr/share/doc/'${pkgname%-dev-git}' --ghc-options|' \
-i Makefile
make GHC="ghc -dynamic" BUILDER=./Setup BUILDEROPTIONS=$MAKEFLAGS
}