[arch-commits] CVS update of extra/gnome/gnome-netstatus (2 files)
Jan de Groot
jgc at archlinux.org
Sun Sep 23 12:43:10 UTC 2007
Date: Sunday, September 23, 2007 @ 08:43:10
Author: jgc
Path: /home/cvs-extra/extra/gnome/gnome-netstatus
Modified: PKGBUILD (1.15 -> 1.16) gnome-netstatus.install (1.6 -> 1.7)
upgpkg: gnome-netstatus 2.12.1-4
GNOME 2.20
-------------------------+
PKGBUILD | 14 +++++---------
gnome-netstatus.install | 19 ++-----------------
2 files changed, 7 insertions(+), 26 deletions(-)
Index: extra/gnome/gnome-netstatus/PKGBUILD
diff -u extra/gnome/gnome-netstatus/PKGBUILD:1.15 extra/gnome/gnome-netstatus/PKGBUILD:1.16
--- extra/gnome/gnome-netstatus/PKGBUILD:1.15 Mon Apr 23 11:45:42 2007
+++ extra/gnome/gnome-netstatus/PKGBUILD Sun Sep 23 08:43:09 2007
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD,v 1.15 2007/04/23 15:45:42 jgc Exp $
+# $Id: PKGBUILD,v 1.16 2007/09/23 12:43:09 jgc Exp $
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=gnome-netstatus
pkgver=2.12.1
-pkgrel=3
+pkgrel=4
pkgdesc="A GNOME applet that shows network status"
arch=(i686 x86_64)
license=('GPL')
url="http://www.gnome.org"
-depends=('gnome-panel>=2.18.1' 'scrollkeeper')
-makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.10.3')
+depends=('gnome-panel>=2.20.0')
+makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.12.0')
+options=(!emptydirs)
groups=('gnome-extra')
source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.12/${pkgname}-${pkgver}.tar.bz2)
install=gnome-netstatus.install
@@ -17,11 +18,6 @@
build() {
cd ${startdir}/src/${pkgname}-${pkgver}
- 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=/usr --sysconfdir=/etc \
--libexecdir=/usr/lib/gnome-netstatus \
--localstatedir=/var --disable-static \
Index: extra/gnome/gnome-netstatus/gnome-netstatus.install
diff -u extra/gnome/gnome-netstatus/gnome-netstatus.install:1.6 extra/gnome/gnome-netstatus/gnome-netstatus.install:1.7
--- extra/gnome/gnome-netstatus/gnome-netstatus.install:1.6 Sun Apr 22 12:25:37 2007
+++ extra/gnome/gnome-netstatus/gnome-netstatus.install Sun Sep 23 08:43:10 2007
@@ -1,11 +1,7 @@
pkgname=gnome-netstatus
post_install() {
- 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
+ usr/sbin/gconfpkg --install ${pkgname}
gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
}
@@ -18,21 +14,10 @@
}
pre_remove() {
- 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=`usr/bin/gconftool-2 --get-default-source`
-
- usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
+ usr/sbin/gconfpkg --install ${pkgname}
}
post_remove() {
- scrollkeeper-update -q -p var/lib/scrollkeeper
gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
}
More information about the arch-commits
mailing list