[arch-commits] CVS update of unstable/gnome/gnome-system-tools (3 files)
Jan de Groot
jgc at archlinux.org
Wed May 30 21:20:35 UTC 2007
Date: Wednesday, May 30, 2007 @ 17:20:35
Author: jgc
Path: /home/cvs-unstable/unstable/gnome/gnome-system-tools
Added: gst-docs.patch (1.1)
Modified: PKGBUILD (1.4 -> 1.5) gnome-system-tools.install (1.1 -> 1.2)
upgpkg: gnome-system-tools 2.14.0-3
Fix build with latest gnome-doc-utils, move to /usr
----------------------------+
PKGBUILD | 22 ++++++++-------
gnome-system-tools.install | 42 ++++++++++--------------------
gst-docs.patch | 60 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 86 insertions(+), 38 deletions(-)
Index: unstable/gnome/gnome-system-tools/PKGBUILD
diff -u unstable/gnome/gnome-system-tools/PKGBUILD:1.4 unstable/gnome/gnome-system-tools/PKGBUILD:1.5
--- unstable/gnome/gnome-system-tools/PKGBUILD:1.4 Sun Feb 18 01:17:45 2007
+++ unstable/gnome/gnome-system-tools/PKGBUILD Wed May 30 17:20:35 2007
@@ -1,30 +1,32 @@
# Contributor: Mario A. Vazquez <mario_vazq at hotmail.com>
pkgname=gnome-system-tools
pkgver=2.14.0
-pkgrel=2
+pkgrel=3
pkgdesc="Gnome System Configuration Utilities"
arch=(i686 x86_64)
url="http://www.gnome.org/projects/gst/"
license=(GPL)
-options=(NOLIBTOOL)
-depends=('libgnomeui>=2.9.0' 'libglade>=2.4.0' 'gconf>=2.2.0' 'system-tools-backends>=1.1.92')
-makedepends=('intltool' 'sed')
+options=('!libtool')
+depends=('libgnomeui>=2.18.1-2' 'libglade>=2.6.0' 'gconf>=2.18.0-2' 'system-tools-backends>=1.2.0-2')
+makedepends=('perlxml' 'sed' 'gnome-doc-utils')
install=gnome-system-tools.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/2.14/$pkgname-$pkgver.tar.bz2 )
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/2.14/$pkgname-$pkgver.tar.bz2
+ gst-docs.patch)
md5sums=('3aded3a37f4f5b4962bf253d25cebea1')
build() {
-[ "$GNOMEDIR" = "" ] && source /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
+ patch -Np0 -i ${startdir}/src/gst-docs.patch || return 1
- ./configure --prefix=/opt/gnome --disable-network --enable-boot --disable-scrollkeeper
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-network --enable-boot --disable-scrollkeeper --disable-static
make || return 1
-
make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=$startdir/pkg install
-}
+ 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: unstable/gnome/gnome-system-tools/gnome-system-tools.install
diff -u unstable/gnome/gnome-system-tools/gnome-system-tools.install:1.1 unstable/gnome/gnome-system-tools/gnome-system-tools.install:1.2
--- unstable/gnome/gnome-system-tools/gnome-system-tools.install:1.1 Sun Oct 23 09:19:42 2005
+++ unstable/gnome/gnome-system-tools/gnome-system-tools.install Wed May 30 17:20:35 2007
@@ -1,21 +1,10 @@
pkgname=gnome-system-tools
post_install() {
- schemas=(`pacman -Ql $pkgname | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`)
- scrolls=(`pacman -Ql $pkgname | grep 'share/omf/.*\.omf$' | awk '{ print $2 }'`)
-
- export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
- for schema in "${schemas[@]}" ; do
- opt/gnome/bin/gconftool-2 --makefile-install-rule "$schema" >/dev/null 2>&1
- done
-
- for scroll in "${scrolls[@]}" ; do
- scrollkeeper-install -q -p var/lib/scrollkeeper "$scroll"
- done
-
- kill -s HUP `pidof /opt/gnome/bin/gconfd-2` > /dev/null 2>&1
+ 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
- update-mime-database opt/gnome/share/mime > /dev/null 2>&1
}
pre_upgrade() {
@@ -27,24 +16,21 @@
}
pre_remove() {
- schemas=(`pacman -Ql $pkgname | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`)
- scrolls=(`pacman -Ql $pkgname | grep 'share/omf/.*\.omf$' | awk '{ print $2 }'`)
-
- export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
- for schema in "${schemas[@]}" ; do
- opt/gnome/bin/gconftool-2 --makefile-uninstall-rule "$schema" >/dev/null 2>&1
- done
-
- for scroll in "${scrolls[@]}" ; do
- scrollkeeper-uninstall -q -p var/lib/scrollkeeper "$scroll"
- done
-
- kill -s HUP `pidof /opt/gnome/bin/gconfd-2` >/dev/null 2>&1
+ 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
}
post_remove() {
update-desktop-database -q
- update-mime-database opt/gnome/share/mime > /dev/null 2>&1
+ scrollkeeper-update -q -p var/lib/scrollkeeper
}
op=$1
Index: unstable/gnome/gnome-system-tools/gst-docs.patch
diff -u /dev/null unstable/gnome/gnome-system-tools/gst-docs.patch:1.1
--- /dev/null Wed May 30 17:20:35 2007
+++ unstable/gnome/gnome-system-tools/gst-docs.patch Wed May 30 17:20:35 2007
@@ -0,0 +1,60 @@
+diff -ru doc.old/network/C/network-admin.xml doc/network/C/network-admin.xml
+--- doc.old/network/C/network-admin.xml 2006-03-13 16:05:19.000000000 +0000
++++ doc/network/C/network-admin.xml 2007-05-30 21:13:38.000000000 +0000
+@@ -32,7 +32,7 @@
+ </copyright>
+ -->
+
+- <publisher>
++ <publisher role="maintainer">
+ <publishername>Carlos Garnacho Parro</publishername>
+ </publisher>
+
+diff -ru doc.old/services/C/services-admin.xml doc/services/C/services-admin.xml
+--- doc.old/services/C/services-admin.xml 2006-03-13 16:05:20.000000000 +0000
++++ doc/services/C/services-admin.xml 2007-05-30 21:14:02.000000000 +0000
+@@ -32,7 +32,7 @@
+ </copyright>
+ -->
+
+- <publisher>
++ <publisher role="maintainer">
+ <publishername>Carlos Garnacho Parro</publishername>
+ </publisher>
+
+diff -ru doc.old/time/C/time-admin.xml doc/time/C/time-admin.xml
+--- doc.old/time/C/time-admin.xml 2006-03-13 16:05:21.000000000 +0000
++++ doc/time/C/time-admin.xml 2007-05-30 21:14:33.000000000 +0000
+@@ -32,7 +32,7 @@
+ </copyright>
+ -->
+
+- <publisher>
++ <publisher role="maintainer">
+ <publishername>Carlos Garnacho Parro</publishername>
+ </publisher>
+
+diff -ru doc.old/users/C/users-admin.xml doc/users/C/users-admin.xml
+--- doc.old/users/C/users-admin.xml 2006-03-13 16:05:22.000000000 +0000
++++ doc/users/C/users-admin.xml 2007-05-30 21:14:48.000000000 +0000
+@@ -32,7 +32,7 @@
+ </copyright>
+ -->
+
+- <publisher>
++ <publisher role="maintainer">
+ <publishername>Carlos Garnacho Parro</publishername>
+ </publisher>
+
+diff -ur doc.old/boot/C/boot-admin.xml doc/boot/C/boot-admin.xml
+--- doc.old/boot/C/boot-admin.xml 2006-03-13 16:05:17.000000000 +0000
++++ doc/boot/C/boot-admin.xml 2007-05-30 21:16:12.000000000 +0000
+@@ -32,7 +32,7 @@
+ </copyright>
+ -->
+
+- <publisher>
++ <publisher role="maintainer">
+ <publishername>Carlos Garnacho Parro</publishername>
+ </publisher>
+
More information about the arch-commits
mailing list