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

[Jan de Groot]

    Date: Friday, September 21, 2007 @ 17:32:09
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gnome-media

Modified: PKGBUILD (1.31 -> 1.32) gnome-media.install (1.9 -> 1.10)

upgpkg: gnome-media 2.20.1-1
GNOME 2.20


---------------------+
 PKGBUILD            |   26 +++++++++++---------------
 gnome-media.install |   17 +++--------------
 2 files changed, 14 insertions(+), 29 deletions(-)


Index: extra/gnome/gnome-media/PKGBUILD
diff -u extra/gnome/gnome-media/PKGBUILD:1.31 extra/gnome/gnome-media/PKGBUILD:1.32
--- extra/gnome/gnome-media/PKGBUILD:1.31	Sun Apr 22 12:01:57 2007
+++ extra/gnome/gnome-media/PKGBUILD	Fri Sep 21 17:32:09 2007
@@ -1,35 +1,31 @@
-# $Id: PKGBUILD,v 1.31 2007/04/22 16:01:57 jgc Exp $
+# $Id: PKGBUILD,v 1.32 2007/09/21 21:32:09 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-media
-pkgver=2.18.0
-pkgrel=2
+pkgver=2.20.1
+pkgrel=1
 pkgdesc="GNOME Media Tools"
 arch=(i686 x86_64)
 license=(GPL)
-depends=('libgnomeui>=2.18.1-2' 'gstreamer0.10-gconf' 'gstreamer0.10-base'
+depends=('libgnomeui>=2.20.0' 'gstreamer0.10-gconf' 'gstreamer0.10-base'
 	 'gstreamer0.10-flac' 'gstreamer0.10-ogg'
 	 'gstreamer0.10-vorbis' 'gstreamer0.10-good'
-	 'gstreamer0.10-cdparanoia' 'scrollkeeper')
-makedepends=('perlxml' 'pkgconfig')
+	 'gstreamer0.10-cdparanoia')
+makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.12.0')
 url="http://www.gnome.org"
 groups=('gnome')
-options=('nolibtool')
+options=('!libtool' '!emptydirs')
 install=gnome-media.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('a472d8c7733b119376bc6127ee55a82d')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.20/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('75036a6990725c4323812afd4cd734f5')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-
-  if [ -f omf.make ]; then
-    find . -name Makefile.in -exec sed -i -e 's/-scrollkeeper-update.*//' {} \;
-    sed -i -e 's/-scrollkeeper-update.*//' omf.make
-  fi
   ./configure --prefix=/usr --sysconfdir=/etc \
               --libexecdir=/usr/lib/gnome-media \
               --localstatedir=/var --disable-static \
-	      --enable-gstreamer=0.10 --disable-gnomecd
+	      --enable-gstreamer=0.10 --disable-gnomecd \
+	      --disable-scrollkeeper
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
   
Index: extra/gnome/gnome-media/gnome-media.install
diff -u extra/gnome/gnome-media/gnome-media.install:1.9 extra/gnome/gnome-media/gnome-media.install:1.10
--- extra/gnome/gnome-media/gnome-media.install:1.9	Sun Apr 22 12:01:57 2007
+++ extra/gnome/gnome-media/gnome-media.install	Fri Sep 21 17:32:09 2007
@@ -1,9 +1,7 @@
 pkgname=gnome-media
 
 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}
 }
 
 pre_upgrade() {
@@ -15,20 +13,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() {
-  scrollkeeper-update -q -p var/lib/scrollkeeper
+  /bin/true
 }
 
 op=$1