[arch-commits] Commit in dbus-qt3/repos (extra-i686 extra-i686/PKGBUILD)

[Jan de Groot]

    Date: Sunday, August 16, 2009 @ 16:58:20
  Author: jgc
Revision: 49910

Merged revisions 356,49852 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/dbus-qt3/trunk

........
  r356 | aaron | 2008-04-19 00:56:27 +0200 (Sat, 19 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r49852 | jgc | 2009-08-16 20:52:25 +0200 (Sun, 16 Aug 2009) | 2 lines
  
  upgpkg: dbus-qt3 0.62-4
      Rebuild to get rid of .FILELIST
........

Modified:
  dbus-qt3/repos/extra-i686/	(properties)
  dbus-qt3/repos/extra-i686/PKGBUILD

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


Property changes on: dbus-qt3/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /dbus-qt3/trunk:1
   + /dbus-qt3/trunk:1-49909

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-08-16 20:55:49 UTC (rev 49909)
+++ extra-i686/PKGBUILD	2009-08-16 20:58:20 UTC (rev 49910)
@@ -3,30 +3,30 @@
 
 pkgname=dbus-qt3
 pkgver=0.62
-pkgrel=3
+pkgrel=4
 pkgdesc="QT3 bindings for DBUS"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.freedesktop.org/software/dbus"
-depends=('qt3' 'dbus>=1.0.2')
+depends=('qt3' 'dbus-core>=1.2.14')
 makedepends=('pkgconfig')
 options=('!libtool')
 source=(ftp://ftp.archlinux.org/other/dbus/dbus-qt3_0.62.git.20060814.orig.tar.gz
-	dbus-qt3-compile-fix-thoenig-01.patch
-	dbus-qt3-do-not-close-shared-connection-thoenig-01.patch)
+        dbus-qt3-compile-fix-thoenig-01.patch
+        dbus-qt3-do-not-close-shared-connection-thoenig-01.patch)
 md5sums=('bdc61add46f64238fdc68a15e5f7269c'
          '6c7a45865568340ee601d31e184653c1'
          '9252c03a00d751201e53839d6a8ef78f')
 
 build() {
   . /etc/profile.d/qt3.sh
-  cd ${startdir}/src/${pkgname}-${pkgver}/qt3
-  patch -Np1 -i ${startdir}/src/dbus-qt3-compile-fix-thoenig-01.patch || return 1
-  patch -Np1 -i ${startdir}/src/dbus-qt3-do-not-close-shared-connection-thoenig-01.patch || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}/qt3"
+  patch -Np1 -i "${srcdir}/dbus-qt3-compile-fix-thoenig-01.patch" || return 1
+  patch -Np1 -i "${srcdir}/dbus-qt3-do-not-close-shared-connection-thoenig-01.patch" || return 1
   cd ..
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
   sed -e "s|DBUS_QT3_LIBS =|DBUS_QT3_LIBS = -L${QTDIR}/lib -lqt-mt|" \
       -i Makefile qt3/Makefile || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+  make DESTDIR="${pkgdir}" install || return 1
 }