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

[Jan de Groot]

    Date: Sunday, March 16, 2008 @ 10:42:22
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/totem

Modified: PKGBUILD (1.57 -> 1.58) totem.install (1.17 -> 1.18)

upgpkg: totem 2.22.0-1
    GNOME 2.22


---------------+
 PKGBUILD      |   26 +++++++++-----------------
 totem.install |    5 -----
 2 files changed, 9 insertions(+), 22 deletions(-)


Index: extra/gnome/totem/PKGBUILD
diff -u extra/gnome/totem/PKGBUILD:1.57 extra/gnome/totem/PKGBUILD:1.58
--- extra/gnome/totem/PKGBUILD:1.57	Thu Dec 27 10:44:36 2007
+++ extra/gnome/totem/PKGBUILD	Sun Mar 16 10:42:22 2008
@@ -1,39 +1,31 @@
-# $Id: PKGBUILD,v 1.57 2007/12/27 15:44:36 jgc Exp $
+# $Id: PKGBUILD,v 1.58 2008/03/16 14:42:22 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=totem
-pkgver=2.20.1
-pkgrel=3
+pkgver=2.22.0
+pkgrel=1
 url="http://www.hadess.net/totem.php3"
 pkgdesc="A GNOME2 integrated movie player based on Gstreamer."
 arch=(i686 x86_64)
 license=('GPL')
-depends=('gstreamer0.10-gconf' 'gstreamer0.10-base' 'totem-plparser>=2.21.6' 'gnome-desktop>=2.20.1' 'libxxf86vm' 'libxtst' 'desktop-file-utils')
-makedepends=('intltool' 'gnome-common' 'nautilus>=2.20.0' 'xulrunner>=1.8.1.11' 'pkgconfig' 'bluez-libs' 'lirc-utils' 'gnome-doc-utils' 'iso-codes' 'gnome-control-center')
+depends=('gstreamer0.10-gconf>=0.10.6' 'gstreamer0.10-base>=0.10.15' 'totem-plparser>=2.22.1' 'libxxf86vm' 'libxtst' 'desktop-file-utils' 'iso-codes' 'libepc>=0.3.4' 'python>=2.5' 'startup-notification' 'libgnomeui>=2.22.01')
+makedepends=('perlxml' 'nautilus>=2.22.0' 'xulrunner>=1.8.1.12' 'pkgconfig' 'bluez-libs' 'lirc-utils' 'gnome-doc-utils>=0.12.2' 'gnome-control-center>=2.22.0' 'libtracker')
 options=('!libtool' '!emptydirs')
 conflicts=('totem-xine')
 groups=('gnome-extra')
 install=totem.install
-source=(http://ftp.gnome.org/pub/gnome/sources/totem/2.20/${pkgname}-${pkgver}.tar.bz2
-	totem-plparse.patch)
-md5sums=('6627727e7abd7a7f95257be8df6359a6' 'b2cc763a1d8166eb7532cd17b9f3fe05')
+source=(http://ftp.gnome.org/pub/gnome/sources/totem/2.22/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('21a3f983e762b34db035edbaaba9dd63')
 
 build() {
-  [ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
-
   cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np1 -i ${startdir}/src/totem-plparse.patch || return 1
-  rm -rf src/plparse || return 1
-  aclocal || return 1
-  autoconf || return 1
-  automake || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
               --libexecdir=/usr/lib/totem \
               --localstatedir=/var --disable-static \
 	      --disable-lirc \
 	      --enable-nautilus --enable-gstreamer \
 	      --enable-mozilla --with-dbus \
-	      --disable-scrollkeeper --disable-vanity
+	      --disable-scrollkeeper --disable-vanity || return 1
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 \
        DESTDIR=${startdir}/pkg install || return 1
@@ -44,6 +36,6 @@
   rm -rf ${startdir}/pkg/usr/lib/mozilla
 
   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
+  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas || return 1
   rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
 }
Index: extra/gnome/totem/totem.install
diff -u extra/gnome/totem/totem.install:1.17 extra/gnome/totem/totem.install:1.18
--- extra/gnome/totem/totem.install:1.17	Sun Sep 23 13:50:31 2007
+++ extra/gnome/totem/totem.install	Sun Mar 16 10:42:22 2008
@@ -34,8 +34,3 @@
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
-
-op=$1
-shift
-
-$op $*