Sun May 1 22:33:26 UTC 2011

2 files changed, 27 insertions, 46 deletions

diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD
index 4241b3209..ed89d82b6 100644
--- a/extra/totem/PKGBUILD
+++ b/extra/totem/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 96293 2010-10-19 20:31:32Z ibiru $
+# $Id: PKGBUILD 120757 2011-04-26 11:04:01Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=totem
 pkgname=('totem' 'totem-plugin')
-pkgver=2.32.0
-pkgrel=3
+pkgver=3.0.1
+pkgrel=1
 url="http://www.hadess.net/totem.php3"
 arch=('i686' 'x86_64')
 license=('GPL2' 'custom')
-makedepends=('gstreamer0.10-base-plugins>=0.10.30' 'gstreamer0.10-good-plugins>=0.10.22' 'totem-plparser>=2.32.0' 'libxxf86vm' 'libxtst' 'desktop-file-utils' 'iso-codes>=3.10.1' 'libepc>=0.3.10' 'python2' 'libgdata>=0.6.4' 'nautilus>=2.32.0' 'xulrunner>=1.9.2' 'pkgconfig' 'bluez>=4.64' 'lirc-utils' 'gnome-doc-utils>=0.20.1' 'gnome-control-center>=2.32.0' 'intltool' 'pygtk>=2.22.0')
-
+makedepends=('intltool' 'gnome-doc-utils' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'totem-plparser'
+    'libpeas' 'pygobject' 'pygobject-devel' 'nautilus' 'libxxf86vm' 'libxtst' 'desktop-file-utils' 'iso-codes' 'libgdata'
+    'xulrunner' 'lirc-utils' 'libepc' 'bluez' 'vala')
 options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/totem/2.32/${pkgbase}-${pkgver}.tar.bz2)
-sha256sums=('982d6aaeca3e4844694fc0a2540d792bea753e24b55cf33203188b32b5914f47')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.bz2)
+sha256sums=('013b6cfedac6ff264aa27de7346597d0b8da7f4ed1f91b2c966a13d3fdff679a')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -25,56 +26,41 @@ build() {
 }
 
 package_totem() {
-  pkgdesc="A GNOME2 integrated movie player based on Gstreamer."
-  depends=('gstreamer0.10-base-plugins>=0.10.30' 'gstreamer0.10-good-plugins>=0.10.22' 'totem-plparser>=2.32.0' 'libxxf86vm' 'libxtst' 'desktop-file-utils' 'iso-codes>=3.10.1' 'python2' 'libunique>=1.1.6')
+  pkgdesc="A GNOME3 integrated movie player based on Gstreamer."
+  depends=('gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'totem-plparser' 'libxxf86vm' 'libxtst' 'desktop-file-utils' 'iso-codes' 'python2' 'libpeas' 'hicolor-icon-theme' 'gnome-icon-theme-symbolic' 'gsettings-desktop-schemas')
   groups=('gnome-extra')
   install=totem.install
   optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
               'gstreamer0.10-bad-plugins: Extra media codecs'
               'gstreamer0.10-ffmpeg: Extra media codecs'
-              'httplib2: BBC iPlayer plugin'
-              'python-feedparser: BBC iPlayer plugin'
-              'beautiful-soup: BBC iPlayer plugin'
-              'coherence: Coherence DLNA/UPnP Client plugin'
-              'dbus-python: D-Bus Service plugin'
-              'gromit: Gromit Annotations plugin'
               'lirc-utils: Infrared Remote Control plugin'
               'libepc: Publish Playlist plugin'
-              'pyxdg: Subtitle Downloader plugin'
               'libgdata: YouTube Browser plugin'
-              'gnome-python: Subtitle plugin')
-  conflicts=('totem-xine')
-  replaces=('totem-xine')
+              'bluez: Bemused plugin')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  rm -f ${pkgdir}/usr/share/totem/vanity.*
-  rm -f "${pkgdir}/usr/share/pixmaps/vanity.png"
+  make DESTDIR="${pkgdir}" install
 
   rm -rf "${pkgdir}/usr/lib/mozilla"
   rm -f "${pkgdir}/usr/lib/totem/totem-plugin-viewer"
 
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain totem ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-
   sed -i "s|#!/usr/bin/python$|#!/usr/bin/python2|" \
     $pkgdir/usr/lib/totem/{totem/totem-bugreport.py,plugins/iplayer/iplayer2.py}
 
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/totem/COPYING"
 }
 
 package_totem-plugin() {
   pkgdesc="Totem mozilla/firefox plugin"
-  depends="totem=${pkgver}"
+  depends=("totem=${pkgver}")
 
-  cd "${srcdir}/${pkgbase}-${pkgver}/browser-plugin"
-  make plugindir=/usr/lib/mozilla/plugins \
-      xptdir=/usr/lib/mozilla/plugins \
-      DESTDIR="${pkgdir}" install
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  make -C browser-plugin \
+    plugindir=/usr/lib/mozilla/plugins \
+    xptdir=/usr/lib/mozilla/plugins \
+    DESTDIR="${pkgdir}" install
 
   rm -rf "${pkgdir}/usr/share"
-}
 
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/totem-plugin/COPYING"
+}
diff --git a/extra/totem/totem.install b/extra/totem/totem.install
index 98dabd71a..07cb42dcb 100644
--- a/extra/totem/totem.install
+++ b/extra/totem/totem.install
@@ -1,24 +1,19 @@
-pkgname=totem
-
 post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 pre_upgrade() {
-  pre_remove $1
+  if (( $(vercmp $2 2.91.91) < 0 )); then
+    usr/sbin/gconfpkg --uninstall totem
+  fi
 }
 
 post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
+  post_install
 }
 
 post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install
 }