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

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 12:45:04
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/xchat-gnome

Modified: PKGBUILD (1.11 -> 1.12) xchat-gnome.install (1.4 -> 1.5)

upgpkg: xchat-gnome 0.17-1
Move to /usr


---------------------+
 PKGBUILD            |   29 +++++++++++++----------------
 xchat-gnome.install |   14 +++++++-------
 2 files changed, 20 insertions(+), 23 deletions(-)


Index: extra/gnome/xchat-gnome/PKGBUILD
diff -u extra/gnome/xchat-gnome/PKGBUILD:1.11 extra/gnome/xchat-gnome/PKGBUILD:1.12
--- extra/gnome/xchat-gnome/PKGBUILD:1.11	Mon Mar 26 17:26:54 2007
+++ extra/gnome/xchat-gnome/PKGBUILD	Sun Apr 22 12:45:03 2007
@@ -1,32 +1,29 @@
-# $Id: PKGBUILD,v 1.11 2007/03/26 21:26:54 jgc Exp $
+# $Id: PKGBUILD,v 1.12 2007/04/22 16:45:03 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=xchat-gnome
-pkgver=0.16
+pkgver=0.17
 pkgrel=1
 pkgdesc="GNOME frontend to the popular X-Chat IRC client."
 arch=(i686 x86_64)
 license=('GPL')
 url="http://xchat-gnome.navi.cx/"
 options=('nolibtool')
-depends=('libgnomeui>=2.18.1' 'libsexy>=0.1.10')
-makedepends=('gettext' 'perlxml' 'python' 'tcl' 'libnotify')
+depends=('libgnomeui>=2.18.1-2' 'libsexy>=0.1.11' 'scrollkeeper')
+makedepends=('gettext' 'perlxml' 'python' 'tcl' 'libnotify' 'gnome-doc-utils>=0.10.3')
 install=xchat-gnome.install
-source=(http://releases.navi.cx/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('f2c74958829c5d5b64f33f949e02d808')
+source=(http://releases.navi.cx/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('bcb8e97a63c0fda6fcba0f88309ea645')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/opt/gnome \
-    --enable-ipv6 --enable-shm \
-    --disable-gtkfe --disable-scrollkeeper \
-    --disable-static
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --localstatedir=/var --disable-static \
+	      --enable-ipv6 --enable-shm \
+	      --disable-gtkfe --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/xchat-gnome/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/xchat-gnome/xchat-gnome.install
diff -u extra/gnome/xchat-gnome/xchat-gnome.install:1.4 extra/gnome/xchat-gnome/xchat-gnome.install:1.5
--- extra/gnome/xchat-gnome/xchat-gnome.install:1.4	Mon Mar 26 17:26:54 2007
+++ extra/gnome/xchat-gnome/xchat-gnome.install	Sun Apr 22 12:45:04 2007
@@ -1,10 +1,9 @@
 pkgname=xchat-gnome
 
 post_install() {
-  export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
-  opt/gnome/bin/gconftool-2 --makefile-install-rule opt/gnome/share/gconf/schemas/${pkgname}.schemas >/dev/null
+  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
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
@@ -17,18 +16,19 @@
 }
 
 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`
+  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
 }
 
 post_remove() {
-  update-desktop-database -q
   scrollkeeper-update -q -p var/lib/scrollkeeper
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }