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

[Jan de Groot]

    Date: Sunday, September 23, 2007 @ 16:27:39
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/rhythmbox

Modified: PKGBUILD (1.38 -> 1.39) rhythmbox.install (1.15 -> 1.16)

upgpkg: rhythmbox 0.11.2-2
GNOME 2.20


-------------------+
 PKGBUILD          |   24 ++++++++++--------------
 rhythmbox.install |   21 +++------------------
 2 files changed, 13 insertions(+), 32 deletions(-)


Index: extra/gnome/rhythmbox/PKGBUILD
diff -u extra/gnome/rhythmbox/PKGBUILD:1.38 extra/gnome/rhythmbox/PKGBUILD:1.39
--- extra/gnome/rhythmbox/PKGBUILD:1.38	Sat Aug 11 23:16:59 2007
+++ extra/gnome/rhythmbox/PKGBUILD	Sun Sep 23 16:27:38 2007
@@ -1,28 +1,24 @@
-# $Id: PKGBUILD,v 1.38 2007/08/12 03:16:59 aaron Exp $
+# $Id: PKGBUILD,v 1.39 2007/09/23 20:27:38 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
  
-# 0.10.1-2 : libgpod soname bump - aaron
-
 pkgname=rhythmbox
-pkgver=0.10.1
+pkgver=0.11.2
 pkgrel=2
-force=y
 pkgdesc="An iTunes-like music player/libary"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.rhythmbox.org"
-depends=( 'libgpod>=0.5.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'
-	  'gstreamer0.10-gnomevfs')
-makedepends=('perlxml' 'pkgconfig' 'lirc-utils' 'scrollkeeper' 'desktop-file-utils')
-options=('!libtool')
+depends=( 'libgpod>=0.5.2' 'libsoup>=2.2.100-2' 'gnome-media>=2.20.0'
+          'totem-plparser>=2.20.0' 'musicbrainz>=2.1.4' 'python>=2.5'
+	  'libsexy>=0.1.11' 'gstreamer0.10-mad' 'nautilus-cd-burner>=2.20.0'
+	  'gstreamer0.10-gnomevfs' 'desktop-file-utils')
+makedepends=('perlxml' 'pkgconfig' 'lirc-utils' 'gnome-doc-utils>=0.12.0') 
+options=('!libtool' '!emptydirs')
 install=rhythmbox.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.10/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('6ab510d54654d2973f91b5d0de54f854')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.11/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('125440f92e5c64b530894c5f3ca9038b')
 
 build() {
-  #export MAKEFLAGS="-j1"
   cd ${startdir}/src/${pkgname}-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc \
               --libexecdir=/usr/lib/rhythmbox \
Index: extra/gnome/rhythmbox/rhythmbox.install
diff -u extra/gnome/rhythmbox/rhythmbox.install:1.15 extra/gnome/rhythmbox/rhythmbox.install:1.16
--- extra/gnome/rhythmbox/rhythmbox.install:1.15	Sat Aug 11 23:16:59 2007
+++ extra/gnome/rhythmbox/rhythmbox.install	Sun Sep 23 16:27:38 2007
@@ -1,9 +1,7 @@
 pkgname=rhythmbox
 
 post_install() {
-  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
+  usr/sbin/gconfpkg --install ${pkgname}
   update-desktop-database -q
   gtk-update-icon-cache -f -q -t usr/share/icons/hicolor
   cat << EOF
@@ -20,10 +18,7 @@
 }
 
 pre_upgrade() {
-  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
+  pre_remove
 }
 
 post_upgrade() {
@@ -31,21 +26,11 @@
 }
 
 pre_remove() {
-  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=`usr/bin/gconftool-2 --get-default-source`
-  
-  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
+  usr/sbin/gconfpkg --uninstall ${pkgname}
 }
 
 post_remove() {
   update-desktop-database -q
-  scrollkeeper-update -q -p var/lib/scrollkeeper
   gtk-update-icon-cache -f -q -t usr/share/icons/hicolor
 }