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

[andyrtr at archlinux.org]

    Date: Thursday, November 19, 2009 @ 08:11:44
  Author: andyrtr
Revision: 59028

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

........
  r59011 | andyrtr | 2009-11-19 11:42:20 +0100 (Do, 19 Nov 2009) | 2 lines
  
  upgpkg: openoffice-base-beta 3.2.0_ooo320_m5-1
      new version 3.2.0_ooo320_m5
........

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

-----------+
 ChangeLog |    5 +++++
 PKGBUILD  |    5 +----
 2 files changed, 6 insertions(+), 4 deletions(-)


Property changes on: openoffice-base-beta/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /openoffice-base-beta/trunk:1-58622
   + /openoffice-base-beta/trunk:1-59027

Modified: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog	2009-11-19 13:04:54 UTC (rev 59027)
+++ extra-i686/ChangeLog	2009-11-19 13:11:44 UTC (rev 59028)
@@ -1,3 +1,8 @@
+2009-11-19 Andreas Radke <andyrtr at archlinux.org>
+
+        * 3.2.0-OOO320_m5-1 :
+	- new snapshot
+
 2009-11-09 Andreas Radke <andyrtr at archlinux.org>
 
         * 3.2.0-OOO320_m4-1 :

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-11-19 13:04:54 UTC (rev 59027)
+++ extra-i686/PKGBUILD	2009-11-19 13:11:44 UTC (rev 59028)
@@ -4,7 +4,7 @@
 
 pkgbase="openoffice-base-beta"
 pkgname=('openoffice-base-beta' 'openoffice-sdk-beta')
-_OO_milestone=OOO320_m4
+_OO_milestone=OOO320_m5
 pkgver=3.2.0_${_OO_milestone/OOO/ooo} # m2=3.2.0 BETA
 pkgrel=1
 arch=('i686' 'x86_64')
@@ -29,7 +29,6 @@
 	buildfix-gcc44.diff
 	buildfix_FormulaMissingHeader.diff
 	buildfix_system_db48.diff
-	system-neon-fix.diff
 	openoffice-beta.profile)
 options=('!distcc' '!ccache' '!makeflags')
 
@@ -61,8 +60,6 @@
 	patch -Np0 -i ${srcdir}/buildfix-gcc44.diff || return 1
 	patch -Np0 -i ${srcdir}/buildfix_FormulaMissingHeader.diff || return 1
 	patch -Np0 -i ${srcdir}/buildfix_system_db48.diff || return 1
-	# http://www.openoffice.org/issues/show_bug.cgi?id=106757
-	patch -Np0 -i ${srcdir}/system-neon-fix.diff || return 1
 	
 	# allows soffice to find the user's firefox profile so that it can read
 	# its digital certificates. Nss stores digital certificates in your mozilla firefox profile.