[arch-commits] Commit in gnome-bluetooth (3 files)

[Giovanni Scafora]

    Date: Tuesday, November 4, 2008 @ 04:23:08
  Author: giovanni
Revision: 18340

Merged revisions 18134 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/gnome-bluetooth/trunk

........
  r18134 | giovanni | 2008-11-03 13:29:47 +0100 (lun, 03 nov 2008) | 2 lines
  
  upgpkg: gnome-bluetooth 0.11.0-2
      Rebuilt against python 2.6
........

Modified:
  gnome-bluetooth/repos/testing-i686/	(properties)
  gnome-bluetooth/repos/testing-i686/PKGBUILD
  gnome-bluetooth/trunk/PKGBUILD

-----------------------------+
 repos/testing-i686/PKGBUILD |   19 +++++++++++--------
 trunk/PKGBUILD              |    2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)


Property changes on: gnome-bluetooth/repos/testing-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /gnome-bluetooth/trunk:1-14873
   + /gnome-bluetooth/trunk:1-18339

Modified: repos/testing-i686/PKGBUILD
===================================================================
--- repos/testing-i686/PKGBUILD	2008-11-04 07:32:39 UTC (rev 18339)
+++ repos/testing-i686/PKGBUILD	2008-11-04 09:23:08 UTC (rev 18340)
@@ -8,7 +8,7 @@
 arch=('i686' 'x86_64')
 url="http://www.usefulinc.com/software/gnome-bluetooth/"
 license=('GPL' 'LGPL')
-depends=('libbtctl>=0.10.0-2' 'libgnomeui>=2.22.1'
+depends=('libbtctl>=0.9.0' 'libgnomeui>=2.18.1-2' 'gconf>=2.18.0.1-4'
          'desktop-file-utils')
 makedepends=('gob2' 'intltool' 'python>=2.5' 'pygtk')
 options=('!libtool' '!emptydirs')
@@ -17,15 +17,18 @@
 md5sums=('5447739dfd687b3b5a075df9bac092e1')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${startdir}/src/${pkgname}-${pkgver}
   aclocal || return 1
   automake || return 1
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  sed -e 's|^pythondir = /usr|pythondir = |' \
+      -e 's|^pydir = /usr|pydir = |' \
+      -i src/Makefile
   make || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
      
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas" || return 1
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" \
-    ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+  mkdir -p ${startdir}/pkg/usr/share/gconf/schemas
+  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas \
+    ${startdir}/pkg/etc/gconf/schemas/*.schemas
+  rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
 }

Modified: trunk/PKGBUILD
===================================================================
--- trunk/PKGBUILD	2008-11-04 07:32:39 UTC (rev 18339)
+++ trunk/PKGBUILD	2008-11-04 09:23:08 UTC (rev 18340)
@@ -3,7 +3,7 @@
 
 pkgname=gnome-bluetooth
 pkgver=0.11.0
-pkgrel=2
+pkgrel=3
 pkgdesc="The GNOME Bluetooth Subsystem."
 arch=('i686' 'x86_64')
 url="http://www.usefulinc.com/software/gnome-bluetooth/"