[arch-commits] CVS update of extra/gnome/yelp (PKGBUILD yelp.install)

[Jan de Groot]

    Date: Friday, March 14, 2008 @ 17:40:09
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/yelp

Modified: PKGBUILD (1.32 -> 1.33) yelp.install (1.7 -> 1.8)

upgpkg: yelp 2.22.0-1
    GNOME 2.22


--------------+
 PKGBUILD     |   31 +++++++++++++++----------------
 yelp.install |    9 ---------
 2 files changed, 15 insertions(+), 25 deletions(-)


Index: extra/gnome/yelp/PKGBUILD
diff -u extra/gnome/yelp/PKGBUILD:1.32 extra/gnome/yelp/PKGBUILD:1.33
--- extra/gnome/yelp/PKGBUILD:1.32	Fri Dec 21 07:07:18 2007
+++ extra/gnome/yelp/PKGBUILD	Fri Mar 14 17:40:09 2008
@@ -1,36 +1,35 @@
-# $Id: PKGBUILD,v 1.32 2007/12/21 12:07:18 alexander Exp $
+# $Id: PKGBUILD,v 1.33 2008/03/14 21:40:09 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=yelp
-pkgver=2.20.0
-pkgrel=3
+pkgver=2.22.0
+pkgrel=1
 pkgdesc="A help browser for GNOME"
 arch=(i686 x86_64)
-depends=('xulrunner>=1.8.1.11' 'libgnomeui>=2.20.0' 'gnome-doc-utils>=0.12.0' 'startup-notification>=0.9' 'libxslt' 'libbeagle')
-makedepends=('perlxml' 'pkgconfig' 'autoconf')
+depends=('xulrunner>=1.8.1.12' 'libgnomeui>=2.22.01' 'gnome-doc-utils>=0.12.2' 'startup-notification>=0.9' 'libxslt' 'libbeagle')
+makedepends=('intltool' 'pkgconfig' 'autoconf' 'libtool' 'gnome-common')
 groups=('gnome')
 license=('GPL')
 options=('!emptydirs')
 url="http://www.gnome.org"
 install=yelp.install
-source=(http://ftp.gnome.org/pub/gnome/sources/yelp/2.20/yelp-${pkgver}.tar.bz2 \
-       yelp-fix-for-beagle-0.3.0.patch)
-md5sums=('8902618c343093b1c64ee6d647ec41ed' \
-         '3bcf1955ac39d08c2137c4dc8057c61f')
+source=(http://ftp.gnome.org/pub/gnome/sources/yelp/2.22/yelp-${pkgver}.tar.bz2
+	yelp-fix-for-beagle-0.3.0.patch)
+md5sums=('941e67796bbc332c1db3d63771ae2590'
+	 '3bcf1955ac39d08c2137c4dc8057c61f')
 
 build() {
-  [ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
-
   cd ${startdir}/src/yelp-${pkgver}
   #fix for beagle-0.3.0, thanks momonga linux
   patch -Np1 -i ${startdir}/yelp-fix-for-beagle-0.3.0.patch || return 1
-  autoconf
+  libtoolize --force --copy || return 1
+  autoreconf || return 1
  ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --enable-man --with-search=beagle
-  make LDFLAGS+="-R /opt/mozilla/lib/xulrunner" || return 1
+              --localstatedir=/var --enable-man --with-search=beagle || return 1
+  make LDFLAGS+="-R /usr/lib/xulrunner" || return 1
   make -j1 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 -m755 -d ${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
 }
Index: extra/gnome/yelp/yelp.install
diff -u extra/gnome/yelp/yelp.install:1.7 extra/gnome/yelp/yelp.install:1.8
--- extra/gnome/yelp/yelp.install:1.7	Sun Sep 23 14:06:28 2007
+++ extra/gnome/yelp/yelp.install	Fri Mar 14 17:40:09 2008
@@ -15,12 +15,3 @@
 pre_remove() {
   gconfpkg --uninstall ${pkgname}
 }
-
-post_remove() {
-  /bin/true
-}
-
-op=$1
-shift
-
-$op $*