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

[Jan de Groot]

    Date: Thursday, May 28, 2009 @ 18:48:30
  Author: jgc
Revision: 40229

Merged revisions 356,40228 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/ggv/trunk

........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r40228 | jgc | 2009-05-28 22:48:13 +0000 (Thu, 28 May 2009) | 2 lines
  
  upgpkg: ggv 2.12.0-3
      Update to current packaging standards
........

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

-------------+
 PKGBUILD    |   23 +++++++++--------------
 ggv.install |   21 ++-------------------
 2 files changed, 11 insertions(+), 33 deletions(-)


Property changes on: ggv/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /ggv/trunk:1
   + /ggv/trunk:1-40228

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-05-28 22:48:13 UTC (rev 40228)
+++ extra-x86_64/PKGBUILD	2009-05-28 22:48:30 UTC (rev 40229)
@@ -2,32 +2,27 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=ggv
 pkgver=2.12.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Postscript viewer"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('libgnomeui>=2.18.1-2' 'ghostscript' 'scrollkeeper' 'desktop-file-utils')
-makedepends=('perlxml' 'pkgconfig')
+depends=('libgnomeui>=2.14.1' 'ghostscript' 'desktop-file-utils')
+makedepends=('intltool' 'gnome-doc-utils' 'pkgconfig')
 url="http://www.gnome.org"
 install=ggv.install
 source=(http://ftp.gnome.org/pub/gnome/sources/ggv/2.12/ggv-${pkgver}.tar.bz2)
 md5sums=('418f0ef3f8b82bb0c423a2a1cf6769f7')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  find . -name Makefile.in -exec sed -i -e 's/-scrollkeeper-update.*//' {} \;
-  if [ -f omf.make ]; then
-    sed -i -e 's/-scrollkeeper-update.*//' omf.make
-  fi
-
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
               --libexecdir=/usr/lib/ggv \
-              --localstatedir=/var
+              --localstatedir=/var || return 1
   make || return 1
-  make GCONF_DISABLE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
+  make GCONF_DISABLE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
 
-  mkdir -p ${startdir}/pkg/usr/share/gconf/schemas
-  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas
-  rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
+  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
+  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas --domain ggv ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
+  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
 
 }

Modified: extra-x86_64/ggv.install
===================================================================
--- extra-x86_64/ggv.install	2009-05-28 22:48:13 UTC (rev 40228)
+++ extra-x86_64/ggv.install	2009-05-28 22:48:30 UTC (rev 40229)
@@ -1,9 +1,7 @@
 pkgname=ggv
 
 post_install() {
-  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-  usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/${pkgname}.schemas >/dev/null
-  scrollkeeper-update -q -p var/lib/scrollkeeper
+  usr/sbin/gconfpkg --install ${pkgname}
   update-desktop-database -q
 }
 
@@ -16,24 +14,9 @@
 }
 
 pre_remove() {
-  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-    schemas=(usr/share/gconf/schemas/${pkgname}.schemas)
-  elif [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
-    schemas=(opt/gnome/share/gconf/schemas/${pkgname}.schemas)
-  else
-    schemas=(`pacman -Ql $pkgname | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`)
-  fi
-  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-  
-  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
+  usr/sbin/gconfpkg --uninstall ${pkgname}
 }
 
 post_remove() {
   update-desktop-database -q
-  scrollkeeper-update -q -p var/lib/scrollkeeper
 }
-
-op=$1
-shift
-
-$op $*