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

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 12:01:57
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gnome-media

Modified: PKGBUILD (1.30 -> 1.31) gnome-media.install (1.8 -> 1.9)

upgpkg: gnome-media 2.18.0-2
Move to /usr


---------------------+
 PKGBUILD            |   28 +++++++++++++++-------------
 gnome-media.install |   14 +++++++-------
 2 files changed, 22 insertions(+), 20 deletions(-)


Index: extra/gnome/gnome-media/PKGBUILD
diff -u extra/gnome/gnome-media/PKGBUILD:1.30 extra/gnome/gnome-media/PKGBUILD:1.31
--- extra/gnome/gnome-media/PKGBUILD:1.30	Mon Mar 19 18:31:50 2007
+++ extra/gnome/gnome-media/PKGBUILD	Sun Apr 22 12:01:57 2007
@@ -1,37 +1,39 @@
-# $Id: PKGBUILD,v 1.30 2007/03/19 22:31:50 jgc Exp $
-# Maintainer: arjan <arjan at archlinux.org>
+# $Id: PKGBUILD,v 1.31 2007/04/22 16:01:57 jgc Exp $
+# Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-media
 pkgver=2.18.0
-pkgrel=1
+pkgrel=2
 pkgdesc="GNOME Media Tools"
 arch=(i686 x86_64)
-depends=('libgnomeui>=2.18.1' 'gstreamer0.10-gconf' 'gstreamer0.10-base'
+license=(GPL)
+depends=('libgnomeui>=2.18.1-2' 'gstreamer0.10-gconf' 'gstreamer0.10-base'
 	 'gstreamer0.10-flac' 'gstreamer0.10-ogg'
 	 'gstreamer0.10-vorbis' 'gstreamer0.10-good'
-	 'gstreamer0.10-cdparanoia')
-makedepends=('perlxml')
+	 'gstreamer0.10-cdparanoia' 'scrollkeeper')
+makedepends=('perlxml' 'pkgconfig')
 url="http://www.gnome.org"
 groups=('gnome')
 options=('nolibtool')
-license=(GPL)
 install=gnome-media.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('a472d8c7733b119376bc6127ee55a82d')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
   cd ${startdir}/src/${pkgname}-${pkgver}
 
-  find . -name Makefile.in -exec sed -i -e 's/-scrollkeeper-update.*//' {} \;
   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=/opt/gnome --enable-gstreamer=0.10 --disable-gnomecd --disable-static
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --libexecdir=/usr/lib/gnome-media \
+              --localstatedir=/var --disable-static \
+	      --enable-gstreamer=0.10 --disable-gnomecd
   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/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/gnome/gnome-media/gnome-media.install
diff -u extra/gnome/gnome-media/gnome-media.install:1.8 extra/gnome/gnome-media/gnome-media.install:1.9
--- extra/gnome/gnome-media/gnome-media.install:1.8	Sun Mar 19 07:15:02 2006
+++ extra/gnome/gnome-media/gnome-media.install	Sun Apr 22 12:01:57 2007
@@ -1,10 +1,9 @@
 pkgname=gnome-media
 
 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
 }
 
 pre_upgrade() {
@@ -16,18 +15,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
 }