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

[andyrtr at archlinux.org]

    Date: Friday, October 9, 2009 @ 04:52:25
  Author: andyrtr
Revision: 54351

Merged revisions 54350 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/go-openoffice/trunk

........
  r54350 | andyrtr | 2009-10-09 08:51:35 +0000 (Fr, 09 Okt 2009) | 2 lines
  
  upgpkg: go-openoffice 3.1.1.3-1
      new version 3.1.1.3; fix #15410
........

Modified:
  go-openoffice/repos/extra-x86_64/	(properties)
  go-openoffice/repos/extra-x86_64/ChangeLog
  go-openoffice/repos/extra-x86_64/PKGBUILD
Deleted:
  go-openoffice/repos/extra-x86_64/buildfix_system_db48.diff

---------------------------+
 ChangeLog                 |    7 +++++++
 PKGBUILD                  |   14 +++++++-------
 buildfix_system_db48.diff |   11 -----------
 3 files changed, 14 insertions(+), 18 deletions(-)


Property changes on: go-openoffice/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /go-openoffice/trunk:1-53321
   + /go-openoffice/trunk:1-54350

Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2009-10-09 08:51:35 UTC (rev 54350)
+++ extra-x86_64/ChangeLog	2009-10-09 08:52:25 UTC (rev 54351)
@@ -1,3 +1,10 @@
+2009-10-09 Andreas Radke <andyrtr at archlinux.org>
+
+        * 3.1.1.3-1 :
+        new upstream bugfix release
+        drop db48 patch
+        fix mktemp path, #15410
+
 2009-09-28 Andreas Radke <andyrtr at archlinux.org>
 
         * 3.1.1.2-2 :

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-10-09 08:51:35 UTC (rev 54350)
+++ extra-x86_64/PKGBUILD	2009-10-09 08:52:25 UTC (rev 54351)
@@ -2,9 +2,9 @@
 # Maintainer: AndyRTR <andyrtr at archlinux.org>
 
 pkgname=go-openoffice
-pkgver=3.1.1.2
-_GOver=3.1.1.2 # = OOo 3.1.1 final + fixes
-pkgrel=2
+pkgver=3.1.1.3
+_GOver=3.1.1.3 # = OOo 3.1.1 final + fixes
+pkgrel=1
 pkgdesc="OpenOffice.org - go-oo.org enhanced version of SUN's office suite"
 arch=('i686' 'x86_64')
 _go_tree="OOO310"
@@ -48,13 +48,12 @@
 	http://download.go-oo.org//SRC680/libwpg-0.1.3.tar.gz
 	http://download.go-oo.org//DEV300/ooo_oxygen_images-2009-06-17.tar.gz
 	buildfix_64bit_system_libjpeg.diff
-	buildfix_system_db48.diff
 	openoffice.org-3.0.1.oooXXXXX.extensions.npapi.diff)
 #options=('!distcc' '!ccache' '!makeflags')
 noextract=(ooo-cli-prebuilt-3.1.1.tar.bz2 cairo-1.4.10.tar.gz mdbtools-0.6pre1.tar.gz
 	${_ootag}-{artwork,base,bootstrap,calc,components,extras,filters,help,impress,libs-gui,libs-core,libs-extern,postprocess,sdk,testing,ure,writer,libs-extern-sys,extensions}.tar.bz2
 	extras-3.tar.bz2 biblio.tar.bz2 unowinreg.dll scsolver.2008-10-30.tar.bz2 libwpd-0.8.14.tar.gz libwps-0.1.2.tar.gz libwpg-0.1.3.tar.gz ooo_oxygen_images-2009-06-17.tar.gz)
-md5sums=('1a0b08a662f5e55eac93b2369523e2d6'
+md5sums=('108c4565491ce3e2dd62dddac3a890da'
          'a1ff3d64d0ca95c62a15c07e7f19f193'
          '222a42af5b874ea15dbafd07b2381aee'
          '5598a5e500ad922e37b159dee72fc993'
@@ -87,7 +86,6 @@
          'db556b750bf3eac8481a4cc5e29e5af1'
          '0b3ffc43231c525db1798495a6676902'
          'b005c4cf9f8e586539ca98c9cfe9bb77'
-         '0cd6f3525939d3ef6e5a30ad30c25d27'
          '6573ab0f3893806b366b06d575c4f547')
 
 build() {
@@ -103,7 +101,6 @@
 	# hotfixes not yet upstream
 #	cp ${srcdir}/*.diff ${srcdir}/ooo-build-${_GOver}/patches/hotfixes/
 	cp ${srcdir}/buildfix_64bit_system_libjpeg.diff ${srcdir}/ooo-build-${_GOver}/patches/hotfixes/
-	cp ${srcdir}/buildfix_system_db48.diff ${srcdir}/ooo-build-${_GOver}/patches/hotfixes/
 	cp ${srcdir}/openoffice.org-3.0.1.oooXXXXX.extensions.npapi.diff ${srcdir}/ooo-build-${_GOver}/patches/hotfixes/
 
 	# export C(XX)FLAGS
@@ -169,4 +166,7 @@
 	install -m644 minimizer/sun-presentation-minimizer.oxt ${pkgdir}/usr/lib/"${pkgname}"/share/extension/install/sun-presentation-minimizer.oxt || return 1
 	install -m644 presenter/presenter-screen.oxt ${pkgdir}/usr/lib/"${pkgname}"/share/extension/install/presenter-screen.oxt || return 1
 	popd
+	
+	# fix unopkg call for mktemp, #15410
+	sed -i "s:\/bin\/mktemp:\/usr\/bin\/mktemp:" ${pkgdir}/usr/lib/go-openoffice/program/unopkg || return 1
 }

Deleted: extra-x86_64/buildfix_system_db48.diff
===================================================================
--- extra-x86_64/buildfix_system_db48.diff	2009-10-09 08:51:35 UTC (rev 54350)
+++ extra-x86_64/buildfix_system_db48.diff	2009-10-09 08:52:25 UTC (rev 54351)
@@ -1,11 +0,0 @@
---- configure.in	2009-08-25 15:10:12.000000000 +0000
-+++ configure.in.new	2009-09-27 17:43:11.207515081 +0000
-@@ -3626,7 +3626,7 @@
-         ], []
-     )
-     AC_MSG_CHECKING([whether db is at least 4.1])
--    for v in `seq 1 7`; do
-+    for v in `seq 1 8`; do
-        AC_TRY_RUN([
- #include <db.h>
-