[arch-commits] Commit in gnumeric/repos (4 files)

[Eric Bélanger]

    Date: Saturday, February 7, 2009 @ 16:46:13
  Author: eric
Revision: 26423

Merged revisions 24652,26422 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/gnumeric/trunk

........
  r24652 | eric | 2009-01-19 01:21:09 -0500 (Mon, 19 Jan 2009) | 1 line
  
  upgpkg: gnumeric 1.8.4-1
........
  r26422 | eric | 2009-02-07 16:45:47 -0500 (Sat, 07 Feb 2009) | 2 lines
  
  upgpkg: gnumeric 1.8.4-2
      Fixed missing locales (close FS#13130), Added yelp optdepends
........

Added:
  gnumeric/repos/extra-x86_64/translations.diff
    (from rev 26422, gnumeric/trunk/translations.diff)
Modified:
  gnumeric/repos/extra-x86_64/	(properties)
  gnumeric/repos/extra-x86_64/ChangeLog
  gnumeric/repos/extra-x86_64/PKGBUILD

-------------------+
 ChangeLog         |    6 ++++++
 PKGBUILD          |   14 +++++++-------
 translations.diff |   12 ++++++++++++
 3 files changed, 25 insertions(+), 7 deletions(-)


Property changes on: gnumeric/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /gnumeric/trunk:1-24603
   + /gnumeric/trunk:1-26422

Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2009-02-07 21:45:47 UTC (rev 26422)
+++ extra-x86_64/ChangeLog	2009-02-07 21:46:13 UTC (rev 26423)
@@ -1,3 +1,9 @@
+2009-02-07  Eric Belanger  <eric at archlinux.org>
+
+	* gnumeric 1.8.4-2
+	* Fixed missing locales (close FS#13130)
+	* Added yelp optdepends
+
 2009-01-18  Eric Belanger  <eric at archlinux.org>
 
 	* gnumeric 1.8.4-1

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-02-07 21:45:47 UTC (rev 26422)
+++ extra-x86_64/PKGBUILD	2009-02-07 21:46:13 UTC (rev 26423)
@@ -4,23 +4,23 @@
 
 pkgname=gnumeric
 pkgver=1.8.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A GNOME Spreadsheet Program"
 arch=('i686' 'x86_64')
 url="http://www.gnome.org/projects/gnumeric/"
 license=('GPL')
 depends=('goffice>=0.6.1' 'gconf>=2.18.0.1-4' 'desktop-file-utils')
-makedepends=('perlxml' 'pygtk' 'psiconv' 'pkgconfig' 'intltool' 'gnome-doc-utils>=0.14.2')
-optdepends=('python: for python plugin support' 'psiconv: for Psion 5 file support')
+makedepends=('perlxml' 'pygtk' 'psiconv' 'pkgconfig' 'intltool' 'gnome-doc-utils>=0.14.1')
+optdepends=('python: for python plugin support' 'psiconv: for Psion 5 file support' 'yelp: for viewing the help manual')
 install=gnumeric.install
 options=('libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('338f0084f04a16f78797ad01f85d3251')
-sha1sums=('2d765b0d06509e0695c4d3ec96b94f8acba88735')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 translations.diff)
+md5sums=('338f0084f04a16f78797ad01f85d3251' '6f4e8cff91aca37104099111a2024c97')
+sha1sums=('2d765b0d06509e0695c4d3ec96b94f8acba88735' 'c4a7c05cadaf57edec4c32a569d95c2a4f97f67b')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-
+  patch -p1 < ../translations.diff || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-static \
               --without-guile --with-bonobo --enable-ssindex || return 1

Copied: gnumeric/repos/extra-x86_64/translations.diff (from rev 26422, gnumeric/trunk/translations.diff)
===================================================================
--- extra-x86_64/translations.diff	                        (rev 0)
+++ extra-x86_64/translations.diff	2009-02-07 21:46:13 UTC (rev 26423)
@@ -0,0 +1,12 @@
+--- gnumeric-1.8.4.orig/po/Makefile.in.in
++++ gnumeric-1.8.4/po/Makefile.in.in
+@@ -69,6 +69,9 @@
+ EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
+ 
+ POTFILES = \
++	this will be defined through a sed script fragment in config.status \
++	and this text prevents that fragment from deleting the definition of \
++	CATALOGS immediately below
+ 
+ CATALOGS = @CATALOGS@
+ CATOBJEXT = @CATOBJEXT@