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

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 11:29:58
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/bug-buddy

Modified: PKGBUILD (1.22 -> 1.23) bug-buddy.install (1.6 -> 1.7)

upgpkg: bug-buddy 2.18.1-2
Move to /usr


-------------------+
 PKGBUILD          |   24 ++++++++++--------------
 bug-buddy.install |   16 +++++++---------
 2 files changed, 17 insertions(+), 23 deletions(-)


Index: extra/gnome/bug-buddy/PKGBUILD
diff -u extra/gnome/bug-buddy/PKGBUILD:1.22 extra/gnome/bug-buddy/PKGBUILD:1.23
--- extra/gnome/bug-buddy/PKGBUILD:1.22	Mon Apr  9 07:53:10 2007
+++ extra/gnome/bug-buddy/PKGBUILD	Sun Apr 22 11:29:58 2007
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD,v 1.22 2007/04/09 11:53:10 jgc Exp $
-# Maintainer: arjan <arjan at archlinux.org>
+# $Id: PKGBUILD,v 1.23 2007/04/22 15:29:58 jgc Exp $
+# Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=bug-buddy
 pkgver=2.18.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A bug reporting tool for GNOME"
 arch=(i686 x86_64)
 install=bug-buddy.install
-depends=('gnome-menus>=2.18.0' 'gnome-desktop>=2.18.0' 'evolution-data-server>=1.10.0' 'libgtop>=2.14.8')
-makedepends=('perlxml' 'gnome-doc-utils>=0.10.1' 'pkgconfig')
+depends=('gnome-menus>=2.18.0-2' 'gnome-desktop>=2.18.1' 'evolution-data-server>=1.10.1-2' 'libgtop>=2.14.8-2')
+makedepends=('perlxml' 'pkgconfig')
 groups=('gnome-extra')
 license=(GPL)
 url="http://www.gnome.org"
@@ -16,17 +16,13 @@
 md5sums=('ebeaeee4acc1432b59a4ef242abff620')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
-
   cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/opt/gnome --disable-scrollkeeper
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --localstatedir=/var
   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/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/bug-buddy/bug-buddy.install
diff -u extra/gnome/bug-buddy/bug-buddy.install:1.6 extra/gnome/bug-buddy/bug-buddy.install:1.7
--- extra/gnome/bug-buddy/bug-buddy.install:1.6	Fri Feb  2 12:03:42 2007
+++ extra/gnome/bug-buddy/bug-buddy.install	Sun Apr 22 11:29:58 2007
@@ -1,10 +1,8 @@
 pkgname=bug-buddy
 
 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
-  scrollkeeper-update -q -p var/lib/scrollkeeper
-  update-desktop-database -q
+  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
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
@@ -17,19 +15,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
 }