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

[Jan Steffens]

    Date: Thursday, February 17, 2011 @ 12:59:36
  Author: heftig
Revision: 110213

upgpkg: eog 2.91.7-1
Update for gnome-unstable

Modified:
  eog/trunk/PKGBUILD
  eog/trunk/eog.install

-------------+
 PKGBUILD    |   25 +++++++++++++------------
 eog.install |   17 ++++++-----------
 2 files changed, 19 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-02-17 17:43:12 UTC (rev 110212)
+++ PKGBUILD	2011-02-17 17:59:36 UTC (rev 110213)
@@ -2,31 +2,32 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=eog
-pkgver=2.32.1
+pkgver=2.91.7
 pkgrel=1
 pkgdesc="Eye of Gnome: An image viewing and cataloging program"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('gnome-desktop>=2.32.0' 'libexif>=0.6.19' 'lcms>=1.19' 'desktop-file-utils' 'gnome-icon-theme>=2.31.0' 'exempi>=2.1.1' 'python2>=2.7')
-makedepends=('pkgconfig' 'gnome-doc-utils>=0.20.1' 'intltool' 'pygtk')
+depends=('gnome-desktop' 'libexif' 'lcms' 'desktop-file-utils' 'exempi'
+         'python2' 'dbus-glib' 'libpeas' 'librsvg' 'gnome-icon-theme'
+         'hicolor-icon-theme')
+makedepends=('pkgconfig' 'gtk-doc' 'intltool' 'pygtk')
 install=eog.install
 groups=('gnome-extra')
 options=('!emptydirs' '!libtool')
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('543672fb8e8e300bf2cf4c7eef43b5b1624e2e48e6aa0801a083ae7beb2d7078')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('a79ba796dbcea2a163a9939d4d9c6ced8c3a3b23b2fbdc7f7f4664065c4a7193')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  PYTHON=python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-scrollkeeper \
-      --enable-python
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-scrollkeeper
   make
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+}
 
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain eog ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 
   # remove it from Xfce menu that ships its own thingy
   echo "NotShowIn=XFCE" >> ${pkgdir}/usr/share/applications/eog.desktop

Modified: eog.install
===================================================================
--- eog.install	2011-02-17 17:43:12 UTC (rev 110212)
+++ eog.install	2011-02-17 17:59:36 UTC (rev 110213)
@@ -1,24 +1,19 @@
-pkgname=eog
-
 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.90.0) < 0 )); then
+    usr/sbin/gconfpkg --uninstall eog
+  fi
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
 post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install
 }