[arch-commits] Commit in gnome-bluetooth/repos (2 files)

[Giovanni Scafora]

    Date: Tuesday, November 4, 2008 @ 04:26:31
  Author: giovanni
Revision: 18341

Merged revisions 18134,18340 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
................
  r18340 | giovanni | 2008-11-04 10:23:08 +0100 (mar, 04 nov 2008) | 10 lines
  
  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-x86_64/	(properties)
  gnome-bluetooth/repos/testing-x86_64/PKGBUILD

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


Property changes on: gnome-bluetooth/repos/testing-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /gnome-bluetooth/trunk:1-12620
   + /gnome-bluetooth/trunk:1-18340

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2008-11-04 09:23:08 UTC (rev 18340)
+++ testing-x86_64/PKGBUILD	2008-11-04 09:26:31 UTC (rev 18341)
@@ -3,12 +3,12 @@
 
 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/"
 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
 }