[arch-commits] Commit in pinentry/repos (testing-x86_64 testing-x86_64/PKGBUILD)

[Allan McRae]

    Date: Friday, March 20, 2009 @ 23:30:21
  Author: allan
Revision: 30628

Merged revisions 30622 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/pinentry/trunk

........
  r30622 | hugo | 2009-03-21 02:59:29 +0000 (Sat, 21 Mar 2009) | 1 line
  
  upgpkg: pinentry 0.7.5-5
........

Modified:
  pinentry/repos/testing-x86_64/	(properties)
  pinentry/repos/testing-x86_64/PKGBUILD

----------+
 PKGBUILD |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)


Property changes on: pinentry/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /pinentry/trunk:1-29929
   + /pinentry/trunk:1-30626

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-03-21 03:30:06 UTC (rev 30627)
+++ testing-x86_64/PKGBUILD	2009-03-21 03:30:21 UTC (rev 30628)
@@ -2,9 +2,9 @@
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 pkgname=pinentry
 pkgver=0.7.5
-pkgrel=4
+pkgrel=5
 pkgdesc="a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.gnupg.org/aegypten2"
 depends=('ncurses' 'libcap>=2.16')
@@ -16,7 +16,7 @@
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
-  patch -Np1 -i ${srcdir}/glib2.patch
+  patch -Np1 -i ${srcdir}/glib2.patch || return 1
   [ "$QTDIR" = "" ] && source /etc/profile.d/qt3.sh
   ./configure --prefix=/usr \
 	--enable-pinentry-curses \
@@ -25,6 +25,10 @@
 	--enable-pinentry-qt \
 	--enable-fallback-curses
   make || return 1
-  make DESTDIR=$startdir/pkg install
-  rm ${pkgdir}/usr/share/info/dir
+  make DESTDIR=${pkgdir} install || return 1
+  rm ${pkgdir}/usr/share/info/dir || return 1
+  rm ${pkgdir}/usr/bin/pinentry || return 1
+  ln -s /usr/bin/pinentry-gtk-2 ${pkgdir}/usr/bin/pinentry || return 1
+
+  
 }