rpms/openoffice.org/devel openoffice.org.spec, 1.1592, 1.1593 openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch, 1.2, NONE openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch, 1.3, NONE

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8019

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch 
	openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch 
Log Message:
block together upstream-accepted patches by workspace


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1592
retrieving revision 1.1593
diff -u -r1.1592 -r1.1593
--- openoffice.org.spec	24 Jul 2008 10:59:31 -0000	1.1592
+++ openoffice.org.spec	24 Jul 2008 14:00:12 -0000	1.1593
@@ -94,7 +94,7 @@
 Patch22: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
 Patch23: openoffice.org-2.3.0.ooo76649.httpencoding.patch
 Patch24: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
-Patch25: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
+Patch25: workspace.cmcfixes48.patch
 Patch26: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
 Patch27: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
 Patch28: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
@@ -106,10 +106,9 @@
 Patch34: workspace.cmcfixes46.patch
 Patch35: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch
 Patch36: openoffice.org-3.0.0.ooo90876.connectivity.evoab2.patch
-Patch37: openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch
-Patch38: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch
-Patch39: openoffice.org-3.0.0.ooo91977.sd.holdreference.patch
-Patch40: openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch
+Patch37: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch
+Patch38: openoffice.org-3.0.0.ooo91977.sd.holdreference.patch
+Patch39: openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1260,10 +1259,9 @@
 %patch34 -p1 -b .workspace.cmcfixes46.patch
 %patch35 -p1 -b .ooo48400.svx.fixspelling.patch
 %patch36 -p1 -b .ooo90876.connectivity.evoab2.patch
-%patch37 -p1 -b .oooXXXXX.connectivity.mozprofilefinder.patch
-%patch38 -p1 -b .ooo86142.serbiannumbering.patch
-%patch39 -p1 -b .ooo91977.sd.holdreference.patch
-%patch40 -p1 -b .ooo92026.sd.disposed_during_disposing.patch
+%patch37 -p1 -b .ooo86142.serbiannumbering.patch
+%patch38 -p1 -b .ooo91977.sd.holdreference.patch
+%patch39 -p1 -b .ooo92026.sd.disposed_during_disposing.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3900,7 +3898,7 @@
 - fix broken requires
 
 * Fri Jan 11 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-1.2
-- add openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch to fix up -devel Requires
+- add openoffice.org-2.4.0.ooo92086.solenv.paths.patch to fix up -devel Requires
 - add openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
 - Resolves: rhbz#425701/ooo#83410 try and fix serbian translations
 


--- openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch DELETED ---


--- openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch DELETED ---