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

[Jan de Groot]

    Date: Friday, September 21, 2007 @ 17:25:58
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gnome-panel

Modified: PKGBUILD (1.43 -> 1.44) gnome-panel.install (1.15 -> 1.16)

upgpkg: gnome-panel 2.20.0.1-1
GNOME 2.20


---------------------+
 PKGBUILD            |   23 +++++++++--------------
 gnome-panel.install |   11 ++++-------
 2 files changed, 13 insertions(+), 21 deletions(-)


Index: extra/gnome/gnome-panel/PKGBUILD
diff -u extra/gnome/gnome-panel/PKGBUILD:1.43 extra/gnome/gnome-panel/PKGBUILD:1.44
--- extra/gnome/gnome-panel/PKGBUILD:1.43	Sat Jul  7 06:33:42 2007
+++ extra/gnome/gnome-panel/PKGBUILD	Fri Sep 21 17:25:58 2007
@@ -1,34 +1,29 @@
-# $Id: PKGBUILD,v 1.43 2007/07/07 10:33:42 jgc Exp $
+# $Id: PKGBUILD,v 1.44 2007/09/21 21:25:58 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-panel
-pkgver=2.18.3
+pkgver=2.20.0.1
 pkgrel=1
 pkgdesc="The GNOME Panel"
-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' 'gconf>=2.18.0.1-4')
 arch=(i686 x86_64)
-makedepends=('perlxml' 'gnome-doc-utils>=0.10.3' 'pkgconfig')
-options=('!libtool')
+license=('GPL')
 url="http://www.gnome.org"
+depends=('libwnck>=2.20.0' 'gnome-menus>=2.20.0' 'evolution-data-server>=1.12.0' 'gnome-desktop>=2.20.0')
+makedepends=('perlxml' 'gnome-doc-utils>=0.12.0' 'pkgconfig')
+options=('!libtool')
 groups=('gnome')
-license=('GPL')
 install=gnome-panel.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('545348de234fa8222e328fa7f3a5ba71')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.20/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('bead455015de6bd86bb7259e6276af9e')
 
 build() {
   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=/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
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install || return 1
 
   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
Index: extra/gnome/gnome-panel/gnome-panel.install
diff -u extra/gnome/gnome-panel/gnome-panel.install:1.15 extra/gnome/gnome-panel/gnome-panel.install:1.16
--- extra/gnome/gnome-panel/gnome-panel.install:1.15	Sat Jul  7 06:33:42 2007
+++ extra/gnome/gnome-panel/gnome-panel.install	Fri Sep 21 17:25:58 2007
@@ -1,12 +1,11 @@
 pkgname=gnome-panel
 
 post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
+  GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
   usr/bin/gconftool-2 --config-source="${GCONF_CONFIG_SOURCE}" --direct --load \
 	etc/gconf/schemas/panel-default-setup.entries >/dev/null
+  usr/sbin/gconfpkg --install ${pkgname}
 
-  scrollkeeper-update -q -p var/lib/scrollkeeper
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
@@ -19,9 +18,7 @@
 }
 
 pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-
-  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
+  GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
   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
@@ -29,10 +26,10 @@
     usr/bin/gconftool-2 --config-source="${GCONF_CONFIG_SOURCE}" --direct --unload \
         etc/gconf/schemas/panel-default-setup.entries > /dev/null
   fi
+  usr/sbin/gconfpkg --uninstall ${pkgname}
 }
 
 post_remove() {
-  scrollkeeper-update -q -p var/lib/scrollkeeper
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }