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

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 11:56:23
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/totem

Modified: PKGBUILD (1.49 -> 1.50) totem.install (1.14 -> 1.15)

upgpkg: totem 2.18.1-2
Move to /usr


---------------+
 PKGBUILD      |   36 ++++++++++++++++++------------------
 totem.install |   12 +++++++-----
 2 files changed, 25 insertions(+), 23 deletions(-)


Index: extra/gnome/totem/PKGBUILD
diff -u extra/gnome/totem/PKGBUILD:1.49 extra/gnome/totem/PKGBUILD:1.50
--- extra/gnome/totem/PKGBUILD:1.49	Sun Apr  8 17:20:18 2007
+++ extra/gnome/totem/PKGBUILD	Sun Apr 22 11:56:23 2007
@@ -1,33 +1,36 @@
-# $Id: PKGBUILD,v 1.49 2007/04/08 21:20:18 jgc Exp $
+# $Id: PKGBUILD,v 1.50 2007/04/22 15:56:23 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=totem
 pkgver=2.18.1
-pkgrel=1
+pkgrel=2
 url="http://www.hadess.net/totem.php3"
 pkgdesc="A GNOME2 integrated movie player based on Gstreamer."
 arch=(i686 x86_64)
-depends=('gstreamer0.10-gconf' 'gstreamer0.10-base' "totem-plparser>=${pkgver}" 'gnome-desktop>=2.18.0' 'libxxf86vm' 'libxtst')
+depends=('gstreamer0.10-gconf' 'gstreamer0.10-base' "totem-plparser>=${pkgver}" 'gnome-desktop>=2.18.1' 'libxxf86vm' 'libxtst' 'scrollkeeper' 'desktop-file-utils')
 options=('nolibtool')
-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-xine')
+groups=('gnome-extra')
 install=totem.install
 source=(http://ftp.gnome.org/pub/gnome/sources/totem/2.18/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('c8faa37112cfd2edfebdd1df88519f36')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
   [ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.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 --disable-lirc \
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --libexecdir=/usr/lib/totem \
+              --localstatedir=/var --disable-static \
+	      --disable-lirc \
 	      --enable-nautilus --enable-gstreamer \
-	      --enable-mozilla --with-dbus --disable-static \
+	      --enable-mozilla --with-dbus \
 	      --disable-scrollkeeper --disable-vanity
   make || return 1
   
@@ -37,15 +40,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/totem.install
diff -u extra/gnome/totem/totem.install:1.14 extra/gnome/totem/totem.install:1.15
--- extra/gnome/totem/totem.install:1.14	Thu Feb  1 17:51:56 2007
+++ extra/gnome/totem/totem.install	Sun Apr 22 11:56:23 2007
@@ -1,8 +1,8 @@
 pkgname=totem
 
 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
@@ -25,14 +25,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() {