rpms/openoffice.org/devel openoffice.org.spec, 1.1440.2.18, 1.1440.2.19 openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch, 1.2, NONE

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Thu Mar 13 10:32:12 UTC 2008


Author: caolanm

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

Modified Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	openoffice.org.spec 
Removed Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch 
Log Message:
try and drop openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1440.2.18
retrieving revision 1.1440.2.19
diff -u -r1.1440.2.18 -r1.1440.2.19
--- openoffice.org.spec	12 Mar 2008 19:47:05 -0000	1.1440.2.18
+++ openoffice.org.spec	13 Mar 2008 10:31:32 -0000	1.1440.2.19
@@ -117,28 +117,27 @@
 Patch44: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
 Patch45: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
 Patch46: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch47: openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch
-Patch48: openoffice.org-2.3.0.ooo76649.httpencoding.patch
-Patch49: openoffice.org-2.3.0.ooo82966.svx.missing3d.patch
-Patch50: openoffice.org-2.3.1.ooo81307.sw.word2.patch
-Patch51: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
-Patch52: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
-Patch53: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
-Patch54: openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch
-Patch55: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
-Patch56: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
-Patch57: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
-Patch58: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
-Patch59: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
-Patch60: workspace.cairotext01.patch
-Patch61: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
-Patch62: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
-Patch63: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
-Patch64: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
-Patch65: workspace.cmcfixes43.patch
-Patch66: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
-Patch67: openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
-Patch68: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch
+Patch47: openoffice.org-2.3.0.ooo76649.httpencoding.patch
+Patch48: openoffice.org-2.3.0.ooo82966.svx.missing3d.patch
+Patch49: openoffice.org-2.3.1.ooo81307.sw.word2.patch
+Patch50: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
+Patch51: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
+Patch52: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
+Patch53: openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch
+Patch54: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
+Patch55: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
+Patch56: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
+Patch57: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
+Patch58: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
+Patch59: workspace.cairotext01.patch
+Patch60: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
+Patch61: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
+Patch62: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
+Patch63: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
+Patch64: workspace.cmcfixes43.patch
+Patch65: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
+Patch66: openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
+Patch67: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch
 
 %define instdir %{_libdir}/openoffice.org
 %define OFFICEUPD 300
@@ -1073,28 +1072,27 @@
 %patch44 -p1 -b .ooo80257.sd.textonlystyle.patch
 tar xzf %{PATCH45}
 %patch46 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch47 -p1 -b .ooo81321.cppu.silencewarnings.patch
-%patch48 -p1 -b .ooo76649.httpencoding.patc
-%patch49 -p1 -b .ooo82966.svx.missing3d.patch
-%patch50 -p1 -b .ooo81307.sw.word2.patch
-%patch51 -p1 -b .ooo83878.unopkg.enablelinking.patch
-%patch52 -p1 -b .ooo84676.ucb.davprotocol.patch
-%patch53 -p1 -b .ooo84621.sw.insertexcel.patch
-%patch54 -p1 -b .ooo85054.stlport.noorigs.patch
-%patch55 -p1 -b .ooo85097.desktop.pagein.patch
-%patch56 -p1
-%patch57 -p1 -b .rh133741.alwaysgtk.vcl.patch
-%patch58 -p1 -b .ooo85429.sw.a11ycrash.patch
-%patch59 -p1 -b .ooo85448.emptyrpath.patch
-%patch60 -p1 -b .workspace.cairotext01.patch
-%patch61 -p1 -b .ooo85854.sw.graphicsaveas.patch
-%patch62 -p1 -b .ooo85921.sd.editmasterundermouse.patch
-%patch63 -p1 -b .ooo86080.unopkg.bodge.patch
-%patch64 -p1 -b .oooXXXXX.psprint.debugcups.patch
-%patch65 -p1 -b .workspace.cmcfixes43.patch
-%patch66 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch
-%patch67 -p1 -b .ooo86882.vcl.unsigned_int_to_long.patch
-%patch68 -p1 -b .ooo86924.sfx2.iconchanges.patch
+%patch47 -p1 -b .ooo76649.httpencoding.patc
+%patch48 -p1 -b .ooo82966.svx.missing3d.patch
+%patch49 -p1 -b .ooo81307.sw.word2.patch
+%patch50 -p1 -b .ooo83878.unopkg.enablelinking.patch
+%patch51 -p1 -b .ooo84676.ucb.davprotocol.patch
+%patch52 -p1 -b .ooo84621.sw.insertexcel.patch
+%patch53 -p1 -b .ooo85054.stlport.noorigs.patch
+%patch54 -p1 -b .ooo85097.desktop.pagein.patch
+%patch55 -p1
+%patch56 -p1 -b .rh133741.alwaysgtk.vcl.patch
+%patch57 -p1 -b .ooo85429.sw.a11ycrash.patch
+%patch58 -p1 -b .ooo85448.emptyrpath.patch
+%patch59 -p1 -b .workspace.cairotext01.patch
+%patch60 -p1 -b .ooo85854.sw.graphicsaveas.patch
+%patch61 -p1 -b .ooo85921.sd.editmasterundermouse.patch
+%patch62 -p1 -b .ooo86080.unopkg.bodge.patch
+%patch63 -p1 -b .oooXXXXX.psprint.debugcups.patch
+%patch64 -p1 -b .workspace.cmcfixes43.patch
+%patch65 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch
+%patch66 -p1 -b .ooo86882.vcl.unsigned_int_to_long.patch
+%patch67 -p1 -b .ooo86924.sfx2.iconchanges.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2870,7 +2868,7 @@
 %{python_py_sitearch}/unohelper.py*
 
 %changelog
-* Wed Mar 12 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.2.1
+* Thu Mar 13 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.2.1
 - extend selinux bodge to ia64 
 - drop integrated workspace.notes2.patch
 - drop integrated openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch
@@ -2880,9 +2878,11 @@
 - drop integrated openoffice.org-2.4.0.ooo86123.ucb.newneon.patch
 - drop subsumed openoffice.org-2.4.0.ooo86670.config_office.xpcomasxul.patch
 - drop integrated workspace.unifysound01.patch
+- drop openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch
 - add workspace.cmcfixes43.patch
 
-* Tue Mar 11 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-10.2
+* Thu Mar 13 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-11.1
+- next release candidate
 - Resolves: rhbz#429632 add openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
 - Resolves: rhbz#435590 add openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch
 


--- openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch DELETED ---




More information about the fedora-extras-commits mailing list