[arch-commits] CVS update of extra/multimedia/sound-juicer (2 files)

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 12:04:01
  Author: jgc
    Path: /home/cvs-extra/extra/multimedia/sound-juicer

Modified: PKGBUILD (1.36 -> 1.37) sound-juicer.install (1.8 -> 1.9)

upgpkg: sound-juicer 2.16.4-1
Move to /usr


----------------------+
 PKGBUILD             |   29 ++++++++++++++---------------
 sound-juicer.install |   14 +++++++-------
 2 files changed, 21 insertions(+), 22 deletions(-)


Index: extra/multimedia/sound-juicer/PKGBUILD
diff -u extra/multimedia/sound-juicer/PKGBUILD:1.36 extra/multimedia/sound-juicer/PKGBUILD:1.37
--- extra/multimedia/sound-juicer/PKGBUILD:1.36	Thu Feb  1 17:51:43 2007
+++ extra/multimedia/sound-juicer/PKGBUILD	Sun Apr 22 12:04:01 2007
@@ -1,32 +1,31 @@
-# $Id: PKGBUILD,v 1.36 2007/02/01 22:51:43 jgc Exp $
-# Maintainer: Arjan Timmerman <arjan at soulfly.nl>
+# $Id: PKGBUILD,v 1.37 2007/04/22 16:04:01 jgc Exp $
+# Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributer: Ben <contrasutra at myrealbox.com>
 
 pkgname=sound-juicer
-pkgver=2.16.3
+pkgver=2.16.4
 pkgrel=1
 pkgdesc="A cd ripper application"
 arch=(i686 x86_64)
-depends=('taglib' 'libcdio' 'musicbrainz' 'gnome-media>=2.16.0' 'gstreamer0.10-cdparanoia' 'gstreamer0.10-gnomevfs')
-makedepends=('perlxml' 'gnome-doc-utils' 'pkgconfig')
+license=('GPL')
+depends=('taglib' 'libcdio>=0.78' 'musicbrainz>=2.1.4-2' 'gnome-media>=2.18.0-2'
+         'gstreamer0.10-cdparanoia' 'gstreamer0.10-gnomevfs' 'nautilus-cd-burner>=2.18.1')
+makedepends=('perlxml' 'gnome-doc-utils>=0.10.3' 'pkgconfig')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.16/${pkgname}-${pkgver}.tar.bz2)
 groups=('gnome-extra')
-license=(GPL)
 install=sound-juicer.install
 url="http://www.burtonini.com/cgi/pyblosxom.cgi/computers"
-md5sums=('cfe4199f4f50c2a8f8178db4097209e4')
+md5sums=('bcf1f77027b1d1d4c1667b20c6448122')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
   cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/opt/gnome --enable-hal --disable-scrollkeeper
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --localstatedir=/var --enable-hal \
+	      --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/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/multimedia/sound-juicer/sound-juicer.install
diff -u extra/multimedia/sound-juicer/sound-juicer.install:1.8 extra/multimedia/sound-juicer/sound-juicer.install:1.9
--- extra/multimedia/sound-juicer/sound-juicer.install:1.8	Thu Feb  1 17:51:43 2007
+++ extra/multimedia/sound-juicer/sound-juicer.install	Sun Apr 22 12:04:01 2007
@@ -1,10 +1,9 @@
 pkgname=sound-juicer
 
 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
 }