|
|
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13331
Modified Files:
openoffice.org.spec
Removed Files:
workspace.gcc4fwdecl.patch
Log Message:
drop integrated patches
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -r1.239 -r1.240
--- openoffice.org.spec 17 Jun 2005 10:08:22 -0000 1.239
+++ openoffice.org.spec 17 Jun 2005 10:57:59 -0000 1.240
@@ -99,18 +99,17 @@
Patch30: openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch
Patch31: openoffice.org-1.9.104-use-fontconfig-everywhere.patch
Patch32: openoffice.org-1.9.104-berkeleydb-jni-casting-misuse.patch
-Patch33: workspace.gcc4fwdecl.patch
-Patch34: workspace-fpicker4.patch
-Patch35: openoffice.org-1.9.106.ooo44627.sal.brokencondition.patch
-Patch36: openoffice.org-1.9.106.ooo50172.icu.tamilvowelslikepango.patch
-Patch37: workspace.vcl39.patch
-Patch38: openoffice.org-1.9.108.ooo30133.lingucomponent.ukrainean.patch
-Patch39: openoffice.org-1.9.108.ooo48814.solenv.nostripwithsimpleinstall.patch
-Patch40: openoffice.org-1.9.108.ooo47323.binfilter.stupiddetect.patch
-Patch41: workspace.gslpatches2.patch
-Patch42: openoffice.org-1.9.108.oooXXXXX.pyuno.pushrpath.patch
-Patch43: openoffice.org-1.9.88.NONE.gcc3gcj4.patch
-Patch44: openoffice.org-1.9.108.ooo9290.goodies.epstoepdf.patch
+Patch33: workspace-fpicker4.patch
+Patch34: openoffice.org-1.9.106.ooo44627.sal.brokencondition.patch
+Patch35: openoffice.org-1.9.106.ooo50172.icu.tamilvowelslikepango.patch
+Patch36: workspace.vcl39.patch
+Patch37: openoffice.org-1.9.108.ooo30133.lingucomponent.ukrainean.patch
+Patch38: openoffice.org-1.9.108.ooo48814.solenv.nostripwithsimpleinstall.patch
+Patch39: openoffice.org-1.9.108.ooo47323.binfilter.stupiddetect.patch
+Patch40: workspace.gslpatches2.patch
+Patch41: openoffice.org-1.9.108.oooXXXXX.pyuno.pushrpath.patch
+Patch42: openoffice.org-1.9.88.NONE.gcc3gcj4.patch
+Patch43: openoffice.org-1.9.108.ooo9290.goodies.epstoepdf.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -722,18 +721,17 @@
%patch30 -p1 -b .gcc19870.gcjaccessproblem.wizards.patch
%patch31 -p1 -b .use-fontconfig-everwhere.patch
%patch32 -p1 -b .berkeleydb-jni-casting-misuse.patch
-%patch33 -p1 -b .workspace.gcc4fwdecl.patch
-%patch34 -p1 -b .workspace-fpicker4.patch
-%patch35 -p1 -b .ooo44627.sal.brokencondition.patch
-%patch36 -p1 -b .ooo50172.icu.tamilvowelslikepango.patch
-%patch37 -p1 -b .workspace.vcl39.patch
-%patch38 -p1 -b .ooo30133.lingucomponent.ukrainean.patch
-%patch39 -p1 -b .ooo48814.solenv.nostripwithsimpleinstall.patch
-%patch40 -p1 -b .ooo47323.binfilter.stupiddetect.patch
-%patch41 -p1 -b .workspace.gslpatches2.patch
-%patch42 -p1 -b .oooXXXXX.pyuno.pushrpath.patch
-%patch43 -p1 -b .NONE.gcc3gcj4.patch
-%patch44 -p1 -b .ooo9290.goodies.epstoepdf.patch
+%patch33 -p1 -b .workspace-fpicker4.patch
+%patch34 -p1 -b .ooo44627.sal.brokencondition.patch
+%patch35 -p1 -b .ooo50172.icu.tamilvowelslikepango.patch
+%patch36 -p1 -b .workspace.vcl39.patch
+%patch37 -p1 -b .ooo30133.lingucomponent.ukrainean.patch
+%patch38 -p1 -b .ooo48814.solenv.nostripwithsimpleinstall.patch
+%patch39 -p1 -b .ooo47323.binfilter.stupiddetect.patch
+%patch40 -p1 -b .workspace.gslpatches2.patch
+%patch41 -p1 -b .oooXXXXX.pyuno.pushrpath.patch
+%patch42 -p1 -b .NONE.gcc3gcj4.patch
+%patch43 -p1 -b .ooo9290.goodies.epstoepdf.patch
#start ludicrous workaround
#while we include these libs we need this, if/when we move to system
@@ -2573,6 +2571,7 @@
%changelog
* Thu Jun 16 2005 Caolan McNamara <caolanm@xxxxxxxxxx> - 1:1.9.110-1
- bump to next version
+- drop integrated workspace.gcc4fwdecl.patch
* Wed Jun 14 2005 Caolan McNamara <caolanm@xxxxxxxxxx> - 1:1.9.109-6
- drop unnecessary Require
--- workspace.gcc4fwdecl.patch DELETED ---
--
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits
|
|