rpms/openoffice.org/devel openoffice.org.spec,1.603,1.604

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
little cleanup


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.603
retrieving revision 1.604
diff -u -r1.603 -r1.604
--- openoffice.org.spec	4 Jan 2006 21:51:32 -0000	1.603
+++ openoffice.org.spec	12 Jan 2006 13:39:38 -0000	1.604
@@ -965,8 +965,12 @@
         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