[arch-commits] Commit in totem/trunk (PKGBUILD totem.install)

[Jan Steffens]

    Date: Thursday, March 10, 2011 @ 11:29:37
  Author: heftig
Revision: 113861

upgpkg: totem 2.91.91-1
Update to 2.91.91

Modified:
  totem/trunk/PKGBUILD
  totem/trunk/totem.install

---------------+
 PKGBUILD      |   28 +++++++++++++---------------
 totem.install |   19 ++++++-------------
 2 files changed, 19 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-03-10 16:05:09 UTC (rev 113860)
+++ PKGBUILD	2011-03-10 16:29:37 UTC (rev 113861)
@@ -3,7 +3,7 @@
 
 pkgbase=totem
 pkgname=('totem' 'totem-plugin')
-pkgver=2.91.7
+pkgver=2.91.91
 pkgrel=1
 url="http://www.hadess.net/totem.php3"
 arch=('i686' 'x86_64')
@@ -12,8 +12,8 @@
     '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.91/${pkgbase}-${pkgver}.tar.bz2)
-sha256sums=('be8259b306d3def99341b8cf3eef7acdf813ea71286d89dc1eeed8b7f74b8c53')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.bz2)
+sha256sums=('d9fe76de07e2f8ef98c5635d2bd780f140ca0681c3f6db37a494b921597fb297')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -27,7 +27,7 @@
 
 package_totem() {
   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')
+  depends=('gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'totem-plparser' 'libxxf86vm' 'libxtst' 'desktop-file-utils' 'iso-codes' 'python2' 'libpeas' 'hicolor-icon-theme')
   groups=('gnome-extra')
   install=totem.install
   optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
@@ -39,31 +39,29 @@
               'bluez: Bemused plugin')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+  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}")
 
-  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"
 }
 

Modified: totem.install
===================================================================
--- totem.install	2011-03-10 16:05:09 UTC (rev 113860)
+++ totem.install	2011-03-10 16:29:37 UTC (rev 113861)
@@ -1,26 +1,19 @@
-pkgname=totem
-
 post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  glib-compile-schemas usr/share/glib-2.0/schemas
+  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
+  post_install
 }
 
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
 post_remove() {
-  update-desktop-database -q
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install
 }