[arch-commits] Commit in openoffice-base-beta/repos (3 files)

andyrtr at archlinux.org andyrtr at archlinux.org
Sat Oct 17 13:16:25 UTC 2009


    Date: Saturday, October 17, 2009 @ 09:16:25
  Author: andyrtr
Revision: 56003

Merged revisions 56002 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/openoffice-base-beta/trunk

........
  r56002 | andyrtr | 2009-10-17 13:15:37 +0000 (Sa, 17 Okt 2009) | 2 lines
  
  upgpkg: openoffice-base-beta 3.2.0_ooo320_m2-1
      new version 3.2.0_ooo320_m2
........

Modified:
  openoffice-base-beta/repos/extra-x86_64/	(properties)
  openoffice-base-beta/repos/extra-x86_64/ChangeLog
  openoffice-base-beta/repos/extra-x86_64/PKGBUILD

-----------+
 ChangeLog |    6 ++++++
 PKGBUILD  |   11 ++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)


Property changes on: openoffice-base-beta/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /openoffice-base-beta/trunk:1-54542
   + /openoffice-base-beta/trunk:1-56002

Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2009-10-17 13:15:37 UTC (rev 56002)
+++ extra-x86_64/ChangeLog	2009-10-17 13:16:25 UTC (rev 56003)
@@ -1,5 +1,11 @@
 	- TODO: fix extensions installation!
 
+2009-10-17 Andreas Radke <andyrtr at archlinux.org>
+
+        * 3.2.0-OOO320_m2-1 :
+	- new snapshot = 3.2.0 BETA
+
+
 2009-10-11 Andreas Radke <andyrtr at archlinux.org>
 
         * 3.2.0-OOO320_m1-1 :

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-10-17 13:15:37 UTC (rev 56002)
+++ extra-x86_64/PKGBUILD	2009-10-17 13:16:25 UTC (rev 56003)
@@ -4,8 +4,8 @@
 
 pkgbase="openoffice-base-beta"
 pkgname=('openoffice-base-beta' 'openoffice-sdk-beta')
-_OO_milestone=OOO320_m1
-pkgver=3.2.0_${_OO_milestone/OOO/ooo} # not yet beta state
+_OO_milestone=OOO320_m2
+pkgver=3.2.0_${_OO_milestone/OOO/ooo} # =3.2.0 BETA
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL3')
@@ -28,11 +28,10 @@
 	soffice-detect-mozilla-certificates.diff
 	buildfix-gcc44.diff
 	buildfix_FormulaMissingHeader.diff
-	http://www.openoffice.org/nonav/issues/showattachment.cgi/64767/openldap.patch
 	buildfix_system_db48.diff
 	openoffice-beta.profile)
 options=('!distcc' '!ccache' '!makeflags')
-md5sums=('8147597252646ceae70c1a886d9831a2'
+md5sums=('229b6f368e623c7d45c20eca0d04515d'
          'e3a0b76dcd876f3d721ee7183729153d'
          '90897451b6cfed490e481f06d45408aa'
          '71f136a31e296a04ab68932a31dd533e'
@@ -40,8 +39,7 @@
          '1dc7480a04f572ad136d35923a2af66d'
          'c8e82b4d2324fe62ad8c6e29213e80b5'
          '863a3ab2c17a3d11b8fa3ec321986366'
-         'a130ad960f76b692e34f8566e5ca3f2b'
-	 '0cd6f3525939d3ef6e5a30ad30c25d27'
+         '0cd6f3525939d3ef6e5a30ad30c25d27'
          '8d68d44c941a687813ddd968383cdf27')
 
 # see ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/build for upstream build instructions
@@ -76,7 +74,6 @@
 	# build fixes
 	patch -Np0 -i ${srcdir}/buildfix-gcc44.diff || return 1
 	patch -Np0 -i ${srcdir}/buildfix_FormulaMissingHeader.diff || return 1
-	patch -Np0 -i ${srcdir}/openldap.patch || return 1
 	patch -Np0 -i ${srcdir}/buildfix_system_db48.diff || return 1
 	
 	# allows soffice to find the user's firefox profile so that it can read




More information about the arch-commits mailing list