[arch-commits] CVS update of extra/gnome/gnome-panel (PKGBUILD gnome-panel.install)

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 11:02:41
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gnome-panel

Modified: PKGBUILD (1.40 -> 1.41) gnome-panel.install (1.13 -> 1.14)

upgpkg: gnome-panel 2.18.1-1
Move to /usr


---------------------+
 PKGBUILD            |   26 ++++++++++++--------------
 gnome-panel.install |   23 +++++++++++++++--------
 2 files changed, 27 insertions(+), 22 deletions(-)


Index: extra/gnome/gnome-panel/PKGBUILD
diff -u extra/gnome/gnome-panel/PKGBUILD:1.40 extra/gnome/gnome-panel/PKGBUILD:1.41
--- extra/gnome/gnome-panel/PKGBUILD:1.40	Mon Mar 19 15:03:59 2007
+++ extra/gnome/gnome-panel/PKGBUILD	Sun Apr 22 11:02:41 2007
@@ -1,38 +1,36 @@
-# $Id: PKGBUILD,v 1.40 2007/03/19 19:03:59 jgc Exp $
+# $Id: PKGBUILD,v 1.41 2007/04/22 15:02:41 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-panel
-pkgver=2.18.0
+pkgver=2.18.1
 pkgrel=1
 pkgdesc="The GNOME Panel"
-depends=('libwnck>=2.18.0' 'gnome-menus>=2.18.0' 'evolution-data-server>=1.10.0' 'gnome-desktop>=2.18.0')
+depends=('libwnck>=2.18.0-2' 'gnome-menus>=2.18.0-2' 'evolution-data-server>=1.10.1-2' 'gnome-desktop>=2.18.1' 'scrollkeeper')
 arch=(i686 x86_64)
-makedepends=('perlxml' 'gnome-doc-utils' 'pkgconfig')
+makedepends=('perlxml' 'gnome-doc-utils>=0.10.3' 'pkgconfig')
 options=('nolibtool')
 url="http://www.gnome.org"
 groups=(gnome)
 license=(GPL)
 install=gnome-panel.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('67ab5a4df1817fe14572d9e366664665')
+md5sums=('6c325f5b5f9f424faa494665720bcfb9')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
-
   cd ${startdir}/src/${pkgname}-${pkgver}
   find . -name Makefile.in -exec sed -i -e 's/-scrollkeeper-update.*//' {} \;
   if [ -f omf.make ]; then
     sed -i -e 's/-scrollkeeper-update.*//' omf.make
   fi
  
-  ./configure --prefix=/opt/gnome --disable-scrollkeeper --disable-static
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --localstatedir=/var --disable-static \
+	      --libexecdir=/usr/lib/gnome-panel \
+	      --disable-scrollkeeper
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
 
-  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
-  mv ${startdir}/pkg/opt/gnome/share/icons ${startdir}/pkg/usr/share/
+  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/gnome-panel/gnome-panel.install
diff -u extra/gnome/gnome-panel/gnome-panel.install:1.13 extra/gnome/gnome-panel/gnome-panel.install:1.14
--- extra/gnome/gnome-panel/gnome-panel.install:1.13	Thu Feb  1 17:13:28 2007
+++ extra/gnome/gnome-panel/gnome-panel.install	Sun Apr 22 11:02:41 2007
@@ -1,12 +1,12 @@
 pkgname=gnome-panel
 
 post_install() {
-  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-install-rule opt/gnome/share/gconf/schemas/${pkgname}.schemas >/dev/null
+  usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/${pkgname}.schemas >/dev/null
 
-  opt/gnome/bin/gconftool-2 --config-source="${GCONF_CONFIG_SOURCE}" --direct --load \
-	opt/gnome/etc/gconf/schemas/panel-default-setup.entries >/dev/null
+  usr/bin/gconftool-2 --config-source="${GCONF_CONFIG_SOURCE}" --direct --load \
+	etc/gconf/schemas/panel-default-setup.entries >/dev/null
 
   scrollkeeper-update -q -p var/lib/scrollkeeper
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
@@ -21,18 +21,25 @@
 }
 
 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 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
 
-  opt/gnome/bin/gconftool-2 --config-source="${GCONF_CONFIG_SOURCE}" --direct --unload \
+  if [ -f opt/gnome/etc/gconf/schemas/panel-default-setup.entries ]; then
+    usr/bin/gconftool-2 --config-source="${GCONF_CONFIG_SOURCE}" --direct --unload \
 	opt/gnome/etc/gconf/schemas/panel-default-setup.entries >/dev/null
+  else
+   usr/bin/gconftool-2 --config-source="${GCONF_CONFIG_SOURCE}" --direct --unload \
+        etc/gconf/schemas/panel-default-setup.entries > /dev/null
+  fi
 }
 
 post_remove() {