rpms/openoffice.org/devel openoffice.org-2.0.2.rhXXXXXX.redhatcolours.extras.patch, NONE, 1.1 openoffice.org.spec, 1.672, 1.673

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Apr 24 12:24:21 UTC 2006 

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.2.rhXXXXXX.redhatcolours.extras.patch 
Log Message:
recover the set Red Hat colours patch

openoffice.org-2.0.2.rhXXXXXX.redhatcolours.extras.patch:
 standard.soc |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE openoffice.org-2.0.2.rhXXXXXX.redhatcolours.extras.patch ---
--- openoffice.org.orig/extras/source/palettes/standard.soc	2004-09-14 11:15:39.147812605 -0400
+++ openoffice.org/extras/source/palettes/standard.soc	2004-09-14 11:20:51.940313307 -0400
@@ -88,8 +88,9 @@
  <draw:color draw:name="Dark violet" draw:color="#660066"/>
  <draw:color draw:name="Salmon" draw:color="#ff8080"/>
  <draw:color draw:name="Sea blue" draw:color="#0066cc"/>
- <draw:color draw:name="Sun 1" draw:color="#333366"/>
- <draw:color draw:name="Sun 2" draw:color="#666699"/>
- <draw:color draw:name="Sun 3" draw:color="#9999cc"/>
- <draw:color draw:name="Sun 4" draw:color="#ccccff"/>
-</office:color-table>
\ No newline at end of file
+ <draw:color draw:name="Red Hat 1" draw:color="#cc0000"/>
+ <draw:color draw:name="Red Hat 2" draw:color="#0093d9"/>
+ <draw:color draw:name="Red Hat 3" draw:color="#ff8d00"/>
+ <draw:color draw:name="Red Hat 4" draw:color="#abb400"/>
+ <draw:color draw:name="Red Hat 5" draw:color="#4e376b"/>
+</office:color-table>


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.672
retrieving revision 1.673
diff -u -r1.672 -r1.673
--- openoffice.org.spec	24 Apr 2006 07:36:30 -0000	1.672
+++ openoffice.org.spec	24 Apr 2006 12:24:18 -0000	1.673
@@ -183,52 +183,53 @@
 Patch3:  openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch
 Patch4:  openoffice.org-1.9.97.rh156067.noversionedicons.patch
 Patch5:  openoffice.org-1.9.121.rh127576.gnomeprintui.patch
+Patch6:  openoffice.org-2.0.2.rhXXXXXX.redhatcolours.extras.patch
 %if %{obsoleteold}
-Patch6:  openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch
+Patch7:  openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch
 %else
-Patch6:  openoffice.org-1.9.121.rh156677.other.cripplemenus.sysui.patch
+Patch7:  openoffice.org-1.9.121.rh156677.other.cripplemenus.sysui.patch
 %endif
-Patch7:  openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch
-Patch8:  openoffice.org-2.0.1.rhXXXXX.extensions.defaulttoevo2.patch
-Patch9:  openoffice.org-2.0.2.ooo34909.dbaccess.patch
-Patch10: workspace.evo2fixes.patch
-Patch11: openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch
-Patch12: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch
-Patch13: openoffice.org-1.9.129.ooo54603.fontconfig.patch
-Patch14: openoffice.org-1.9.115.ooo51931.systemxmlsec.patch
-Patch15: openoffice.org-1.9.120.ooo52428.execshield.bridges.patch
-Patch16: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
-Patch17: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
-Patch18: openoffice.org-1.9.125.ooo53723.bulletexport.vcl.patch
-Patch19: openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch
-Patch20: workspace.dmake43p01.patch
-Patch21: openoffice.org-1.9.128.ooo54479.systemicu.patch
-Patch22: openoffice.org-1.9.130.ooo54959.negativeindent.sw.patch
-Patch23: workspace.atkbridge.patch
-Patch24: workspace.jaxpapi.patch
-Patch25: workspace.systemjava.patch
+Patch8:  openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch
+Patch9:  openoffice.org-2.0.1.rhXXXXX.extensions.defaulttoevo2.patch
+Patch10: openoffice.org-2.0.2.ooo34909.dbaccess.patch
+Patch11: workspace.evo2fixes.patch
+Patch12: openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch
+Patch13: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch
+Patch14: openoffice.org-1.9.129.ooo54603.fontconfig.patch
+Patch15: openoffice.org-1.9.115.ooo51931.systemxmlsec.patch
+Patch16: openoffice.org-1.9.120.ooo52428.execshield.bridges.patch
+Patch17: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
+Patch18: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
+Patch19: openoffice.org-1.9.125.ooo53723.bulletexport.vcl.patch
+Patch20: openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch
+Patch21: workspace.dmake43p01.patch
+Patch22: openoffice.org-1.9.128.ooo54479.systemicu.patch
+Patch23: openoffice.org-1.9.130.ooo54959.negativeindent.sw.patch
+Patch24: workspace.atkbridge.patch
+Patch25: workspace.jaxpapi.patch
+Patch26: workspace.systemjava.patch
 %if ! %{internaljavabits}
-Patch26: workspace.targetedaot.patch
+Patch27: workspace.targetedaot.patch
 %else
-Patch26: openoffice.org-2.0.2.rhXXXXX.helpcontent2.baddb.patch
+Patch27: openoffice.org-2.0.2.rhXXXXX.helpcontent2.baddb.patch
 %endif
-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-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
+Patch28: openoffice.org-2.0.1.ooo58663.vcl.missingglyph.patch
+Patch29: openoffice.org-2.0.1.ooo58606.sw.pre-edit.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
 %if %{build_rhel4}
-Patch37: openoffice.org-1.9.74.ArchiveZip.patch
-Patch38: openoffice.org-2.0.1.gij4ant.patch
+Patch38: openoffice.org-1.9.74.ArchiveZip.patch
+Patch39: openoffice.org-2.0.1.gij4ant.patch
 %endif
-Patch39: openoffice.org-2.0.2.rh188467.printingdefaults.patch
-Patch40: openoffice.org-2.0.2.ooo64463.extensions.noxaw.patch
-Patch41: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
+Patch40: openoffice.org-2.0.2.rh188467.printingdefaults.patch
+Patch41: openoffice.org-2.0.2.ooo64463.extensions.noxaw.patch
+Patch42: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -1093,63 +1094,64 @@
 %patch2  -p1 -b .rh151357.setlangtolocale.patch
 %patch3  -p1 -b .rh151356.usetwodotzeropath.patch
 %patch4  -p1 -b .rh156067.noversionedicons.patch
+%patch5  -p1 -b .rhXXXXXX.redhatcolours.extras.patch
 %if %{gnomeprintui}
-%patch5  -p1 -b .rh127576.gnomeprintui.patch
+%patch6  -p1 -b .rh127576.gnomeprintui.patch
 %endif
-%patch29 -p1 -b .ooo59675.sysui.rtfmimetype.patch
+%patch30 -p1 -b .ooo59675.sysui.rtfmimetype.patch
 %if %{obsoleteold}
-%patch6  -p1 -b .rh156677.cripplemenus.sysui.patch
+%patch7  -p1 -b .rh156677.cripplemenus.sysui.patch
 %else
-%patch6  -p1 -b .rh156677.other.cripplemenus.sysui.patch
+%patch7  -p1 -b .rh156677.other.cripplemenus.sysui.patch
 %endif
-%patch7  -p1 -b .rh171692.jvmfwk.defaulttogcj.patch
-%patch8  -p1 -b .rhXXXXX.extensions.defaulttoevo2.patch
-%patch9  -p1 -b .ooo34909.dbaccess.patch
-%patch10 -p1 -b .workspace.evo2fixes.patch
-%patch11  -p1 -b .ooo45725.lingucomponent.contribdict.patch
-%patch12 -p1 -b .ooo48256.nolongname.sysui.patch
-%patch13 -p1 -b .ooo54603.fontconfig.patch
-%patch14 -p1 -b .ooo51931.systemxmlsec.patch
-%patch15 -p1 -b .ooo52428.execshield.bridges.patch
+%patch8  -p1 -b .rh171692.jvmfwk.defaulttogcj.patch
+%patch9  -p1 -b .rhXXXXX.extensions.defaulttoevo2.patch
+%patch10 -p1 -b .ooo34909.dbaccess.patch
+%patch11 -p1 -b .workspace.evo2fixes.patch
+%patch12  -p1 -b .ooo45725.lingucomponent.contribdict.patch
+%patch13 -p1 -b .ooo48256.nolongname.sysui.patch
+%patch14 -p1 -b .ooo54603.fontconfig.patch
+%patch15 -p1 -b .ooo51931.systemxmlsec.patch
+%patch16 -p1 -b .ooo52428.execshield.bridges.patch
 %if ! %{internaljavabits}
-%patch16 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
+%patch17 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
 %endif
-%patch17 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
-%patch18 -p1 -b .ooo53723.bulletexport.vcl.patch
-%patch19 -p1 -b .ooo30380.uselibxslt.xmlhelp.patch
-%patch20 -p1 -b .dmake43p01.patch
+%patch18 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
+%patch19 -p1 -b .ooo53723.bulletexport.vcl.patch
+%patch20 -p1 -b .ooo30380.uselibxslt.xmlhelp.patch
+%patch21 -p1 -b .dmake43p01.patch
 %if ! %{internalicu}
-%patch21 -p1 -b .ooo54479.systemicu.patch
+%patch22 -p1 -b .ooo54479.systemicu.patch
 %endif
-%patch22 -p1 -b .ooo54959.negativeindent.sw.patch
-%patch23 -p1 -b .workspace.atkbridge.patch
-%patch24 -p0 -b .workspace.jaxpapi.patch
-%patch25 -p1 -b .workspace.systemjava.patch
+%patch23 -p1 -b .ooo54959.negativeindent.sw.patch
+%patch24 -p1 -b .workspace.atkbridge.patch
+%patch25 -p0 -b .workspace.jaxpapi.patch
+%patch26 -p1 -b .workspace.systemjava.patch
 %if ! %{internaljavabits}
-%patch26 -p1 -b .workspace.targetedaot.patch
+%patch27 -p1 -b .workspace.targetedaot.patch
 %else
-%patch26 -p1 -b .rhXXXXX.helpcontent2.baddb.patch
+%patch27 -p1 -b .rhXXXXX.helpcontent2.baddb.patch
 %endif
-%patch27 -p1 -b .ooo58663.vcl.missingglyph.patch
-%patch28 -p1 -b .ooo58606.sw.pre-edit.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
+%patch28 -p1 -b .ooo58663.vcl.missingglyph.patch
+%patch29 -p1 -b .ooo58606.sw.pre-edit.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
 %if %{build_rhel4}
-%patch37 -p1 -b .rhXXXXXX.config_office.archivezip.patch
+%patch38 -p1 -b .rhXXXXXX.config_office.archivezip.patch
 tar xjf %{SOURCE12}
-%patch38 -p0 -b .gij4ant.patch
+%patch39 -p0 -b .gij4ant.patch
 cd solenv/bin
 tar xzf %{SOURCE13} Archive-Zip-1.13/lib
 cd ../..
 %endif
-%patch39 -p1 -b .rh188467.printingdefaults.patch
-%patch40 -p1 -b .ooo64463.extensions.noxaw.patch
-%patch41 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
+%patch40 -p1 -b .rh188467.printingdefaults.patch
+%patch41 -p1 -b .ooo64463.extensions.noxaw.patch
+%patch42 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
 
 %if %{includingexternals}
 #start ludicrous workaround

More information about the fedora-cvs-commits mailing list