[arch-commits] CVS update of extra/network/liferea (PKGBUILD liferea.install)

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 12:40:05
  Author: jgc
    Path: /home/cvs-extra/extra/network/liferea

Modified: PKGBUILD (1.52 -> 1.53) liferea.install (1.9 -> 1.10)

upgpkg: liferea 1.2.10c-1
Move to /usr


-----------------+
 PKGBUILD        |   25 +++++++++++--------------
 liferea.install |   12 +++++++-----
 2 files changed, 18 insertions(+), 19 deletions(-)


Index: extra/network/liferea/PKGBUILD
diff -u extra/network/liferea/PKGBUILD:1.52 extra/network/liferea/PKGBUILD:1.53
--- extra/network/liferea/PKGBUILD:1.52	Sat Mar 31 13:38:15 2007
+++ extra/network/liferea/PKGBUILD	Sun Apr 22 12:40:04 2007
@@ -1,35 +1,32 @@
-# $Id: PKGBUILD,v 1.52 2007/03/31 17:38:15 jgc Exp $
+# $Id: PKGBUILD,v 1.53 2007/04/22 16:40:04 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Ben <ben at benmazer.net>
 
 pkgname=liferea
-pkgver=1.2.9
+pkgver=1.2.10c
 pkgrel=1
 pkgdesc="GTK Feedreader Clone"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('gtk2>=2.10.11' 'gconf>=2.18.0' 'xulrunner>=1.8.1.3' 'libnotify>=0.4.4' 'libnetworkmanager' 'libxslt>=1.1.20')
+depends=('gtk2>=2.10.11' 'gconf>=2.18.0.1-2' 'xulrunner>=1.8.1.3' 'libnotify>=0.4.4' 'libnetworkmanager' 'libxslt>=1.1.20')
 makedepends=('perlxml' 'pkgconfig')
 options=('nolibtool')
 source=(http://heanet.dl.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.gz)
 url="http://liferea.sourceforge.net/"
 install=liferea.install
-md5sums=('1a11e0eb92b5167edbb7d5c124410daa')
+md5sums=('aaa1f8ec09944a269d2f1fedecd27375')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
   [ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
 
-  cd ${startdir}/src/liferea-${pkgver}
+  cd ${startdir}/src/liferea-1.2.10
 
-  ./configure --prefix=/opt/gnome --disable-gtkhtml2
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --localstatedir=/var --disable-gtkhtml2
   make LDFLAGS+="-R/opt/mozilla/lib/xulrunner" || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg  install
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
   
-  mkdir -p ${startdir}/pkg/opt/gnome/share/gconf/schemas
-  gconf-merge-schema ${startdir}/pkg/opt/gnome/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/opt/gnome/etc/gconf/schemas/*.schemas
-  rm -f ${startdir}/pkg/opt/gnome/etc/gconf/schemas/*.schemas
-
-  mkdir -p ${startdir}/pkg/usr/share
-  mv ${startdir}/pkg/opt/gnome/share/icons ${startdir}/pkg/usr/share/
+  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
 }
Index: extra/network/liferea/liferea.install
diff -u extra/network/liferea/liferea.install:1.9 extra/network/liferea/liferea.install:1.10
--- extra/network/liferea/liferea.install:1.9	Thu Feb 15 07:42:36 2007
+++ extra/network/liferea/liferea.install	Sun Apr 22 12:40:05 2007
@@ -1,8 +1,8 @@
 pkgname=liferea
 
 post_install() {
-  export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
-  opt/gnome/bin/gconftool-2 --makefile-install-rule opt/gnome/share/gconf/schemas/${pkgname}.schemas >/dev/null
+  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
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
@@ -15,14 +15,16 @@
 }
 
 pre_remove() {
-  if [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
+  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=`opt/gnome/bin/gconftool-2 --get-default-source`
+  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
   
-  opt/gnome/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
+  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
 }
 
 post_remove() {