rpms/openoffice.org/FC-4 openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch, 1.7, 1.8 openoffice.org.spec, 1.235, 1.236

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Jan 12 13:42:48 UTC 2006 

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch 
	openoffice.org.spec 
Log Message:
try again

openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch:
 config_office/configure.in                       |   20 ++
 config_office/set_soenv.in                       |    1 
 source/cxxhelp/provider/makefile.mk              |    0 
 source/cxxhelp/provider/urlparameter.cxx         |    0 
 util/makefile.mk                                 |    0 
 xmlhelp/source/cxxhelp/provider/makefile.mk      |    6 
 xmlhelp/source/cxxhelp/provider/urlparameter.cxx |  220 +++++++++++++++++++----
 xmlhelp/util/makefile.mk                         |   13 +
 8 files changed, 222 insertions(+), 38 deletions(-)

Index: openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch	12 Jan 2006 13:26:56 -0000	1.7
+++ openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch	12 Jan 2006 13:42:45 -0000	1.8
@@ -44,14 +44,14 @@
 diff -u config_office.orig/set_soenv.in config_office/set_soenv.in
 --- openoffice.org.orig/config_office/set_soenv.in	2005-08-30 15:45:40.000000000 +0100
 +++ openoffice.org/config_office/set_soenv.in	2005-08-30 15:50:51.000000000 +0100
-@@ -1767,6 +1767,7 @@
- ToFile( "HSQLDB_JAR",        "@HSQLDB_JAR@",       "e" );
- ToFile( "SYSTEM_BSH",        "@SYSTEM_BSH@",       "e" );
- ToFile( "BSH_JAR",           "@BSH_JAR@",          "e" );
-+ToFile( "SYSTEM_LIBXSLT",    "@SYSTEM_LIBXSLT@",   "e" );
+@@ -1765,6 +1765,7 @@
+ ToFile( "DB_JAR",            "@DB_JAR@",           "e" );
  ToFile( "SYSTEM_SABLOT",     "@SYSTEM_SABLOT@",    "e" );
  ToFile( "SABLOT_LIBS",       "@SABLOT_LIBS@",      "e" );
++ToFile( "SYSTEM_LIBXSLT",    "@SYSTEM_LIBXSLT@",   "e" );
  ToFile( "SYSTEM_ODBC_HEADERS","@SYSTEM_ODBC_HEADERS@","e" );
+ ToFile( "SYSTEM_SANE_HEADER","@SYSTEM_SANE_HEADER@","e" );
+ ToFile( "SYSTEM_XRENDER_HEADERS","@SYSTEM_XRENDER_HEADERS@","e" );
 Index: source/cxxhelp/provider/makefile.mk
 ===================================================================
 RCS file: /cvs/util/xmlhelp/source/cxxhelp/provider/makefile.mk,v


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org.spec,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -r1.235 -r1.236
--- openoffice.org.spec	12 Jan 2006 13:26:56 -0000	1.235
+++ openoffice.org.spec	12 Jan 2006 13:42:45 -0000	1.236
@@ -961,12 +961,16 @@
 #use the RPM_OPT_FLAGS but remove the OOo overridden ones
 for i in $RPM_OPT_FLAGS; do
         case "$i" in
-                -O?|-pipe|-Wall|-g|-fexceptions|-fasynchronous-unwind-tables|-mtune=pentium4) continue;;
+                -O?|-pipe|-Wall|-g|-fexceptions|-fasynchronous-unwind-tables) continue;;
         esac
         ARCH_FLAGS="$ARCH_FLAGS $i"
 done
+%if build_fc4  # gcc#25199#
+ARCH_FLAGS=${ARCH_FLAGS/-mtune=pentium4/-mtune=pentiumpro}
+%endif
 export ARCH_FLAGS
 
+
 # gcc#19870# gcj access problems, monsterous hack to force all java through
 # a sed script which replaces private and protected with public, shudder!
 cp %{SOURCE8} solenv/bin/gcj
@@ -979,7 +983,7 @@
 %if ! %{internaljavabits}
 export XML_CLASSPATH=/usr/share/java/xalan-j2.jar:/usr/share/java/xerces-j2.jar
 export SYSTEM_XALAN="YES"
-export BUILD_TYPE=`echo $BUILD_TYPE | sed -e "s/XALAN//"`
+export BUILD_TYPE=${BUILD_TYPE/XALAN}
 %else
 export BUILD_TYPE="$BUILD_TYPE xalan"
 export ARCH_FLAGS="$ARCH_FLAGS -fno-strict-aliasing"
@@ -1029,8 +1033,7 @@
 
 #start of jakub based suggestion on prelink optimization 
 cd desktop/source/app
-sed -e "s/OBJ/SLO/" makefile.mk > makefile.mk.prelink
-mv -f makefile.mk.prelink makefile.mk
+sed -i -e "s/OBJ/SLO/" makefile.mk
 dmake
 cd ../../util
 `(cat ../$OUTPATH.pro/misc/soffice.cmd | sed -e "s/obj/slo/g" | sed -e "s/bin\/soffice/lib\/libsoffice.so -shared/" && grep ^lib ../$OUTPATH.pro/misc/pagein-common | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs | xargs`
@@ -1052,15 +1055,11 @@
 $RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{SOURCE5}
 
 # rh#163147# convert non AMT to AMT fonts
-sed -e "s/Thorndale/Thorndale AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu > sedded
-mv -f sedded $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu
-sed -e "s/Albany /Albany AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu > sedded
-mv -f sedded $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu
-sed -e "s/Cumberland/Cumberland AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu > sedded
-mv -f sedded $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu
+sed -i -e "s/Thorndale/Thorndale AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu
+sed -i -e "s/Albany /Albany AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu 
+sed -i -e "s/Cumberland/Cumberland AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu 
 %if %{build_fc4}
-sed -e "s/Times New Roman/Times New Roman;Nimbus Roman No9 L/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu > sedded
-mv -f sedded $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu
+sed -i -e "s/Times New Roman/Times New Roman;Nimbus Roman No9 L/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu
 %endif
 
 #rh#158977# clear execstack requirement
@@ -3345,7 +3344,7 @@
 * Wed Jan 04 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1.1-5
 - spinbutton factory needs to be uneditable as well as combobox
 - add openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch for jrb
-- rebuild without -mtune 
+- retry -mtune workaround
 
 * Thu Dec 22 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1.1-4
 - add openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch for rh#176779#

More information about the fedora-cvs-commits mailing list