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

[Eric Belanger]

    Date: Tuesday, June 17, 2008 @ 22:38:18
  Author: eric
Revision: 3027

Merged revisions 2741-3025 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/liferea/trunk

........
  r2988 | eric | 2008-06-17 21:34:33 -0400 (Tue, 17 Jun 2008) | 2 lines
  
  upgpkg: liferea 1.4.16b-1
      Upstream update
........

Modified:
  liferea/repos/extra-i686/	(properties)
  liferea/repos/extra-i686/ChangeLog
  liferea/repos/extra-i686/PKGBUILD

-----------+
 ChangeLog |    6 ++++++
 PKGBUILD  |   18 +++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)


Property changes on: liferea/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /liferea/trunk:1-2740
   + /liferea/trunk:1-3025

Modified: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog	2008-06-18 02:38:15 UTC (rev 3026)
+++ extra-i686/ChangeLog	2008-06-18 02:38:18 UTC (rev 3027)
@@ -1,3 +1,9 @@
+2008-06-17  Eric Belanger  <eric at archlinux.org>
+
+	* liferea 1.4.16b-1
+	* Upstream update
+	* Added force option
+
 2008-06-13  Eric Belanger  <eric at archlinux.org>
 
 	* liferea 1.4.16-1

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-06-18 02:38:15 UTC (rev 3026)
+++ extra-i686/PKGBUILD	2008-06-18 02:38:18 UTC (rev 3027)
@@ -3,7 +3,7 @@
 # Contributor: Ben <ben at benmazer.net>
 
 pkgname=liferea
-pkgver=1.4.16
+pkgver=1.4.16b
 pkgrel=1
 pkgdesc="A GTK desktop news aggregator for online news feeds and weblogs"
 arch=('i686' 'x86_64')
@@ -11,23 +11,23 @@
 license=('GPL')
 depends=('gtk2>=2.10.11' 'gconf>=2.18.0.1-4' 'xulrunner>=1.8.1.11' 'libnotify>=0.4.4' 'libnetworkmanager' 'libxslt>=1.1.20' 'libglade' 'sqlite3')
 makedepends=('perlxml' 'pkgconfig' 'diffutils')
-options=('!libtool')
+options=('!libtool' 'force')
 install=liferea.install
 source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.gz)
-md5sums=('591aa637cdcc9ada395b26b93b4d8714')
-sha1sums=('1e89dbb29e3ee71491eeaa931a414cb1e06d505c')
+md5sums=('b7d8ef4b5d054a7c57e53789d7259edb')
+sha1sums=('cf6264716c7c9a2eebfe776c4113bf2a1bf74f32')
 
 build() {
   [ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
 
-  cd ${startdir}/src/liferea-${pkgver}
+  cd ${srcdir}/liferea-${pkgver}
 
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-gtkhtml2 || return 1
   make LDFLAGS+="-R/usr/lib/xulrunner" || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install || return 1
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${pkgdir} 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 || return 1
-  rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
+  mkdir -p ${pkgdir}/usr/share/gconf/schemas
+  gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
+  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
 }