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

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 11:58:15
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/totem-xine

Modified: PKGBUILD (1.23 -> 1.24) totem.install (1.9 -> 1.10)

upgpkg: totem-xine 2.18.1-2
Move to /usr


---------------+
 PKGBUILD      |   35 +++++++++++++++++------------------
 totem.install |   10 ++++++----
 2 files changed, 23 insertions(+), 22 deletions(-)


Index: extra/gnome/totem-xine/PKGBUILD
diff -u extra/gnome/totem-xine/PKGBUILD:1.23 extra/gnome/totem-xine/PKGBUILD:1.24
--- extra/gnome/totem-xine/PKGBUILD:1.23	Sun Apr  8 17:27:05 2007
+++ extra/gnome/totem-xine/PKGBUILD	Sun Apr 22 11:58:15 2007
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD,v 1.23 2007/04/08 21:27:05 jgc Exp $
+# $Id: PKGBUILD,v 1.24 2007/04/22 15:58:15 jgc Exp $
 # Maintainer: Arjan Timmerman <arjan at archlinux.org>
 # Committer: Dale Blount <dale at archlinux.org>
 
 pkgname=totem-xine
 pkgver=2.18.1
-pkgrel=1
+pkgrel=2
 url="http://www.hadess.net/totem.php3"
 pkgdesc="A GNOME2 integrated movie player based on Xine"
-depends=("totem-plparser>=${pkgver}" 'xine-lib>=1.1.4' 'gnome-desktop>=2.18.0' 'libxxf86vm' 'libxtst')
+depends=("totem-plparser>=${pkgver}" 'xine-lib>=1.1.4' 'gnome-desktop>=2.18.1' 'libxxf86vm' 'libxtst' 'desktop-file-utils' 'scrollkeeper')
 options=('nolibtool')
 arch=(i686 x86_64)
-license=(GPL)
-makedepends=('perlxml' 'nautilus>=2.18.0' 'xulrunner>=1.8.1' 'pkgconfig')
+license=('GPL')
+makedepends=('perlxml' 'nautilus>=2.18.1' 'xulrunner>=1.8.1' 'pkgconfig')
 conflicts=('totem')
 provides=('totem')
 install=totem.install
@@ -19,19 +19,21 @@
 md5sums=('c8faa37112cfd2edfebdd1df88519f36')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
   [ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
 
   cd ${startdir}/src/totem-${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 --disable-lirc \
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --libexecdir=/usr/lib/totem \
+	      --localstatedir=/var --disable-static \
+	      --disable-lirc \
 	      --enable-nautilus --enable-xine \
 	      --enable-mozilla --with-dbus --disable-static \
-	      --disable-scrollkeeper --disable-vanity
+	      --disable-scrollkeeper
   make || return 1
   
   sed -i -e 's/SUBDIRS = backend plparse/SUBDIRS = backend/' src/Makefile
@@ -40,15 +42,12 @@
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 \
        DESTDIR=${startdir}/pkg install
 
-  rm -f ${startdir}/pkg/opt/gnome/share/totem/vanity.*
-  rm -f ${startdir}/pkg/opt/gnome/share/pixmaps/vanity.png
+  rm -f ${startdir}/pkg/usr/share/totem/vanity.*
+  rm -f ${startdir}/pkg/usr/share/pixmaps/vanity.png
 
-  rm -rf ${startdir}/pkg/opt/gnome/lib/mozilla
+  rm -rf ${startdir}/pkg/usr/lib/mozilla
 
-  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/gnome/totem-xine/totem.install
diff -u extra/gnome/totem-xine/totem.install:1.9 extra/gnome/totem-xine/totem.install:1.10
--- extra/gnome/totem-xine/totem.install:1.9	Sun Apr  8 17:27:06 2007
+++ extra/gnome/totem-xine/totem.install	Sun Apr 22 11:58:15 2007
@@ -1,8 +1,8 @@
 pkgname=totem-xine
 
 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,14 +17,16 @@
 }
 
 pre_remove() {
+  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
+    schemas=(usr/share/gconf/schemas/${pkgname}.schemas)
   if [ -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() {