rpms/openoffice.org/devel openoffice.org.spec, 1.184, 1.185 openoffice.org-1.9.75.ooo41904.singleton.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed May 4 08:28:14 UTC 2005
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18895
Modified Files:
openoffice.org.spec
Removed Files:
openoffice.org-1.9.75.ooo41904.singleton.patch
Log Message:
bump to next version
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- openoffice.org.spec 3 May 2005 20:21:08 -0000 1.184
+++ openoffice.org.spec 4 May 2005 08:28:12 -0000 1.185
@@ -1,4 +1,4 @@
-%define ooo2ver 99
+%define ooo2ver 100
#undef to get english only and no-langpacks for a quick smoketest build
%define langpacks 1
%if %{langpacks}
@@ -20,7 +20,7 @@
Summary: OpenOffice.org comprehensive office suite.
Name: openoffice.org
Version: 1.9.%{ooo2ver}
-Release: 2
+Release: 1
Epoch: 1
License: LGPL/SISSL
Group: Applications/Productivity
@@ -55,42 +55,41 @@
Patch0: openoffice.org-1.9.80.NONE.skipuselessmodules.patch
Patch1: openoffice.org-1.9.71s1.noregisterwizard.patch
Patch2: openoffice.org-1.9.74.ooo41875.mktemp.patch
-Patch3: openoffice.org-1.9.75.ooo41904.singleton.patch
-Patch4: openoffice.org-1.9.84.ooo44843.sdcasting.patch
-Patch5: openoffice.org-1.9.84.ooo44846.svxcasting.patch
-Patch6: openoffice.org-1.9.84.NONE.dictionaries.contribdict.patch
-Patch7: openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch
-Patch8: openoffice.org-1.9.84.ooo45162.svxcasting2.patch
-Patch9: openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch
-Patch10: openoffice.org-1.9.88.rh150650.gcjneedstoresolveallrequirements.patch
-Patch11: openoffice.org-1.9.87.warnnoterroronmissing.patch
-Patch12: openoffice.org-1.9.87.rh151357.patch
-Patch13: openoffice.org-1.9.87.oooXXXXX.fragments.patch
-Patch14: openoffice.org-1.9.88.NONE.gcc3gcj4.patch
-Patch15: openoffice.org-1.9.88.rh133741.alwaysgtk.patch
-Patch16: openoffice.org-1.9.88.ooo46217.allowfallbacktoenUSfromotherenglish.patch
-Patch17: openoffice.org-1.9.89.ooo35627.parallel.cppumaker.patch
-Patch18: openoffice.org-1.9.89.oooXXXXX.parallel.sysui.patch
-Patch19: openoffice.org-1.9.89.ooo46528.stillnotpic.icu.patch
-Patch20: openoffice.org-1.9.89.ooo44027.pthreadchange.patch
-Patch21: openoffice.org-1.9.89.ooo46912.setjmpoutsidenamespace.binfilter.patch
-Patch22: openoffice.org-1.9.89.oooXXXXX.upstreamhatesthefp.officecfg.patch
-Patch23: openoffice.org-1.9.89.rh152269.nfs.desktop.patch
-Patch24: openoffice.org-1.9.89.gccXXXXX.hsqldbproblems.hsqldb.patch
-Patch25: workspace.db4.patch
-Patch26: openoffice.org-1.9.91.oooXXXXX.fontfallbacks.officecfg.patch
-Patch27: openoffice.org-1.9.90.ooo46585.sunmiscisnotstandard.filter.patch
-Patch28: openoffice.org-1.9.92.oooXXXXX.addindic.patch
-Patch29: workspace.db4-2.patch
-Patch30: openoffice.org-1.9.92.oooXXXXX.gtk-nwf-combo-box-button-fix.patch
-Patch31: openoffice.org-1.9.96.ooo35641.noxfonts.vcl.patch
-Patch32: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch
-Patch33: openoffice.org-1.9.97.ooo48362.checkzipresult.sc.patch
-Patch34: openoffice.org-1.9.97.rh156067.noversionedicons.patch
-Patch35: openoffice.org-1.9.97.ooo48600.rtfparseerror.svx.patch
-Patch36: openoffice.org-1.9.99.gcc19870.gcjaccessproblem.filter.patch
-Patch37: openoffice.org-1.9.97.ooo48610.searchalltemplates.wizards.patch
-Patch38: openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch
+Patch3: openoffice.org-1.9.84.ooo44843.sdcasting.patch
+Patch4: openoffice.org-1.9.84.ooo44846.svxcasting.patch
+Patch5: openoffice.org-1.9.84.NONE.dictionaries.contribdict.patch
+Patch6: openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch
+Patch7: openoffice.org-1.9.84.ooo45162.svxcasting2.patch
+Patch8: openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch
+Patch9: openoffice.org-1.9.88.rh150650.gcjneedstoresolveallrequirements.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
+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
+Patch16: openoffice.org-1.9.89.ooo35627.parallel.cppumaker.patch
+Patch17: openoffice.org-1.9.89.oooXXXXX.parallel.sysui.patch
+Patch18: openoffice.org-1.9.89.ooo46528.stillnotpic.icu.patch
+Patch19: openoffice.org-1.9.89.ooo44027.pthreadchange.patch
+Patch20: openoffice.org-1.9.89.ooo46912.setjmpoutsidenamespace.binfilter.patch
+Patch21: openoffice.org-1.9.89.oooXXXXX.upstreamhatesthefp.officecfg.patch
+Patch22: openoffice.org-1.9.89.rh152269.nfs.desktop.patch
+Patch23: openoffice.org-1.9.89.gccXXXXX.hsqldbproblems.hsqldb.patch
+Patch24: workspace.db4.patch
+Patch25: openoffice.org-1.9.91.oooXXXXX.fontfallbacks.officecfg.patch
+Patch26: openoffice.org-1.9.90.ooo46585.sunmiscisnotstandard.filter.patch
+Patch27: openoffice.org-1.9.92.oooXXXXX.addindic.patch
+Patch28: workspace.db4-2.patch
+Patch29: openoffice.org-1.9.92.oooXXXXX.gtk-nwf-combo-box-button-fix.patch
+Patch30: openoffice.org-1.9.96.ooo35641.noxfonts.vcl.patch
+Patch31: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch
+Patch32: openoffice.org-1.9.97.ooo48362.checkzipresult.sc.patch
+Patch33: openoffice.org-1.9.97.rh156067.noversionedicons.patch
+Patch34: openoffice.org-1.9.97.ooo48600.rtfparseerror.svx.patch
+Patch35: openoffice.org-1.9.99.gcc19870.gcjaccessproblem.filter.patch
+Patch36: openoffice.org-1.9.97.ooo48610.searchalltemplates.wizards.patch
+Patch37: openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch
%define instdir %{_libdir}/openoffice.org%{version}
@@ -642,56 +641,52 @@
%patch0 -p1 -b .skipuselessmodules.patch
%patch1 -p1 -b .noregisterwizard
%patch2 -p1 -b .ooo41875.mktemp.patch
-%patch3 -p1 -b .ooo41904.singleton.patch
-%patch4 -p1 -b .ooo44843.sdcasting.patch
-%patch5 -p1 -b .ooo44846.svxcasting.patch
-%patch6 -p1 -b .dictionaries.contribdict.patch
-%patch7 -p1 -b .ooo45725.lingucomponent.contribdict.patch
-%patch8 -p1 -b .ooo45162.svxcasting2.patch
-%patch9 -p1 -b .usetwodotzeropath.patch
-%patch10 -p1 -b .rh150650.gcjneedstoresolveallrequirements.patch
-%patch11 -p1 -b .warnnoterroronmissing.patch
-%patch12 -p1 -b .rh151357.patch
-%patch13 -p1 -b .oooXXXXX.fragments.patch
-%patch14 -p1 -b .gcc3gcj4.patch
-%patch15 -p1 -b .rh133741.alwaysgtk.patch
-%patch16 -p1 -b .ooo46217.allowfallbacktoenUSfromotherenglish.patch
-%patch17 -p1 -b .ooo35627.parallel.cppumaker.patch
-%patch18 -p1 -b .oooXXXXX.parallel.sysui.patch
-%patch19 -p1 -b .ooo46528.stillnotpic.icu.patch
-%patch20 -p1 -b .ooo44027.pthreadchange.patch
-%patch21 -p1 -b .ooo46912.setjmpoutsidenamespace.binfilter.patch
-%patch22 -p1 -b .oooXXXXX.upstreamhatesthefp.officecfg.patch
-%patch23 -p1 -b .rh152269.nfs.desktop.patch
-%patch24 -p1 -b .gccXXXXX.hsqldbproblems.hsqldb.patch
-%patch25 -p1 -R -b .workspace.db4.patch
-%patch26 -p1 -b .oooXXXXX.fontfallbacks.officecfg.patch
-%patch27 -p1 -b .ooo46585.sunmiscisnotstandard.filter.patch
-%patch28 -p1 -b .oooXXXXX.addindic.patch
-%patch29 -p1 -b .workspace.db4-2.patch
-%patch30 -p1 -b .oooXXXXX.gtk-nwf-combo-box-button-fix.patch
-%patch31 -p1 -b .ooo35641.noxfonts.vcl.patch
-%patch32 -p1 -b .ooo48256.nolongname.sysui.patch
-%patch33 -p1 -b .ooo48362.checkzipresult.sc.patch
-%patch34 -p1 -b .rh156067.noversionedicons.patch
-%patch35 -p1 -b .ooo48600.rtfparseerror.svx.patch
-%patch36 -p1 -b .gcc19870.gcjaccessproblem.filter.patch
-%patch37 -p1 -b .ooo48610.searchalltemplates.wizards.patch
-%patch38 -p1 -b .gcc19870.gcjaccessproblem.wizards.patch
-
+%patch3 -p1 -b .ooo44843.sdcasting.patch
+%patch4 -p1 -b .ooo44846.svxcasting.patch
+%patch5 -p1 -b .dictionaries.contribdict.patch
+%patch6 -p1 -b .ooo45725.lingucomponent.contribdict.patch
+%patch7 -p1 -b .ooo45162.svxcasting2.patch
+%patch8 -p1 -b .usetwodotzeropath.patch
+%patch9 -p1 -b .rh150650.gcjneedstoresolveallrequirements.patch
+%patch10 -p1 -b .warnnoterroronmissing.patch
+%patch11 -p1 -b .rh151357.patch
+%patch12 -p1 -b .oooXXXXX.fragments.patch
+%patch13 -p1 -b .gcc3gcj4.patch
+%patch14 -p1 -b .rh133741.alwaysgtk.patch
+%patch15 -p1 -b .ooo46217.allowfallbacktoenUSfromotherenglish.patch
+%patch16 -p1 -b .ooo35627.parallel.cppumaker.patch
+%patch17 -p1 -b .oooXXXXX.parallel.sysui.patch
+%patch18 -p1 -b .ooo46528.stillnotpic.icu.patch
+%patch19 -p1 -b .ooo44027.pthreadchange.patch
+%patch20 -p1 -b .ooo46912.setjmpoutsidenamespace.binfilter.patch
+%patch21 -p1 -b .oooXXXXX.upstreamhatesthefp.officecfg.patch
+%patch22 -p1 -b .rh152269.nfs.desktop.patch
+%patch23 -p1 -b .gccXXXXX.hsqldbproblems.hsqldb.patch
+%patch24 -p1 -R -b .workspace.db4.patch
+%patch25 -p1 -b .oooXXXXX.fontfallbacks.officecfg.patch
+%patch26 -p1 -b .ooo46585.sunmiscisnotstandard.filter.patch
+%patch27 -p1 -b .oooXXXXX.addindic.patch
+%patch28 -p1 -b .workspace.db4-2.patch
+%patch29 -p1 -b .oooXXXXX.gtk-nwf-combo-box-button-fix.patch
+%patch30 -p1 -b .ooo35641.noxfonts.vcl.patch
+%patch31 -p1 -b .ooo48256.nolongname.sysui.patch
+%patch32 -p1 -b .ooo48362.checkzipresult.sc.patch
+%patch33 -p1 -b .rh156067.noversionedicons.patch
+%patch34 -p1 -b .ooo48600.rtfparseerror.svx.patch
+%patch35 -p1 -b .gcc19870.gcjaccessproblem.filter.patch
+%patch36 -p1 -b .ooo48610.searchalltemplates.wizards.patch
+%patch37 -p1 -b .gcc19870.gcjaccessproblem.wizards.patch
#start ludicrous workaround
#while we include these libs we need this, if/when we move to system
#libxmlsec/portaudio/sndfile/db4 then this needs to be modified/dropped
%define __find_provides %{_builddir}/SRC680_m%{ooo2ver}/find-provides
-#find_provides=`rpm --eval %%{__find_provides}`
-find_provides=/usr/lib/rpm/redhat/find-provides
+find_provides=`rpm --eval %%{__find_provides}`
echo "$find_provides | grep -v libxmlsec1 | grep -v libsndfile | grep -v libportaudio | grep -v libdb- | grep -v libdb_" > find-provides
chmod +x find-provides
%define __find_requires %{_builddir}/SRC680_m%{ooo2ver}/find-requires
-#find_requires=`rpm --eval %%{__find_requires}`
-find_requires=/usr/lib/rpm/redhat/find-requires
-echo "$find_requires | grep -v libxmlsec1 | grep -v libsndfile | grep -v libportaudio | grep -v libdb- | grep -v libdb_ | grep -v \(" > find-requires
+find_requires=`rpm --eval %%{__find_requires}`
+echo "$find_requires | grep -v libxmlsec1 | grep -v libsndfile | grep -v libportaudio | grep -v libdb- | grep -v libdb_ | grep -v \("> find-requires
chmod +x find-requires
#end ludicrous workaround
@@ -2441,6 +2436,10 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
+* Wed May 04 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.100-1
+- bump to next version
+- drop finally integrated openoffice.org-1.9.75.ooo41904.singleton.patch
+
* Tue May 03 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.99-2
- add openoffice.org-1.9.99.gcc19870.gcjaccessproblem.filter.patch for gcj bug workaround
- add openoffice.org-1.9.97.ooo48610.searchalltemplates.wizards.patch
--- openoffice.org-1.9.75.ooo41904.singleton.patch DELETED ---
More information about the fedora-cvs-commits
mailing list