summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMeno Abels2017-03-11 13:06:49 +0100
committerMeno Abels2017-03-11 13:06:49 +0100
commit210f26b3415634f5e731f7629799752fc0bccf4d (patch)
treeb3d63a6a0b60126f25add5c58b75fd4f306e9db5
parentdba214d37f6ecacaa29e6399ece441c1dedd1128 (diff)
parent8a882849b1d610475a8844b9fd3e7873dd655fc4 (diff)
downloadaur-210f26b3415634f5e731f7629799752fc0bccf4d.tar.gz
Merge branch 'master' of ssh://aur.archlinux.org/gnupg-clavator
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD14
2 files changed, 7 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 82d00f134dab..bd62030e4622 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -28,13 +28,6 @@ pkgbase = gnupg-clavator
depends = readline
depends = pinentry
provides = gnupg=2.1.16-quick-keytocard
- provides = dirmngr
- conflicts = gnupg2
- conflicts = gnupg
- conflicts = dirmngr
- replaces = gnupg2
- replaces = gnupg
- replaces = dirmngr
source = git://github.com/mabels/gnupg.git
sha1sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index a32828a867e6..616e1d86f563 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,8 +14,8 @@ depends=('libldap' 'curl' 'bzip2' 'zlib' 'libksba>=1.2' 'libgpg-error' 'libgcryp
license=('GPL')
url="http://www.gnupg.org/"
makedepends=('git' 'ghostscript' 'transfig' 'automake')
-provides=("gnupg=${pkgver}" 'dirmngr')
-conflicts=('gnupg2' 'gnupg' 'dirmngr')
+#provides=("gnupg=${pkgver}" 'dirmngr')
+#conflicts=('gnupg2' 'gnupg' 'dirmngr')
install=${pkgname}.install
source=("git://github.com/mabels/gnupg.git#branch=quick-keytocard")
sha1sums=('SKIP')
@@ -30,13 +30,13 @@ pkgver() {
build() {
cd "$_gitname"
+ echo "2.1-clavator" > VERSION
./autogen.sh --force
-
+ echo "2.1-clavator" > VERSION
./configure \
--enable-maintainer-mode \
- --prefix=/usr \
- --libexecdir=/usr/lib/gnupg
-
+ --prefix=/usr/local
+ echo "2.1-clavator" > VERSION
make
}
@@ -44,7 +44,7 @@ package() {
cd "$_gitname"
make DESTDIR=${pkgdir} install
- ln -s gpg2 "$pkgdir/usr/bin/gpg"
+#ln -s gpg2 "$pkgdir/usr/bin/gpg"
}
# vim: ft=sh syn=sh et sw=2