rpms/openoffice.org/devel openoffice.org.spec, 1.1489, 1.1490 openoffice.org-2.2.0.rh232389.tango.patch, 1.6, NONE

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-2.2.0.rh232389.tango.patch 
Log Message:
shuffle a little more


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1489
retrieving revision 1.1490
diff -u -r1.1489 -r1.1490
--- openoffice.org.spec	24 Apr 2008 09:13:56 -0000	1.1489
+++ openoffice.org.spec	24 Apr 2008 16:35:20 -0000	1.1490
@@ -105,41 +105,40 @@
 Patch32: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
 Patch33: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
 Patch34: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
-Patch35: openoffice.org-2.2.0.rh232389.tango.patch
-Patch36: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
-Patch37: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
-Patch38: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
-Patch39: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
-Patch40: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
-Patch41: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
-Patch42: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch43: openoffice.org-2.3.0.ooo76649.httpencoding.patch
-Patch44: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
-Patch45: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
-Patch46: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
-Patch47: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
-Patch48: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
-Patch49: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
-Patch50: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
-Patch51: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
-Patch52: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
-Patch53: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
-Patch54: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
-Patch55: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
-Patch56: workspace.cmcfixes43.patch
-Patch57: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
-Patch58: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch
-Patch59: openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch
-Patch60: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
-Patch61: openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch
-Patch62: openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch
-Patch63: openoffice.org-3.0.0.ooo87991.fpickersafe.patch
-Patch64: openoffice.org-3.0.0.ooo88260.decl-defi-mismatch.patch
-Patch65: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
-Patch66: openoffice.org-3.0.0.ooo88319.setup_native.missing.patch
-Patch67: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
-Patch68: openoffice.org-3.0.0.ooo88375.filter.disablepdf.patch
-Patch69: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
+Patch35: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
+Patch36: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
+Patch37: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
+Patch38: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
+Patch39: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
+Patch40: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
+Patch41: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch42: openoffice.org-2.3.0.ooo76649.httpencoding.patch
+Patch43: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
+Patch44: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
+Patch45: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
+Patch46: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
+Patch47: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
+Patch48: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
+Patch49: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
+Patch50: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
+Patch51: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
+Patch52: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
+Patch53: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
+Patch54: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
+Patch55: workspace.cmcfixes43.patch
+Patch56: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
+Patch57: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch
+Patch58: openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch
+Patch59: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
+Patch60: openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch
+Patch61: openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch
+Patch62: openoffice.org-3.0.0.ooo87991.fpickersafe.patch
+Patch63: openoffice.org-3.0.0.ooo88260.decl-defi-mismatch.patch
+Patch64: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
+Patch65: openoffice.org-3.0.0.ooo88319.setup_native.missing.patch
+Patch66: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
+Patch67: openoffice.org-3.0.0.ooo88375.filter.disablepdf.patch
+Patch68: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1214,41 +1213,40 @@
 %patch32 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
 %patch33 -p0 -b .ooo68717.gstreamer.video.patch
 %patch34 -p1 -b .ooo63159.sal.dtype.patch
-%patch35 -p1 -b .rh232389.tango.patch
-%patch36 -p1 -b .ooo76393.sal.dynamicsection.patch
-%patch37 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
-%patch38 -p1 -b .ooo80816.selinux.bridges.patch
-%patch39 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
-%patch40 -p1 -b .ooo80257.sd.textonlystyle.patch
-tar xzf %{PATCH41}
-%patch42 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch43 -p1 -b .ooo76649.httpencoding.patc
-%patch44 -p1 -b .ooo83878.unopkg.enablelinking.patch
-%patch45 -p1 -b .ooo84676.ucb.davprotocol.patch
-%patch46 -p1 -b .ooo84621.sw.insertexcel.patch
-%patch47 -p1 -b .ooo85097.desktop.pagein.patch
-%patch48 -p1
-%patch49 -p1 -b .rh133741.alwaysgtk.vcl.patch
-%patch50 -p1 -b .ooo85429.sw.a11ycrash.patch
-%patch51 -p1 -b .ooo85448.emptyrpath.patch
-%patch52 -p1 -b .ooo85854.sw.graphicsaveas.patch
-%patch53 -p1 -b .ooo85921.sd.editmasterundermouse.patch
-%patch54 -p1 -b .ooo86080.unopkg.bodge.patch
-%patch55 -p1 -b .oooXXXXX.psprint.debugcups.patch
-%patch56 -p1 -b .workspace.cmcfixes43.patch
-%patch57 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch
-%patch58 -p1 -b .ooo86924.sfx2.iconchanges.patch
-%patch59 -p1 -b .ooo87204.toolkit.64bitevent.patch
-%patch60 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
-%patch61 -p1 -b .ooo87604.fixupsystemhunspell.patch
-%patch62 -p1 -b .ooo85691.vcl.tooltipcolor.patch
-%patch63 -p1 -b .ooo87991.fpickersafe.patch
-%patch64 -p1 -b .ooo88260.decl-defi-mismatch.patch
-%patch65 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
-%patch66 -p1 -b .oo88319.setup_native.missing.patch
-%patch67 -p1 -b .ooo88341.sc.verticalboxes.patch
-%patch68 -p1 -b .ooo88375.filter.disablepdf.patch
-%patch69 -p1 -b .ooo6087.sc.sheetnames.patch
+%patch35 -p1 -b .ooo76393.sal.dynamicsection.patch
+%patch36 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
+%patch37 -p1 -b .ooo80816.selinux.bridges.patch
+%patch38 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
+%patch39 -p1 -b .ooo80257.sd.textonlystyle.patch
+tar xzf %{PATCH40}
+%patch41 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch42 -p1 -b .ooo76649.httpencoding.patc
+%patch43 -p1 -b .ooo83878.unopkg.enablelinking.patch
+%patch44 -p1 -b .ooo84676.ucb.davprotocol.patch
+%patch45 -p1 -b .ooo84621.sw.insertexcel.patch
+%patch46 -p1 -b .ooo85097.desktop.pagein.patch
+%patch47 -p1
+%patch48 -p1 -b .rh133741.alwaysgtk.vcl.patch
+%patch49 -p1 -b .ooo85429.sw.a11ycrash.patch
+%patch50 -p1 -b .ooo85448.emptyrpath.patch
+%patch51 -p1 -b .ooo85854.sw.graphicsaveas.patch
+%patch52 -p1 -b .ooo85921.sd.editmasterundermouse.patch
+%patch53 -p1 -b .ooo86080.unopkg.bodge.patch
+%patch54 -p1 -b .oooXXXXX.psprint.debugcups.patch
+%patch55 -p1 -b .workspace.cmcfixes43.patch
+%patch56 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch
+%patch57 -p1 -b .ooo86924.sfx2.iconchanges.patch
+%patch58 -p1 -b .ooo87204.toolkit.64bitevent.patch
+%patch59 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
+%patch60 -p1 -b .ooo87604.fixupsystemhunspell.patch
+%patch61 -p1 -b .ooo85691.vcl.tooltipcolor.patch
+%patch62 -p1 -b .ooo87991.fpickersafe.patch
+%patch63 -p1 -b .ooo88260.decl-defi-mismatch.patch
+%patch64 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
+%patch65 -p1 -b .oo88319.setup_native.missing.patch
+%patch66 -p1 -b .ooo88341.sc.verticalboxes.patch
+%patch67 -p1 -b .ooo88375.filter.disablepdf.patch
+%patch68 -p1 -b .ooo6087.sc.sheetnames.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -1765,17 +1763,11 @@
     sed -i -e "s/$LONGICONPRODUCTVERSION //g" $file
 done
 echo "StartupNotify=true" >> base.desktop
-echo "TryExec=oobase" >> base.desktop
 echo "StartupNotify=true" >> calc.desktop
-echo "TryExec=oocalc" >> calc.desktop
 echo "StartupNotify=true" >> impress.desktop
-echo "TryExec=ooimpress" >> impress.desktop
 echo "StartupNotify=true" >> writer.desktop
-echo "TryExec=oowriter" >> writer.desktop
 echo "StartupNotify=true" >> math.desktop
-echo "TryExec=oomath" >> math.desktop
 echo "StartupNotify=true" >> draw.desktop
-echo "TryExec=oodraw" >> draw.desktop
 # rh#156677# / rh#186515#
 echo "NoDisplay=true" >> math.desktop
 chmod u-w *.desktop
@@ -2461,7 +2453,6 @@
 %{basisinstdir}/share/xslt/import/common
 %{basisinstdir}/share/xslt/import/spreadsheetml
 %{basisinstdir}/share/xslt/import/wordml
-#spellchecking lib
 %{basisinstdir}/program/liblnth%{SOPOST}.so
 %{_bindir}/unopkg
 #gnome integration
@@ -2730,7 +2721,6 @@
 %dir %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI
 %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/DbReportWindowState.xcs
 %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/ReportCommands.xcs
-%{_bindir}/oobase
 %{_datadir}/mimelnk/application/*database*
 
 %files base
@@ -2739,6 +2729,7 @@
 %dir %{oooinstdir}/program
 %{oooinstdir}/program/sbase
 %{_datadir}/applications/openoffice.org-*-base.desktop
+%{_bindir}/oobase
 
 %post base
 update-desktop-database -q %{_datadir}/applications
@@ -2834,7 +2825,6 @@
 %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/CalcCommands.xcs
 %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/CalcWindowState.xcs
 %{_datadir}/mimelnk/application/*spreadsheet*
-%{_bindir}/oocalc
 #vba
 %{basisinstdir}/program/libvbaobj%{SOPOST}.uno.so
 
@@ -2845,6 +2835,7 @@
 %{oooinstdir}/program/scalc
 %{oooinstdir}/program/scalc.bin
 %{_datadir}/applications/openoffice.org-*-calc.desktop
+%{_bindir}/oocalc
 
 %post calc
 update-desktop-database -q %{_datadir}/applications
@@ -2900,7 +2891,6 @@
 %dir %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI
 %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/DrawWindowState.xcs
 %{_datadir}/mimelnk/application/*drawing*
-%{_bindir}/oodraw
 
 %files draw
 %defattr(-,root,root,-)
@@ -2909,6 +2899,7 @@
 %{oooinstdir}/program/sdraw
 %{oooinstdir}/program/sdraw.bin
 %{_datadir}/applications/openoffice.org-*-draw.desktop
+%{_bindir}/oodraw
 
 %post draw
 update-desktop-database -q %{_datadir}/applications
@@ -3005,7 +2996,6 @@
 %{_datadir}/mimelnk/application/*master*
 %{_datadir}/mimelnk/application/*text*
 %{_datadir}/mimelnk/application/*web*
-%{_bindir}/oowriter
 
 %files writer
 %defattr(-,root,root,-)
@@ -3014,6 +3004,7 @@
 %{oooinstdir}/program/swriter
 %{oooinstdir}/program/swriter.bin
 %{_datadir}/applications/openoffice.org-*-writer.desktop
+%{_bindir}/oowriter
 
 %post writer
 update-desktop-database -q %{_datadir}/applications
@@ -3074,7 +3065,6 @@
 %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/Effects.xcs
 %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/ImpressWindowState.xcs
 %{_datadir}/mimelnk/application/*presentation*
-%{_bindir}/ooimpress
 
 %files impress
 %defattr(-,root,root,-)
@@ -3083,6 +3073,7 @@
 %{oooinstdir}/program/simpress
 %{oooinstdir}/program/simpress.bin
 %{_datadir}/applications/openoffice.org-*-impress.desktop
+%{_bindir}/ooimpress
 
 %post impress
 update-desktop-database -q %{_datadir}/applications
@@ -3145,7 +3136,6 @@
 %dir %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI
 %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/MathCommands.xcs
 %{_datadir}/mimelnk/application/*formula*
-%{_bindir}/oomath
 
 %files math
 %defattr(-,root,root,-)
@@ -3153,6 +3143,7 @@
 %dir %{oooinstdir}/program
 %{oooinstdir}/program/smath
 %{_datadir}/applications/openoffice.org-*-math.desktop
+%{_bindir}/oomath
 
 %post math
 update-desktop-database -q %{_datadir}/applications
@@ -3322,6 +3313,7 @@
 - drop openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
 - drop openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch
 - drop openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch
+- drop openoffice.org-2.2.0.rh232389.tango.patch
 
 * Mon Apr 21 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.9.1
 - Resolves: rhbz#358021 enable BrOffice.org brand


--- openoffice.org-2.2.0.rh232389.tango.patch DELETED ---