[arch-commits] CVS update of extra/gnome/control-center (2 files)

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 11:11:43
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/control-center

Modified: PKGBUILD (1.39 -> 1.40) control-center.install (1.9 -> 1.10)

upgpkg: control-center 2.18.1-1
Move to /usr


------------------------+
 PKGBUILD               |   37 +++++++++++++++++--------------------
 control-center.install |   12 +++++++-----
 2 files changed, 24 insertions(+), 25 deletions(-)


Index: extra/gnome/control-center/PKGBUILD
diff -u extra/gnome/control-center/PKGBUILD:1.39 extra/gnome/control-center/PKGBUILD:1.40
--- extra/gnome/control-center/PKGBUILD:1.39	Mon Mar 19 15:12:43 2007
+++ extra/gnome/control-center/PKGBUILD	Sun Apr 22 11:11:43 2007
@@ -1,43 +1,40 @@
-# $Id: PKGBUILD,v 1.39 2007/03/19 19:12:43 jgc Exp $
-# Maintainer: arjan <arjan at archlinux.org>
+# $Id: PKGBUILD,v 1.40 2007/04/22 15:11:43 jgc Exp $
+# Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=control-center
-pkgver=2.18.0
+pkgver=2.18.1
 pkgrel=1
 pkgdesc="The Control Center for GNOME"
 arch=(i686 x86_64)
-depends=('libgnomekbd>=2.18.0' 'metacity>=2.18.0' 'nautilus>=2.18.0.1' 'gstreamer0.10-base>=0.10.12' 'libxxf86misc' 'libxss' 'gnome-panel>=2.18.0')
+depends=('libgnomekbd>=2.18.1-2' 'metacity>=2.18.2-2' 'nautilus>=2.18.1' 'gstreamer0.10-base>=0.10.12' 'libxxf86misc' 'libxss' 'gnome-panel>=2.18.1' 'scrollkeeper' 'desktop-file-utils')
 makedepends=('perlxml' 'gnome-doc-utils' 'pkgconfig')
 url="http://www.gnome.org"
-groups=(gnome)
+groups=('gnome')
 install=control-center.install
-license=(GPL)
+license=('GPL')
 options=('nolibtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2
         control-center-2.10.1-mark-tool-buttons-important.patch)
-md5sums=('e5251c30c45577b78770beb2df59df5d' 'e32426c4bc73689ee81c87101e3f4b74')
+md5sums=('bae0fd0f9e32f374bd7236d98788b13f' 'e32426c4bc73689ee81c87101e3f4b74')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
-
-
   cd ${startdir}/src/${pkgname}-${pkgver}
-  sed -i -e 's|/usr/bin/bzip2|/bin/bzip2|g' capplets/theme-switcher/gnome-theme-installer.c
   patch -Np1 -i ${startdir}/src/control-center-2.10.1-mark-tool-buttons-important.patch || return 1
   
   # Don't generate files which are generated in postinstall
   sed -i -e '/update-desktop-database/d' vfs-methods/*/Makefile.*
 
-  ./configure --prefix=/opt/gnome --enable-gstreamer=0.10 \
-              --enable-aboutme --disable-scrollkeeper \
-	      --disable-update-mimedb --disable-static
+  # Fix bug with gnome-doc-utils 0.10.2
+  sed -i -e 's/@ENABLE_SK_TRUE at _s/_s/' help/Makefile.in
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --libexecdir=/usr/bin \
+              --localstatedir=/var --disable-static \
+	      --enable-gstreamer=0.10 --enable-aboutme \
+	      --disable-scrollkeeper --disable-update-mimedb
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
 
-  mkdir -p ${startdir}/pkg/usr/share
-  mv ${startdir}/pkg/opt/gnome/share/icons ${startdir}/pkg/usr/share/icons
-
-  mkdir -p ${startdir}/pkg/opt/gnome/share/gconf/schemas
-  gconf-merge-schema ${startdir}/pkg/opt/gnome/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/opt/gnome/etc/gconf/schemas/*.schemas
-  rm -f ${startdir}/pkg/opt/gnome/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
 }
Index: extra/gnome/control-center/control-center.install
diff -u extra/gnome/control-center/control-center.install:1.9 extra/gnome/control-center/control-center.install:1.10
--- extra/gnome/control-center/control-center.install:1.9	Thu Feb  1 13:52:48 2007
+++ extra/gnome/control-center/control-center.install	Sun Apr 22 11:11:43 2007
@@ -1,8 +1,8 @@
 pkgname=control-center
 
 post_install() {
-  export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
-  opt/gnome/bin/gconftool-2 --makefile-install-rule opt/gnome/share/gconf/schemas/${pkgname}.schemas >/dev/null
+  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
+  usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/${pkgname}.schemas >/dev/null
   scrollkeeper-update -q -p var/lib/scrollkeeper
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
@@ -17,14 +17,16 @@
 }
 
 pre_remove() {
-  if [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
+  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
+    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)
   else
     schemas=(`pacman -Ql $pkgname | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`)
   fi
-  export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
+  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
   
-  opt/gnome/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
+  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
 }
 
 post_remove() {