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

[Jan de Groot]

    Date: Thursday, November 6, 2008 @ 18:34:53
  Author: jgc
Revision: 18541

Merged revisions 356,18539-18540 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/genius/trunk

........
  r356 | aaron | 2008-04-19 00:56:27 +0200 (Sat, 19 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r18539 | jgc | 2008-11-07 00:30:53 +0100 (Fri, 07 Nov 2008) | 2 lines
  
  Fix FS#11919
........
  r18540 | jgc | 2008-11-07 00:34:29 +0100 (Fri, 07 Nov 2008) | 1 line
  
  upgpkg: genius 1.0.3-1
........

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

----------------+
 PKGBUILD       |   15 +++++++--------
 genius.install |    5 -----
 2 files changed, 7 insertions(+), 13 deletions(-)


Property changes on: genius/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /genius/trunk:1
   + /genius/trunk:1-18540

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-11-06 23:34:29 UTC (rev 18540)
+++ extra-x86_64/PKGBUILD	2008-11-06 23:34:53 UTC (rev 18541)
@@ -3,27 +3,26 @@
 # Contributor: Arjan Timmerman <arjan at soulfly.nl>
 
 pkgname=genius
-pkgver=1.0.2
+pkgver=1.0.3
 pkgrel=1
 pkgdesc="Advanced calculator including a mathematical programming language"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.jirka.org/genius.html"
-depends=('gmp>=4.2.2' 'vte>=0.16.11' 'gtksourceview>=1.8.5-2' 'libgnomeui>=2.20.1.1' 'mpfr>=2.2.1' 'desktop-file-utils' 'termcap-compat' 'shared-mime-info')
-makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.12.0')
+depends=('gmp>=4.2.4' 'vte>=0.17.4' 'gtksourceview2>=2.4.0' 'libgnomeui>=2.24.0' 'mpfr>=2.3.2' 'desktop-file-utils' 'termcap-compat' 'shared-mime-info')
+makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.14.0')
 options=('!libtool' '!makeflags')
 install=genius.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/genius/1.0/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('7c948e3426c4aaaa9bac8267094ce53d')
+md5sums=('9500bf293016de90aff838a3ae31339f')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  #sed -i '/install-data-hook$/d' Makefile.in
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
               --libexecdir=/usr/lib/genius \
               --localstatedir=/var --disable-static \
 	      --enable-gtksourceview --disable-scrollkeeper \
-	      --disable-update-mimedb
+	      --disable-update-mimedb || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install
+  make DESTDIR="${pkgdir}" install || return 1
 }

Modified: extra-x86_64/genius.install
===================================================================
--- extra-x86_64/genius.install	2008-11-06 23:34:29 UTC (rev 18540)
+++ extra-x86_64/genius.install	2008-11-06 23:34:53 UTC (rev 18541)
@@ -11,8 +11,3 @@
 post_remove() {
   post_install $1
 }
-
-op=$1
-shift
-
-$op $*