[arch-commits] Commit in goffice/trunk (PKGBUILD use-apiver-for-dirs.patch)

[Jan de Groot]

    Date: Wednesday, September 28, 2011 @ 08:32:44
  Author: jgc
Revision: 138813

upgpkg: goffice 0.8.17-1

Update to 0.8.17
Use api version for directories, saves us a full rebuild of abiword, gnucash and gnumeric on every update

Added:
  goffice/trunk/use-apiver-for-dirs.patch
Modified:
  goffice/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |   12 ++++++++----
 use-apiver-for-dirs.patch |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-09-28 12:22:51 UTC (rev 138812)
+++ PKGBUILD	2011-09-28 12:32:44 UTC (rev 138813)
@@ -2,7 +2,7 @@
 # Maintainer: Aaron Griffin <aaron at archlinux.org>
 
 pkgname=goffice
-pkgver=0.8.15
+pkgver=0.8.17
 pkgrel=1
 pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+"
 arch=('i686' 'x86_64')
@@ -10,12 +10,16 @@
 license=('GPL')
 options=('!libtool')
 depends=('gtk2' 'gconf' 'libgsf')
-makedepends=('pkgconfig' 'intltool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('6a6ddf9821ff1547ef1977c276fa5a7c6842a1b4cb90c923d600283260aecf58')
+makedepends=('pkgconfig' 'intltool' 'gtk-doc')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
+        use-apiver-for-dirs.patch)
+sha256sums=('165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15'
+            '4507a49f6ccb13e55c0b3cc6831b7e0dcec7badb58a3661190e843f8607fa270')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np0 -i "${srcdir}/use-apiver-for-dirs.patch"
+  autoreconf -fi
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static
   make

Added: use-apiver-for-dirs.patch
===================================================================
--- use-apiver-for-dirs.patch	                        (rev 0)
+++ use-apiver-for-dirs.patch	2011-09-28 12:32:44 UTC (rev 138813)
@@ -0,0 +1,32 @@
+--- configure.in.orig	2011-09-07 08:45:49.687783970 +0000
++++ configure.in	2011-09-07 09:12:55.709382840 +0000
+@@ -418,7 +418,7 @@
+ fi
+ 
+ dnl **************************************************
+-AC_SUBST(GETTEXT_PACKAGE, goffice-${VERSION})
++AC_SUBST(GETTEXT_PACKAGE, goffice-${GOFFICE_API_VER})
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
+ 	[The package name, for gettext])
+ AM_GLIB_GNU_GETTEXT
+@@ -638,9 +638,9 @@
+ dnl ******************
+ dnl
+ dnl These are changed in goffice.c for WIN32 packages
+-AC_SUBST(goffice_datadir, '${datadir}/goffice/${VERSION}')
+-AC_SUBST(goffice_libdir, '${libdir}/goffice/${VERSION}')
+-AC_SUBST(goffice_icondir, '${datadir}/pixmaps/goffice/${VERSION}')
++AC_SUBST(goffice_datadir, '${datadir}/goffice/${GOFFICE_API_VER}')
++AC_SUBST(goffice_libdir, '${libdir}/goffice/${GOFFICE_API_VER}')
++AC_SUBST(goffice_icondir, '${datadir}/pixmaps/goffice/${GOFFICE_API_VER}')
+ AC_SUBST(goffice_localedir, '${prefix}/${DATADIRNAME}/locale')
+ dnl
+ AC_SUBST(goffice_plugindir, '${goffice_libdir}/plugins')
+--- libgoffice.pc.in.orig	2010-02-18 22:49:39.000000000 +0000
++++ libgoffice.pc.in	2011-09-07 09:18:53.655992532 +0000
+@@ -11,4 +11,4 @@
+ Libs.private: @EXTRA_LIBS@
+ Cflags: -I${includedir}/libgoffice- at GOFFICE_API_VER@ @EXTRA_INCLUDES@
+ 
+-PluginDir=${libdir}/goffice/@VERSION@/plugins
++PluginDir=${libdir}/goffice/@GOFFICE_API_VER@/plugins