rpms/openoffice.org/devel openoffice.org.spec, 1.642, 1.643 openoffice.org-2.0.1.gcc25199.bitfieldaccess.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Mar 21 10:44:11 UTC 2006 

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-2.0.1.gcc25199.bitfieldaccess.patch 
Log Message:
drop fc4 junk


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.642
retrieving revision 1.643
diff -u -r1.642 -r1.643
--- openoffice.org.spec	16 Mar 2006 13:17:19 -0000	1.642
+++ openoffice.org.spec	21 Mar 2006 10:44:09 -0000	1.643
@@ -1,9 +1,9 @@
 %define oootag OOB680
 %define ooomilestone 5
-%define rh_rpm_release 3
+%define rh_rpm_release 2cmc
 
-%define build_fc5 1
-%define build_fc4 0
+%define build_fc6 1
+%define build_fc5 0
 %define build_rhel4 0
 
 # gcc#19664#
@@ -18,24 +18,7 @@
 %define internalicu 1
 %define internalagg 1
 %define internaljavabits 1
-%define includeemailmerge 1
-%define cripplemenus 1
-%define seperatebase 1
 %define gnomeprintui 0
-%define fc5langpack 1
-%endif
-%if %{build_fc4}
-%define forcegcc4 0
-%define rh_rpm_extension 1
-%define internalxmlsec 1
-%define internalicu 1
-%define internalagg 1
-%define internaljavabits 1
-%define includeemailmerge 0
-%define cripplemenus 0
-%define seperatebase 0
-%define gnomeprintui 0
-%define fc5langpack 0
 %endif
 %if %{build_fc5}
 %define forcegcc4 0
@@ -44,12 +27,18 @@
 %define internalicu 0
 %define internalagg 0
 %define internaljavabits 0
-%define includeemailmerge 1
-%define cripplemenus 1
-%define seperatebase 1
 %define gnomeprintui 1
-%define fc5langpack 1
 %endif
+%if %{build_fc6}
+%define forcegcc4 0
+%define rh_rpm_extension 3
+%define internalxmlsec 0
+%define internalicu 0
+%define internalagg 0
+%define internaljavabits 0
+%define gnomeprintui 1
+%endif
+
 
 %if %{forcegcc4}
 %define gij gij4
@@ -104,12 +93,7 @@
 %endif
 
 %if %{langpacks}
-%define langpack_core af ar bg bn ca cs cy da de el en-US es et eu fi fr gl gu-IN pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn pl pt pt-BR ru sk sl sv ta-IN th tr zh-CN zh-TW zu
-%if %{fc5langpack}
-%define langpack_langs %{langpack_core} ga sr-CS
-%else
-%define langpack_langs %{langpack_core}
-%endif
+%define langpack_langs af ar bg bn ca cs cy da de el en-US es et eu fi fr ga gl gu-IN pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn pl pt pt-BR ru sk sl sr-CS sv ta-IN th tr zh-CN zh-TW zu
 %else
 %define langpack_langs en-US
 %endif
@@ -196,15 +180,14 @@
 Patch26: workspace.targetedaot.patch
 Patch27: openoffice.org-2.0.1.ooo58663.vcl.missingglyph.patch
 Patch28: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
-Patch29: openoffice.org-2.0.1.gcc25199.bitfieldaccess.patch
-Patch30: openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch
-Patch31: openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch
-Patch32: openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch
-Patch33: openoffice.org-2.0.2.ooo61875.sd.compile.patch
-Patch34: openoffice.org-2.0.2-ooo61841.vcl.honourfontconfigoverrides.patch
-Patch35: openoffice.org-2.0.2.ooo62030.solenv._version.patch
-Patch36: openoffice.org-2.0.2.oooXXXXX.config_office.noppds.patch
-Patch37: openoffice.org-2.0.2.ooo63155.sfx2.badscript.patch
+Patch29: openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch
+Patch30: openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch
+Patch31: openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch
+Patch32: openoffice.org-2.0.2.ooo61875.sd.compile.patch
+Patch33: openoffice.org-2.0.2-ooo61841.vcl.honourfontconfigoverrides.patch
+Patch34: openoffice.org-2.0.2.ooo62030.solenv._version.patch
+Patch35: openoffice.org-2.0.2.oooXXXXX.config_office.noppds.patch
+Patch36: openoffice.org-2.0.2.ooo63155.sfx2.badscript.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -262,7 +245,6 @@
 external to %{name} and within the internal %{name} scripting module to be
 written in python
 
-%if %{seperatebase}
 %package base
 Summary: database frontend for %{name}
 Group: Development/Libraries
@@ -271,7 +253,6 @@
 %description base
 Gui database frontend for %{name}. Allows creation and management of databases
 through a GUI.
-%endif
 
 %package writer
 Summary: writer module for %{name}
@@ -283,7 +264,6 @@
 %description writer
 wordprocessor application of %{name}
 
-%if %{includeemailmerge}
 %package emailmerge
 Summary: email mail merge component for %{name}
 Group: Applications/Productivity
@@ -293,7 +273,6 @@
 
 %description emailmerge
 enables %{name} writer module to enable mail merge to email
-%endif
 
 %package calc
 Summary: calc module for %{name}
@@ -510,7 +489,6 @@
 %description langpack-fr
 Provides additional french translations for %{name}
 
-%if %{fc5langpack}
 %package langpack-ga_IE
 Summary: Irish language pack for %{name}
 Group: Applications/Productivity
@@ -518,7 +496,6 @@
 
 %description langpack-ga_IE
 Provides additional irish translations for %{name}
-%endif
 
 %package langpack-gl_ES
 Summary: Galician language pack for %{name}
@@ -732,7 +709,6 @@
 %description langpack-sl_SI
 Provides additional slovenian translations for %{name}
 
-%if %{fc5langpack}
 %package langpack-sr_CS
 Summary: Serbian language pack for %{name}
 Group: Applications/Productivity
@@ -740,7 +716,6 @@
 
 %description langpack-sr_CS
 Provides additional serbian translations for %{name}
-%endif
 
 %package langpack-sv
 Summary: Swedish language pack for %{name}
@@ -823,9 +798,7 @@
 %if %{gnomeprintui}
 %patch5  -p1 -b .rh127576.gnomeprintui.patch
 %endif
-%if %{cripplemenus}
 %patch6  -p1 -b .rh156677.cripplemenus.sysui.patch
-%endif
 %patch7  -p1 -b .rh171692.jvmfwk.defaulttogcj.patch
 %patch8  -p1 -b .rhXXXXX.extensions.defaulttoevo2.patch
 %patch9  -p1 -b .ooo34909.dbaccess.patch
@@ -852,17 +825,14 @@
 %patch26 -p1 -b .workspace.targetedaot.patch
 %patch27 -p1 -b .ooo58663.vcl.missingglyph.patch
 %patch28 -p1 -b .ooo58606.sw.pre-edit.patch
-%if %{build_fc4}
-%patch29 -p1 -b .gcc25199.bitfieldaccess.patch
-%endif
-%patch30 -p1 -b .ooo59675.sysui.rtfmimetype.patch
-%patch31 -p1 -b .ooo59997.sw.defaultbullets.patch
-%patch32 -p1 -b .ooo19976.framework.nofocussteal.patch
-%patch33 -p1 -b .ooo61875.sd.compile.patch
-%patch34 -p1 -b .ooo61841.vcl.honourfontconfigoverrides.patch
-%patch35 -p1 -b .ooo62030.solenv._version.patch
-%patch36 -p1 -b .oooXXXXX.config_office.noppds.patch
-%patch37 -p1 -b .ooo63155.sfx2.badscript.patch
+%patch29 -p1 -b .ooo59675.sysui.rtfmimetype.patch
+%patch30 -p1 -b .ooo59997.sw.defaultbullets.patch
+%patch31 -p1 -b .ooo19976.framework.nofocussteal.patch
+%patch32 -p1 -b .ooo61875.sd.compile.patch
+%patch33 -p1 -b .ooo61841.vcl.honourfontconfigoverrides.patch
+%patch34 -p1 -b .ooo62030.solenv._version.patch
+%patch35 -p1 -b .oooXXXXX.config_office.noppds.patch
+%patch36 -p1 -b .ooo63155.sfx2.badscript.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -870,14 +840,14 @@
 #libxmlsec/db4 then this needs to be modified/dropped
 find_provides="%{__find_provides}"
 echo "#!/bin/sh" > find-provides
-echo "$find_provides | grep -v libxmlsec1 | grep -v libdb- | grep -v libicu" >> find-provides
+echo "$find_provides | grep -v libxmlsec1 | grep -v libicu" >> find-provides
 echo "exit 0" >> find-provides
 chmod +x find-provides
 %define __find_provides %{_builddir}/%{ooo_base_name}/find-provides
 
 find_requires="%{__find_requires}"
 echo "#!/bin/sh" > find-requires
-echo "$find_requires | grep -v libxmlsec1 | grep -v libdb- | grep -v libicu | grep -v \(" >> find-requires
+echo "$find_requires | grep -v libxmlsec1 | grep -v libicu | grep -v \(" >> find-requires
 echo "exit 0" >> find-requires
 chmod +x find-requires
 %define __find_requires %{_builddir}/%{ooo_base_name}/find-requires
@@ -937,10 +907,6 @@
         esac
         ARCH_FLAGS="$ARCH_FLAGS $i"
 done
-# gcc#25199#
-%if %{build_fc4}
-ARCH_FLAGS=${ARCH_FLAGS/-mtune=pentium4/-mtune=pentiumpro}
-%endif
 export ARCH_FLAGS
 
 
@@ -1013,7 +979,7 @@
 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`
+`(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` -lgcj
 $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/soffice
 `( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/swriter) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-writer | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
 `( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/scalc) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-calc| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
@@ -1035,9 +1001,6 @@
 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 -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
 execstack -c $RPM_BUILD_ROOT/%{instdir}/program/libgcc3_uno.so
@@ -1084,12 +1047,6 @@
 #remove worthless ldap configuration backend
 rm -f $RPM_BUILD_ROOT/%{instdir}/program/ldapbe2.uno.so
 
-#remove the email mailmerge impl if packageing without it
-%if ! %{includeemailmerge}
-rm -rf $RPM_BUILD_ROOT/%{instdir}/program/mailmerge.py*
-rm -rf $RPM_BUILD_ROOT/%{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-javamail.xcu
-%endif
-
 #ensure that no sneaky un-prelinkable, un-fpic or non executable shared libs 
 #have snuck through
 pic=0
@@ -1181,10 +1138,6 @@
 mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/calc.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-calc.desktop
 mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/impress.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-impress.desktop
 mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/writer.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-writer.desktop
-%if ! %{cripplemenus}
-mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/math.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-math.desktop
-mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/draw.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-draw.desktop
-%endif
 rm -rf $RPM_BUILD_ROOT/%{instdir}/share/xdg
 cp -r sysui/unxlng*/misc/redhat/usr/share/icons $RPM_BUILD_ROOT/%{_datadir}
 cp -r sysui/unxlng*/misc/redhat/usr/share/mime-info $RPM_BUILD_ROOT/%{_datadir}
@@ -1531,7 +1484,6 @@
 %dir %{instdir}/share/registry/modules/org/openoffice/Setup
 %{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-fr.xcu
 
-%if %{fc5langpack}
 %files langpack-ga_IE
 %defattr(-,root,root)
 %dir %{instdir}
@@ -1552,7 +1504,6 @@
 %dir %{instdir}/share/registry/modules/org/openoffice
 %dir %{instdir}/share/registry/modules/org/openoffice/Setup
 %{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-ga.xcu
-%endif
 
 %files langpack-gl_ES
 %defattr(-,root,root)
@@ -2035,7 +1986,6 @@
 %dir %{instdir}/share/registry/modules/org/openoffice/Setup
 %{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-sl.xcu
 
-%if %{fc5langpack}
 %files langpack-sr_CS
 %defattr(-,root,root)
 %dir %{instdir}
@@ -2055,7 +2005,6 @@
 %dir %{instdir}/share/registry/modules/org/openoffice
 %dir %{instdir}/share/registry/modules/org/openoffice/Setup
 %{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-sr-CS.xcu
-%endif
 
 %files langpack-sv
 %defattr(-,root,root)
@@ -2849,9 +2798,6 @@
 %{_datadir}/icons
 %dir %{_datadir}/mime-info
 %{_datadir}/mime-info/*
-%if ! %{fc5langpack}
-%{instdir}/share/dict/ooo/*ga_IE*
-%endif
 %if %{internalxmlsec}
 %{instdir}/program/libxmlsec*
 %else
@@ -2872,22 +2818,6 @@
 %{instdir}/program/libdb-*.so
 %{instdir}/program/libdb_*.so
 %endif
-# base files
-%if ! %{seperatebase}
-%{instdir}/help/en/sdatabase.*
-%{instdir}/program/sbase
-%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-base.xcu
-%{instdir}/share/registry/modules/org/openoffice/Setup/Setup-base.xcu
-%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_database_filters.xcu
-%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Misc/fcfg_database_others.xcu
-%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_database_types.xcu
-%{_bindir}/oobase
-%dir %{_datadir}/applications
-%{_datadir}/applications/openoffice.org-*-base.desktop
-%dir %{_datadir}/mimelnk
-%dir %{_datadir}/mimelnk/application
-%{_datadir}/mimelnk/application/openoffice.org-*-oasis-database.desktop
-%endif
 
 %post core
 update-desktop-database -q %{_datadir}/applications
@@ -2915,7 +2845,6 @@
   fi
 done
 
-%if %{seperatebase}
 %files base
 %defattr(-,root,root)
 %{instdir}/help/en/sdatabase.*
@@ -2948,7 +2877,6 @@
 
 %postun base
 update-desktop-database -q %{_datadir}/applications
-%endif
 
 %files calc
 %defattr(-,root,root)
@@ -3050,9 +2978,6 @@
 %dir %{instdir}/share/registry/schema/org/openoffice/Office/UI
 %{instdir}/share/registry/schema/org/openoffice/Office/UI/DrawWindowState.xcs
 %dir %{_datadir}/applications
-%if ! %{cripplemenus}
-%{_datadir}/applications/openoffice.org-*-draw.desktop
-%endif
 %dir %{_datadir}/mimelnk
 %dir %{_datadir}/mimelnk/application
 %{_datadir}/mimelnk/application/*drawing*
@@ -3064,7 +2989,6 @@
 %postun draw
 update-desktop-database -q %{_datadir}/applications
 
-%if %{includeemailmerge}
 %files emailmerge
 %defattr(-,root,root)
 %dir %{instdir}
@@ -3078,7 +3002,6 @@
 %dir %{instdir}/share/registry/modules/org/openoffice/Office
 %dir %{instdir}/share/registry/modules/org/openoffice/Office/Writer
 %{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-javamail.xcu
-%endif
 
 %files writer
 %defattr(-,root,root)
@@ -3241,9 +3164,6 @@
 %dir %{instdir}/share/registry/schema/org/openoffice/Office/UI
 %{instdir}/share/registry/schema/org/openoffice/Office/UI/MathCommands.xcs
 %dir %{_datadir}/applications
-%if ! %{cripplemenus}
-%{_datadir}/applications/openoffice.org-*-math.desktop
-%endif
 %dir %{_datadir}/mimelnk
 %dir %{_datadir}/mimelnk/application
 %{_datadir}/mimelnk/application/*formula*
@@ -3349,7 +3269,7 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Mon Mar 13 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.3
+* Mon Mar 13 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.2cmc
 - ooo#59997# replacement opens___.ttf updated
 - drop integrated openoffice.org-2.0.0.ooo56651.sw.rtfcrash.patch
 - drop integrated openoffice.org-1.9.114.ooo51718.rpath.patch


--- openoffice.org-2.0.1.gcc25199.bitfieldaccess.patch DELETED ---

More information about the fedora-cvs-commits mailing list