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

[Jan Steffens]

    Date: Friday, February 18, 2011 @ 13:48:39
  Author: heftig
Revision: 110304

upgpkg: yelp 2.91.10-1
Update for gnome-unstable

Modified:
  yelp/trunk/PKGBUILD
  yelp/trunk/yelp.install

--------------+
 PKGBUILD     |   24 ++++++++++++------------
 yelp.install |   19 ++++++++-----------
 2 files changed, 20 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2011-02-18 18:28:06 UTC (rev 110303)
+++ PKGBUILD    2011-02-18 18:48:39 UTC (rev 110304)
@@ -2,29 +2,29 @@
 # Maintainer: Jan de Groot <j...@archlinux.org>
 
 pkgname=yelp
-pkgver=2.30.2
+pkgver=2.91.10
 pkgrel=1
 pkgdesc="A help browser for GNOME"
 arch=('i686' 'x86_64')
-depends=('xulrunner>=1.9.2' 'gnome-doc-utils>=0.20.2' 
'startup-notification>=0.10' 'libxslt' 'hicolor-icon-theme' 'rarian>=0.8.1' 
'gconf>=2.28.1')
-makedepends=('intltool' 'pkgconfig')
+depends=('libwebkit3' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'dbus-glib'
+         'xz' 'bzip2' 'desktop-file-utils')
+makedepends=('intltool' 'gtk-doc')
 groups=('gnome')
 license=('GPL')
-options=('!emptydirs')
+options=('!emptydirs' '!libtool')
 url="http://www.gnome.org";
 install=yelp.install
-source=(http://ftp.gnome.org/pub/gnome/sources/yelp/2.30/yelp-${pkgver}.tar.bz2)
-sha256sums=('5f8c35847bdae654e21cbba66865d6b582d9fc80a059ad29081bb87e146bb165')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
+sha256sums=('3c0324edb89f116f473985cde95aad0fd8087e888c03a536db95adf183c94c63')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var \
-      --with-search=basic --with-gecko=libxul-embedding
+      --localstatedir=/var --disable-static
   make
-  make -j1 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 yelp ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }

Modified: yelp.install
===================================================================
--- yelp.install        2011-02-18 18:28:06 UTC (rev 110303)
+++ yelp.install        2011-02-18 18:48:39 UTC (rev 110304)
@@ -1,22 +1,19 @@
-pkgname=yelp
-
 post_install() {
-  gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
 }
 
 pre_upgrade() {
-  pre_remove $1
+  if (( $(vercmp $2 2.90.0) < 0 )); then
+    usr/sbin/gconfpkg --uninstall yelp
+  fi
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
-pre_remove() {
-  gconfpkg --uninstall ${pkgname}
-}
-
 post_remove() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+  post_install
 }