[Frugalware-git] frugalware-current: openoffice.org-3.2.1-1-i686

Miklos Vajna vmiklos at frugalware.org
Thu Jun 10 10:51:11 CEST 2010


Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=47f195ac00ccdc8c6082694ae25e41de37700d68

commit 47f195ac00ccdc8c6082694ae25e41de37700d68
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Thu Jun 10 10:48:50 2010 +0200

openoffice.org-3.2.1-1-i686

- version bump
- disable NovellOnlyUnix patches, that would remove gcj support
- incompatible change: ~/.ooo3 is now called ~/.openoffice.org3

diff --git a/source/xapps/openoffice.org/FrugalBuild b/source/xapps/openoffice.org/FrugalBuild
index 5810ef2..a68ab5e 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -5,13 +5,13 @@
pkgname=openoffice.org
USE_DEVEL=${USE_DEVEL:-"n"}
if ! Fuse $USE_DEVEL; then
-	upstream=3.2.1rc1
+	upstream=3.2.1
branch=-3-2-1
tree=ooo320
-	milestone=17
+	milestone=19
pkgver=$upstream
pkgrel=1
-	snapshot=1-2-g167f27d
+	snapshot=3-16-gc38220b
else
upstream=3.2.0
branch=-3-2
@@ -162,6 +162,8 @@ build()
# Remove our patches so that incremental build will be possible.
#rm -f patches/src680/ecj-is-gcj.diff
Fpatchall
+	# That would disable gcj support.
+	sed -i '/Frugalware/s/NovellOnlyUnix, //' patches/dev300/apply || return 1

# SMP build
if [ ! -z "$MAKEFLAGS" ]; then


More information about the Frugalware-git mailing list