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

[Jan de Groot]

    Date: Thursday, April 24, 2008 @ 17:35:45
  Author: jgc
Revision: 928

Merged revisions 2-927 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/ghex/trunk

........
  r60 | jgc | 2008-04-10 17:12:22 +0000 (Thu, 10 Apr 2008) | 1 line
  
  upgpkg: ghex 2.22.0-1
........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........

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

--------------+
 PKGBUILD     |   16 ++++++++--------
 ghex.install |    5 -----
 2 files changed, 8 insertions(+), 13 deletions(-)


Property changes on: ghex/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /ghex/trunk:1
   + /ghex/trunk:1-927

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-04-24 21:34:43 UTC (rev 927)
+++ extra-i686/PKGBUILD	2008-04-24 21:35:45 UTC (rev 928)
@@ -3,27 +3,27 @@
 # Contributor: Tobias Kieslich <tobias at justdreams.de>
 
 pkgname=ghex
-pkgver=2.20.0
+pkgver=2.22.0
 pkgrel=1
 pkgdesc="A simple binary editor for the Gnome desktop"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.gnu.org/directory/ghex.html"
-depends=('libgnomeui>=2.20.0' 'libgnomeprintui>=2.18.1')
+depends=('libgnomeui>=2.22.1' 'libgnomeprintui>=2.18.2')
 makedepends=('perlxml' 'pkgconfig')
 options=('!libtool' '!emptydirs')
 install=ghex.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/ghex/2.20/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('7f76315b08f0d54d58540bae2f014394')
+source=(http://ftp.gnome.org/pub/GNOME/sources/ghex/2.22/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('6f1ee7a56f7dd04bfba5ee74a639948a')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var
+              --localstatedir=/var || return 1
   make || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg 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
+  install -d -m755 ${startdir}/pkg/usr/share/gconf/schemas
+  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas || return 1
   rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
 }

Modified: extra-i686/ghex.install
===================================================================
--- extra-i686/ghex.install	2008-04-24 21:34:43 UTC (rev 927)
+++ extra-i686/ghex.install	2008-04-24 21:35:45 UTC (rev 928)
@@ -20,8 +20,3 @@
 post_remove() {
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
-
-op=$1
-shift
-
-$op $*