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

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 11:18:02
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/banshee

Modified: PKGBUILD (1.14 -> 1.15) banshee.install (1.5 -> 1.6)

upgpkg: banshee 0.12.1-1
Move to /usr


-----------------+
 PKGBUILD        |   19 +++++++++----------
 banshee.install |   12 +++++++-----
 2 files changed, 16 insertions(+), 15 deletions(-)


Index: extra/gnome/banshee/PKGBUILD
diff -u extra/gnome/banshee/PKGBUILD:1.14 extra/gnome/banshee/PKGBUILD:1.15
--- extra/gnome/banshee/PKGBUILD:1.14	Mon Apr  9 16:16:07 2007
+++ extra/gnome/banshee/PKGBUILD	Sun Apr 22 11:18:01 2007
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD,v 1.14 2007/04/09 20:16:07 jgc Exp $
+# $Id: PKGBUILD,v 1.15 2007/04/22 15:18:01 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=banshee
@@ -9,11 +9,11 @@
 url="http://banshee-project.org/"
 license=(MIT)
 depends=('hal>=0.5.9' 'gnome-sharp>=2.16.0' 'musicbrainz>=2.1.4-2'
-	 'nautilus-cd-burner>=2.18.0' 'sqlite3' 'gstreamer0.10-faac'
+	 'nautilus-cd-burner>=2.18.1' 'sqlite3' 'gstreamer0.10-faac'
 	 'gstreamer0.10-faad' 'gstreamer0.10-gconf' 'gstreamer0.10-ogg'
 	 'gstreamer0.10-vorbis' 'gstreamer0.10-cdparanoia'
 	 'gstreamer0.10-gnomevfs' 'ipod-sharp>=0.6.3' 'njb-sharp>=0.3.0'
-	 'totem-plparser>=2.18.1')
+	 'totem-plparser>=2.18.1-2')
 makedepends=('perlxml' 'pkgconfig')
 options=('nolibtool')
 install=banshee.install
@@ -25,18 +25,17 @@
   mkdir -p "${MONO_SHARED_DIR}"
   export MAKEFLAGS="-j1"
   cd ${startdir}/src/${pkgname}-${pkgver}
-  LD_PRELOAD="" ./configure --prefix=/opt/gnome \
+  LD_PRELOAD="" ./configure --prefix=/usr \
+        --sysconfdir=/etc --localstatedir=/var \
 	--disable-helix --enable-ipod --enable-njb --disable-docs \
 	--with-gstreamer-0-10 --disable-static
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
   rm -rf "${MONO_SHARED_DIR}"
-  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
 
-  rm -f ${startdir}/pkg/opt/gnome/lib/banshee/Banshee.Dap/libnjbglue.a
+  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
 
-  mkdir -p ${startdir}/pkg/usr/share
-  mv ${startdir}/pkg/opt/gnome/share/icons ${startdir}/pkg/usr/share/
+  rm -f ${startdir}/pkg/usr/lib/banshee/Banshee.Dap/libnjbglue.a
 }
Index: extra/gnome/banshee/banshee.install
diff -u extra/gnome/banshee/banshee.install:1.5 extra/gnome/banshee/banshee.install:1.6
--- extra/gnome/banshee/banshee.install:1.5	Fri Feb  9 06:04:53 2007
+++ extra/gnome/banshee/banshee.install	Sun Apr 22 11:18:01 2007
@@ -1,8 +1,8 @@
 pkgname=banshee
 
 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
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
@@ -16,14 +16,16 @@
 }
 
 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() {