[arch-commits] Commit in gnome-media/repos (3 files)

[Jan de Groot]

    Date: Sunday, August 3, 2008 @ 12:21:01
  Author: jgc
Revision: 7680

Merged revisions 2-7679 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/gnome-media/trunk

........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r5529 | jgc | 2008-07-18 06:30:01 +0000 (Fri, 18 Jul 2008) | 2 lines
  
  Remove references to deprecated gstreamer split packages
........
  r7555 | jgc | 2008-08-02 22:07:04 +0000 (Sat, 02 Aug 2008) | 2 lines
  
  upgpkg: gnome-media 2.22.0-2
      Run gtk-update-icon-cache in postinstall/upgrade/remove, disable cddb-slave and vumeter (disabled in next upstream version)
........

Modified:
  gnome-media/repos/extra-x86_64/	(properties)
  gnome-media/repos/extra-x86_64/PKGBUILD
  gnome-media/repos/extra-x86_64/gnome-media.install

---------------------+
 PKGBUILD            |   10 ++++------
 gnome-media.install |    8 ++------
 2 files changed, 6 insertions(+), 12 deletions(-)


Property changes on: gnome-media/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /gnome-media/trunk:1
   + /gnome-media/trunk:1-7679

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-08-03 16:05:00 UTC (rev 7679)
+++ extra-x86_64/PKGBUILD	2008-08-03 16:21:01 UTC (rev 7680)
@@ -3,14 +3,11 @@
 
 pkgname=gnome-media
 pkgver=2.22.0
-pkgrel=1
+pkgrel=2
 pkgdesc="GNOME Media Tools"
 arch=(i686 x86_64)
-license=(GPL)
-depends=('libgnomeui>=2.22.01' 'gstreamer0.10-gconf' 'gstreamer0.10-base'
-	 'gstreamer0.10-flac' 'gstreamer0.10-ogg'
-	 'gstreamer0.10-vorbis' 'gstreamer0.10-good'
-	 'gstreamer0.10-cdparanoia')
+license=('GPL')
+depends=('libgnomeui>=2.22.1' 'gstreamer0.10-good-plugins' 'gstreamer0.10-base-plugins')
 makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.12.2')
 url="http://www.gnome.org"
 groups=('gnome')
@@ -25,6 +22,7 @@
               --libexecdir=/usr/lib/gnome-media \
               --localstatedir=/var --disable-static \
 	      --enable-gstreamer=0.10 --disable-gnomecd \
+	      --disable-vumeter --disable-cddbslave \
 	      --disable-scrollkeeper || return 1
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install || return 1

Modified: extra-x86_64/gnome-media.install
===================================================================
--- extra-x86_64/gnome-media.install	2008-08-03 16:05:00 UTC (rev 7679)
+++ extra-x86_64/gnome-media.install	2008-08-03 16:21:01 UTC (rev 7680)
@@ -2,6 +2,7 @@
 
 post_install() {
   usr/sbin/gconfpkg --install ${pkgname}
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
 }
 
 pre_upgrade() {
@@ -17,10 +18,5 @@
 }
 
 post_remove() {
-  /bin/true
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
 }
-
-op=$1
-shift
-
-$op $*