rpms/openoffice.org/devel openoffice.org-1.9.108.ooo48814.solenv.nostripwithsimpleinstall.patch, NONE, 1.1 openoffice.org-1.9.87.ooo50575.fragments.patch, NONE, 1.1 openoffice.org.spec, 1.217, 1.218 openoffice.org-1.9.108.oooXXXXX.solenv.nostipwithsimpleinstall.patch, 1.1, NONE openoffice.org-1.9.87.oooXXXXX.fragments.patch, 1.2, NONE

Fri Jun 10 15:35:16 UTC 2005

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20219

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-1.9.108.ooo48814.solenv.nostripwithsimpleinstall.patch 
	openoffice.org-1.9.87.ooo50575.fragments.patch 
Removed Files:
	openoffice.org-1.9.108.oooXXXXX.solenv.nostipwithsimpleinstall.patch 
	openoffice.org-1.9.87.oooXXXXX.fragments.patch 
Log Message:
more foo

openoffice.org-1.9.108.ooo48814.solenv.nostripwithsimpleinstall.patch:
 bin/make_installer.pl                     |    0 
 bin/modules/installer/globals.pm          |    0 
 bin/modules/installer/parameter.pm        |    0 
 solenv/bin/make_installer.pl              |    2 +-
 solenv/bin/modules/installer/globals.pm   |    2 +-
 solenv/bin/modules/installer/parameter.pm |    1 +
 6 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE openoffice.org-1.9.108.ooo48814.solenv.nostripwithsimpleinstall.patch ---
Index: bin/make_installer.pl
===================================================================
RCS file: /cvs/tools/solenv/bin/make_installer.pl,v
retrieving revision 1.43
diff -u -p -u -r1.43 make_installer.pl
--- openoffice.org.orig/solenv/bin/make_installer.pl	13 May 2005 09:40:50 -0000	1.43
+++ openoffice.org/solenv/bin/make_installer.pl	9 Jun 2005 09:51:48 -0000
@@ -1186,7 +1186,7 @@ for ( my $n = 0; $n <= $#installer::glob
 			# 1. copy all files that need to be stripped locally 
 			# 2. strip all these files
 
-			installer::strip::strip_libraries($filesinpackage, $languagestringref);
+			if ( $installer::globals::strip ) { installer::strip::strip_libraries($filesinpackage, $languagestringref); }
 			if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . $packagename ."_files.log", $filesinpackage); }
 
 			###############################################################
Index: bin/modules/installer/globals.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/globals.pm,v
retrieving revision 1.35
diff -u -p -u -r1.35 globals.pm
--- openoffice.org.orig/solenv/bin/modules/installer/globals.pm	13 May 2005 09:41:38 -0000	1.35
+++ openoffice.org/solenv/bin/modules/installer/globals.pm	9 Jun 2005 09:51:55 -0000
@@ -151,7 +151,7 @@ BEGIN
 	@linuxlinks = ();
 	@linkrpms = ();
 	
-	$strip = 0;
+	$strip = 1;
 	$solarjava = 0;
 	$jdklib = "";
 	$jrepath = "";
Index: bin/modules/installer/parameter.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/parameter.pm,v
retrieving revision 1.23
diff -u -p -u -r1.23 parameter.pm
--- openoffice.org.orig/solenv/bin/modules/installer/parameter.pm	20 May 2005 07:40:16 -0000	1.23
+++ openoffice.org/solenv/bin/modules/installer/parameter.pm	9 Jun 2005 09:51:58 -0000
@@ -203,6 +203,7 @@ sub getparameter
 		{
 			$installer::globals::simple = 1;
 			$installer::globals::call_epm = 0;
+			$installer::globals::strip = 0;
 			my $path = shift(@ARGV);
 			$path =~ s/^$installer::globals::destdir//;
 			$installer::globals::rootpath = $path;

openoffice.org-1.9.87.ooo50575.fragments.patch:
 filter/source/config/fragments/makefile.mk |    2 +-
 source/config/fragments/makefile.mk        |    0 
 2 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-1.9.87.ooo50575.fragments.patch ---
Index: source/config/fragments/makefile.mk
===================================================================
RCS file: /cvs/framework/filter/source/config/fragments/makefile.mk,v
retrieving revision 1.8
diff -u -p -r1.8 makefile.mk
--- openoffice.org.orig/filter/source/config/fragments/makefile.mk	21 Mar 2005 11:49:06 -0000	1.8
+++ openoffice.org/filter/source/config/fragments/makefile.mk	23 Mar 2005 19:39:36 -0000
@@ -176,7 +176,7 @@ ALLTAR: \
 MERGE:=python ../tools/merge/pyAltFCFGMerge
 .ELSE
 MERGE    := $(JAVA) -jar $(CLASSDIR)$/FCFGMerge.jar
-PACKLANG := $(JAVA) org.apache.xalan.xslt.Process -XSL langfilter.xsl
+PACKLANG := $(JAVA) $(JAVACPS) $(SOLARSHAREDBIN)/../bin/xalan.jar org.apache.xalan.xslt.Process -XSL langfilter.xsl
 .ENDIF
 
 # -----------------------------------------------------------------------------


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- openoffice.org.spec	10 Jun 2005 09:49:38 -0000	1.217
+++ openoffice.org.spec	10 Jun 2005 15:35:14 -0000	1.218
@@ -1,5 +1,5 @@
 %define ooo2ver 108
-%define ooo_rpm_release 4
+%define ooo_rpm_release 5
 %define build_fc4 0
 %define build_fc5 1
 
@@ -74,7 +74,7 @@
 Patch8:  openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch
 Patch10: openoffice.org-1.9.87.warnnoterroronmissing.patch
 Patch11: openoffice.org-1.9.87.rh151357.patch
-Patch12: openoffice.org-1.9.87.oooXXXXX.fragments.patch
+Patch12: openoffice.org-1.9.87.ooo50575.fragments.patch
 Patch13: openoffice.org-1.9.88.NONE.gcc3gcj4.patch
 Patch14: openoffice.org-1.9.88.rh133741.alwaysgtk.patch
 Patch15: openoffice.org-1.9.88.ooo46217.allowfallbacktoenUSfromotherenglish.patch
@@ -107,7 +107,7 @@
 Patch44: openoffice.org-1.9.106.ooo50172.icu.tamilvowelslikepango.patch
 Patch45: workspace.vcl39.patch
 Patch46: openoffice.org-1.9.108.ooo30133.lingucomponent.ukrainean.patch
-Patch47: openoffice.org-1.9.108.oooXXXXX.solenv.nostipwithsimpleinstall.patch
+Patch47: openoffice.org-1.9.108.ooo48814.solenv.nostripwithsimpleinstall.patch
 Patch48: openoffice.org-1.9.108.ooo47323.binfilter.stupiddetect.patch
 
 %define instdir %{_libdir}/openoffice.org%{version}
@@ -143,7 +143,7 @@
 Group: Applications/Productivity
 Requires: libart_lgpl >= 2.3.11, zlib, freetype, cups, curl, libxml2, openldap
 Requires: gtk2, gnome-vfs2, mozilla-nss >= 1.7.5, neon >= 0.24
-Requires: startup-notification, libjpeg
+Requires: startup-notification, libjpeg, bitstream-vera-fonts
 # Ensure we have 32-bit theme libs in 64-bit multilib environments.
 # We need at least 32-bit redhat-artwork and 32-bit gtk2-engines, but
 # rpm doesn't "do the right thing" if only the packages are Required.
@@ -154,8 +154,7 @@
 Requires: libgcj4 >= %{gcjver}
 %endif
 Requires: java-1.4.2-gcj-compat
-PreReq: desktop-file-utils >= 0.9
-PreReq: gtk2 >= 2.4.8
+PreReq: desktop-file-utils >= 0.9, gtk2 >= 2.4.8
 Obsoletes: openoffice.org
 Obsoletes: openoffice.org-libs
 Obsoletes: openoffice.org-i18n
@@ -580,6 +579,7 @@
 Summary: Russian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: urw-fonts
 Obsoletes: openoffice.org-i18n
 
 %description langpack-ru
@@ -689,7 +689,7 @@
 %patch8  -p1 -b .usetwodotzeropath.patch
 %patch10 -p1 -b .warnnoterroronmissing.patch
 %patch11 -p1 -b .rh151357.patch
-%patch12 -p1 -b .oooXXXXX.fragments.patch
+%patch12 -p1 -b .ooo50575.fragments.patch
 %patch13 -p1 -b .gcc3gcj4.patch
 %patch14 -p1 -b .rh133741.alwaysgtk.patch
 %patch15 -p1 -b .ooo46217.allowfallbacktoenUSfromotherenglish.patch
@@ -722,7 +722,7 @@
 %patch44 -p1 -b .ooo50172.icu.tamilvowelslikepango.patch
 %patch45 -p1 -b .workspace.vcl39.patch
 %patch46 -p1 -b .ooo30133.lingucomponent.ukrainean.patch
-%patch47 -p1 -b .oooXXXXX.solenv.nostipwithsimpleinstall.patch
+%patch47 -p1 -b .ooo48814.solenv.nostripwithsimpleinstall.patch
 %patch48 -p1 -b .ooo47323.binfilter.stupiddetect.patch
 
 #start ludicrous workaround
@@ -2535,6 +2535,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Fri Jun 10 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.108-5
+- rh#158943# Require some fonts
+
 * Fri Jun 10 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.108-4
 - ooo#50556# Filetype-label doesn't support special char
 


--- openoffice.org-1.9.108.oooXXXXX.solenv.nostipwithsimpleinstall.patch DELETED ---


--- openoffice.org-1.9.87.oooXXXXX.fragments.patch DELETED ---


