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

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 12:25:37
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gnome-netstatus

Modified: PKGBUILD (1.13 -> 1.14) gnome-netstatus.install (1.5 -> 1.6)

upgpkg: gnome-netstatus 2.12.1-2
Move to /usr


-------------------------+
 PKGBUILD                |   27 +++++++++++++--------------
 gnome-netstatus.install |   18 +++++++-----------
 2 files changed, 20 insertions(+), 25 deletions(-)


Index: extra/gnome/gnome-netstatus/PKGBUILD
diff -u extra/gnome/gnome-netstatus/PKGBUILD:1.13 extra/gnome/gnome-netstatus/PKGBUILD:1.14
--- extra/gnome/gnome-netstatus/PKGBUILD:1.13	Tue Feb 13 06:14:20 2007
+++ extra/gnome/gnome-netstatus/PKGBUILD	Sun Apr 22 12:25:37 2007
@@ -1,36 +1,35 @@
-# $Id: PKGBUILD,v 1.13 2007/02/13 11:14:20 jgc Exp $
+# $Id: PKGBUILD,v 1.14 2007/04/22 16:25:37 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-netstatus
 pkgver=2.12.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A GNOME applet that shows network status"
 arch=(i686 x86_64)
+license=('GPL')
 url="http://www.gnome.org"
-depends=('gnome-panel>=2.16.2')
-makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils')
+depends=('gnome-panel>=2.18.1' 'scrollkeeper')
+makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.10.3')
 groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.12/${pkgname}-${pkgver}.tar.bz2)
 install=gnome-netstatus.install
 md5sums=('8651ca1694a6c222ae5cad6e21814d24')
 
 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
+    find . -name Makefile.in -exec sed -i -e 's/-scrollkeeper-update.*//' {} \;
     sed -i -e 's/-scrollkeeper-update.*//' omf.make
   fi
 
-  ./configure --prefix=/opt/gnome --disable-scrollkeeper --disable-static
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --libexecdir=/usr/lib/gnome-netstatus \
+              --localstatedir=/var --disable-static \
+	      --disable-scrollkeeper
   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/
-
-  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/gnome-netstatus/gnome-netstatus.install
diff -u extra/gnome/gnome-netstatus/gnome-netstatus.install:1.5 extra/gnome/gnome-netstatus/gnome-netstatus.install:1.6
--- extra/gnome/gnome-netstatus/gnome-netstatus.install:1.5	Tue Feb 13 06:14:20 2007
+++ extra/gnome/gnome-netstatus/gnome-netstatus.install	Sun Apr 22 12:25:37 2007
@@ -1,12 +1,9 @@
 pkgname=gnome-netstatus
 
 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
-
-  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 --makefile-install-rule usr/share/gconf/schemas/${pkgname}.schemas >/dev/null
 
   scrollkeeper-update -q -p var/lib/scrollkeeper
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
@@ -21,18 +18,17 @@
 }
 
 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`
-
-  opt/gnome/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
+  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
 
-  opt/gnome/bin/gconftool-2 --config-source="${GCONF_CONFIG_SOURCE}" --direct --unload \
-	opt/gnome/etc/gconf/schemas/panel-default-setup.entries >/dev/null
+  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
 }
 
 post_remove() {