[arch-commits] Commit in gconf/repos (3 files)

[Jan de Groot]

    Date: Friday, December 26, 2008 @ 08:57:57
  Author: jgc
Revision: 22335

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

........
  r22334 | jgc | 2008-12-26 13:57:46 +0000 (Fri, 26 Dec 2008) | 2 lines
  
  upgpkg: gconf 2.24.0-2
      Remove bashisms from gconfpkg
........

Modified:
  gconf/repos/extra-i686/	(properties)
  gconf/repos/extra-i686/PKGBUILD
  gconf/repos/extra-i686/gconfpkg

----------+
 PKGBUILD |   18 +++++++++---------
 gconfpkg |    8 ++++----
 2 files changed, 13 insertions(+), 13 deletions(-)


Property changes on: gconf/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /gconf/trunk:1-13038
   + /gconf/trunk:1-22334

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-12-26 13:57:46 UTC (rev 22334)
+++ extra-i686/PKGBUILD	2008-12-26 13:57:57 UTC (rev 22335)
@@ -3,7 +3,7 @@
 
 pkgname=gconf
 pkgver=2.24.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A configuration database system"
 arch=(i686 x86_64)
 license=('LGPL')
@@ -18,22 +18,22 @@
 	gconf-reload.patch)
 md5sums=('4971d96f5ba94fe4a69396267bd5afe8'
          '1412bafb06f7d8a9601c8f1c4d72cc06'
-         '0a43077786fe85ee10002b753752379a'
+         'b745f04b4121d8724c002b14a4c110b6'
          'cfcc8e15be7b8a48de4aa34336ff6090')
 
 build() {
-  cd ${startdir}/src/GConf-${pkgver}
-  patch -Np1 -i ${startdir}/src/gconf-reload.patch || return 1
+  cd "${srcdir}/GConf-${pkgver}"
+  patch -Np1 -i "${srcdir}/gconf-reload.patch" || return 1
   libtoolize --force --copy || return 1
   aclocal || return 1
   autoconf || return 1
   automake --add-missing || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --libexecdir=/usr/lib/GConf \
-	      --disable-static || return 1
+	      --disable-static --enable-defaults-service || return 1
   make pkglibdir=/usr/lib/GConf || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
-  install -m755 ${startdir}/src/gconf-merge-schema ${startdir}/pkg/usr/bin/ || return 1
-  install -d -m755 ${startdir}/pkg/usr/sbin
-  install -m755 ${startdir}/src/gconfpkg ${startdir}/pkg/usr/sbin/ || return 1
+  make DESTDIR="${pkgdir}" install || return 1
+  install -m755 "${srcdir}/gconf-merge-schema" "${pkgdir}/usr/bin/" || return 1
+  install -d -m755 "${pkgdir}/usr/sbin"
+  install -m755 "${srcdir}/gconfpkg" "${pkgdir}/usr/sbin/" || return 1
 }

Modified: extra-i686/gconfpkg
===================================================================
--- extra-i686/gconfpkg	2008-12-26 13:57:46 UTC (rev 22334)
+++ extra-i686/gconfpkg	2008-12-26 13:57:57 UTC (rev 22335)
@@ -22,14 +22,14 @@
 
 uninstall() {
   if [ -f /usr/share/gconf/schemas/${pkgname}.schemas ]; then
-    schemas=(/usr/share/gconf/schemas/${pkgname}.schemas)
+    schemas=/usr/share/gconf/schemas/${pkgname}.schemas
   elif [ -f /opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
-    schemas=(/opt/gnome/share/gconf/schemas/${pkgname}.schemas)
+    schemas=/opt/gnome/share/gconf/schemas/${pkgname}.schemas
   else
-    schemas=(`pacman -Ql ${pkgname} | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`)
+    schemas=`pacman -Ql ${pkgname} | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`
   fi
   GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
-      /usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
+      /usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas} >/dev/null
 }
 
 if [ -z "$2" ]; then