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

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 13:47:51
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/rhythmbox

Modified: PKGBUILD (1.34 -> 1.35) rhythmbox.install (1.13 -> 1.14)

upgpkg: rhythmbox 0.10.0-2
Move


-------------------+
 PKGBUILD          |   35 +++++++++++++++++------------------
 rhythmbox.install |   16 +++++++++-------
 2 files changed, 26 insertions(+), 25 deletions(-)


Index: extra/gnome/rhythmbox/PKGBUILD
diff -u extra/gnome/rhythmbox/PKGBUILD:1.34 extra/gnome/rhythmbox/PKGBUILD:1.35
--- extra/gnome/rhythmbox/PKGBUILD:1.34	Mon Apr  2 12:26:08 2007
+++ extra/gnome/rhythmbox/PKGBUILD	Sun Apr 22 13:47:51 2007
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD,v 1.34 2007/04/02 16:26:08 jgc Exp $
+# $Id: PKGBUILD,v 1.35 2007/04/22 17:47:51 jgc Exp $
 # Maintainer: arjan <arjan at archlinux.org>
  
 pkgname=rhythmbox
 pkgver=0.10.0
-pkgrel=1
+pkgrel=2
 pkgdesc="An iTunes-like music player/libary"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.rhythmbox.org"
-depends=( 'libgpod>=0.4.2' 'libsoup>=2.2.100' 'gnome-media>=2.18.0'
-          'totem-plparser>=2.18.0' 'musicbrainz>=2.1.4' 'python>=2.5'
-	  'libsexy>=0.1.11' 'gstreamer0.10-mad' 'nautilus-cd-burner>=2.18.0')
-makedepends=('perlxml' 'pkgconfig' 'lirc-utils')
+depends=( 'libgpod>=0.4.2-2' 'libsoup>=2.2.100-2' 'gnome-media>=2.18.0-2'
+          'totem-plparser>=2.18.1-2' 'musicbrainz>=2.1.4' 'python>=2.5'
+	  'libsexy>=0.1.11' 'gstreamer0.10-mad' 'nautilus-cd-burner>=2.18.1')
+makedepends=('perlxml' 'pkgconfig' 'lirc-utils' 'scrollkeeper' 'desktop-file-utils')
 options=('nolibtool')
 install=rhythmbox.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.10/${pkgname}-${pkgver}.tar.bz2)
@@ -20,22 +20,21 @@
 build() {
   export MAKEFLAGS="-j1"
   cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/opt/gnome \
-	--with-cd-burner\
-	--with-playback=gstreamer-0-10 --enable-daap \
-	--with-mdns=avahi --disable-scrollkeeper \
-	--enable-python --disable-static
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --libexecdir=/usr/lib/rhythmbox \
+              --localstatedir=/var --disable-static \
+	      --with-cd-burner \
+	      --with-playback=gstreamer-0-10 --enable-daap \
+              --with-mdns=avahi --disable-scrollkeeper \
+              --enable-python
   
   make || return 1
   make 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/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/
-  
   # fix missing artdisplay artwork
-  install -m 644 ${startdir}/src/${pkgname}-${pkgver}/plugins/artdisplay/rhythmbox-missing-artwork.svg ${startdir}/pkg/opt/gnome/lib/rhythmbox/plugins/artdisplay/
+  install -m 644 plugins/artdisplay/rhythmbox-missing-artwork.svg ${startdir}/pkg/usr/lib/rhythmbox/plugins/artdisplay/
 }
Index: extra/gnome/rhythmbox/rhythmbox.install
diff -u extra/gnome/rhythmbox/rhythmbox.install:1.13 extra/gnome/rhythmbox/rhythmbox.install:1.14
--- extra/gnome/rhythmbox/rhythmbox.install:1.13	Wed Feb 21 10:12:43 2007
+++ extra/gnome/rhythmbox/rhythmbox.install	Sun Apr 22 13:47:51 2007
@@ -1,8 +1,8 @@
 pkgname=rhythmbox
 
 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 -f -q -t usr/share/icons/hicolor
@@ -19,8 +19,8 @@
 }
 
 pre_upgrade() {
-  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
 }
@@ -30,14 +30,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() {