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

[Jan de Groot]

    Date: Friday, November 28, 2008 @ 15:15:22
  Author: jgc
Revision: 19648

Merged revisions 17160,19640 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/gtk2/trunk

........
  r17160 | jgc | 2008-10-26 10:24:01 +0000 (Sun, 26 Oct 2008) | 2 lines
  
  Simplify install scriptlet
........
  r19640 | jgc | 2008-11-28 20:03:34 +0000 (Fri, 28 Nov 2008) | 1 line
  
  upgpkg: gtk2 2.14.5-1
........

Modified:
  gtk2/repos/extra-i686/	(properties)
  gtk2/repos/extra-i686/PKGBUILD
  gtk2/repos/extra-i686/gtk2.install

--------------+
 PKGBUILD     |    6 +++---
 gtk2.install |   24 +++++-------------------
 2 files changed, 8 insertions(+), 22 deletions(-)


Property changes on: gtk2/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /gtk2/trunk:1-15728
   + /gtk2/trunk:1-19647

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-11-28 20:11:31 UTC (rev 19647)
+++ extra-i686/PKGBUILD	2008-11-28 20:15:22 UTC (rev 19648)
@@ -2,13 +2,13 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gtk2
-pkgver=2.14.4
+pkgver=2.14.5
 pkgrel=1
 pkgdesc="The GTK+ Toolkit (v2)"
 arch=(i686 x86_64)
 url="http://www.gtk.org/"
 install=gtk2.install
-depends=('atk>=1.24.0' 'pango>=1.22.0' 'libxcursor' 'libxinerama' 'libxrandr>=1.2.1' 'libxi' 'libcups>=1.3.8-2' 'libxcomposite' 'libxdamage' 'heimdal>=1.2' 'gnutls>=2.4.1' 'glib2>=2.18.2')
+depends=('atk>=1.24.0' 'pango>=1.22.3' 'libxcursor' 'libxinerama' 'libxrandr>=1.2.1' 'libxi' 'libcups>=1.3.9' 'libxcomposite' 'libxdamage' 'heimdal>=1.2' 'gnutls>=2.4.1')
 makedepends=('pkgconfig')
 replaces=('gtkprint-cups' 'gail')
 conflicts=('gtkprint-cups' 'gail')
@@ -18,7 +18,7 @@
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.14/gtk+-${pkgver}.tar.bz2
 	gtkclipboard-check.patch)
-md5sums=('72bf65a54d2d29a6644dc0d28313ee67'
+md5sums=('1b1b5d7ab5a25e84682cb27ee4808a40'
          '4025d3c15d6c6f73a032f403ffd4ff1c')
 
 build() {

Modified: extra-i686/gtk2.install
===================================================================
--- extra-i686/gtk2.install	2008-11-28 20:11:31 UTC (rev 19647)
+++ extra-i686/gtk2.install	2008-11-28 20:15:22 UTC (rev 19648)
@@ -1,27 +1,13 @@
-# arg 1:  the new package version
 post_install() {
-	# we need to ldconfig first, in case xfree86's libs aren't
-	# in ld.so.cache yet
-	sbin/ldconfig -r .
-	mkdir -p etc/gtk-2.0 &>/dev/null
-	usr/bin/gtk-query-immodules-2.0 >etc/gtk-2.0/gtk.immodules
-	usr/bin/gdk-pixbuf-query-loaders >etc/gtk-2.0/gdk-pixbuf.loaders
+  usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
+  usr/bin/gdk-pixbuf-query-loaders > etc/gtk-2.0/gdk-pixbuf.loaders
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
 post_upgrade() {
-	post_install $1
+  post_install
 }
 
-# arg 1:  the old package version
 pre_remove() {
-	rm -f etc/gtk-2.0/gtk.immodules &>/dev/null
-	rm -f etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null
-	rmdir etc/gtk-2.0 &>/dev/null
+  rm -f etc/gtk-2.0/gtk.immodules &>/dev/null
+  rm -f etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null
 }
-
-op=$1
-shift
-
-$op $*