rpms/openoffice.org/devel openoffice.org.spec, 1.2102, 1.2103 openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch, 1.4, NONE

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22386

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch 
Log Message:
drop unnecessary openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2102
retrieving revision 1.2103
diff -u -p -r1.2102 -r1.2103
--- openoffice.org.spec	17 Dec 2009 09:28:40 -0000	1.2102
+++ openoffice.org.spec	17 Dec 2009 10:29:47 -0000	1.2103
@@ -90,49 +90,48 @@ Patch12: ooo-build.ooo68717.gstreamer.vi
 Patch13: openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
 Patch14: openoffice.org-2.3.0.ooo76649.httpencoding.patch
 Patch15: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
-Patch16: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
-Patch17: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
-Patch18: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
-Patch19: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
-Patch20: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
-Patch21: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
-Patch22: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
-Patch23: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
-Patch24: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch25: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
-Patch26: ooo-build.ooo2497.filter.svg.patch
-Patch27: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
-Patch28: workspace.slideshow1.patch
-Patch29: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
-Patch30: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
-Patch31: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
-Patch32: openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch
-Patch33: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
-Patch34: openoffice.org-3.1.0.ooo102142.sd.resleak.patch
-Patch35: openoffice.org-2.0.0.ooo46270.svx.search-dialog.no-find-all-in-draw.patch
-Patch36: openoffice.org-3.1.0.ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
-Patch37: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
-Patch38: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
-Patch39: openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch
-Patch40: workspace.vcl106.patch
-Patch41: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
-Patch42: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
-Patch43: openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch
-Patch44: openoffice.org-3.2.0.ooo106032.linguistic.defaulttoplain.patch
-Patch45: workspace.gsminhibit.patch
-Patch46: workspace.vcl107.patch
-Patch47: workspace.hb33patches1.patch
-Patch48: workspace.ause109.patch
-Patch49: workspace.cmcfixes67.patch
-Patch50: workspace.srb1.patch
-Patch51: workspace.impress184.patch
-Patch52: openoffice.org-3.2.0.ooo107137.canvas.fixcolorspace.patch
-Patch53: openoffice.org-3.2.0.ooo107151.sc.pop-empty-cell.patch
-Patch54: openoffice.org-3.3.0.ooo102645.fix.es.patch
-Patch55: workspace.vcl108.patch
-Patch56: workspace.pythonssldedux.patch
-Patch57: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
-Patch58: openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
+Patch16: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
+Patch17: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
+Patch18: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
+Patch19: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
+Patch20: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
+Patch21: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
+Patch22: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
+Patch23: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch24: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
+Patch25: ooo-build.ooo2497.filter.svg.patch
+Patch26: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
+Patch27: workspace.slideshow1.patch
+Patch28: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
+Patch29: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
+Patch30: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
+Patch31: openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch
+Patch32: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
+Patch33: openoffice.org-3.1.0.ooo102142.sd.resleak.patch
+Patch34: openoffice.org-2.0.0.ooo46270.svx.search-dialog.no-find-all-in-draw.patch
+Patch35: openoffice.org-3.1.0.ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
+Patch36: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
+Patch37: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
+Patch38: openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch
+Patch39: workspace.vcl106.patch
+Patch40: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
+Patch41: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
+Patch42: openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch
+Patch43: openoffice.org-3.2.0.ooo106032.linguistic.defaulttoplain.patch
+Patch44: workspace.gsminhibit.patch
+Patch45: workspace.vcl107.patch
+Patch46: workspace.hb33patches1.patch
+Patch47: workspace.ause109.patch
+Patch48: workspace.cmcfixes67.patch
+Patch49: workspace.srb1.patch
+Patch50: workspace.impress184.patch
+Patch51: openoffice.org-3.2.0.ooo107137.canvas.fixcolorspace.patch
+Patch52: openoffice.org-3.2.0.ooo107151.sc.pop-empty-cell.patch
+Patch53: openoffice.org-3.3.0.ooo102645.fix.es.patch
+Patch54: workspace.vcl108.patch
+Patch55: workspace.pythonssldedux.patch
+Patch56: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
+Patch57: openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -169,7 +168,10 @@ Requires: liberation-sans-fonts, liberat
 Requires: dejavu-sans-fonts, dejavu-serif-fonts, dejavu-sans-mono-fonts
 Requires: hunspell-en, hyphen-en, hyphen >= 2.4, autocorr-en
 Requires: saxon, lucene
-PreReq: gtk2 >= 2.9.4
+Requires(pre):    gtk2 >= 2.9.4
+Requires(post):   gtk2 >= 2.9.4
+Requires(preun):  gtk2 >= 2.9.4
+Requires(postun): gtk2 >= 2.9.4
 Obsoletes: openoffice.org < 1.9.0
 Obsoletes: openoffice.org-libs < 1.9.0
 Obsoletes: openoffice.org-i18n < 1.9.0
@@ -1617,49 +1619,48 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch13 -p1 -b .ooo7065.sw.titlepagedialog.patch
 %patch14 -p1 -b .ooo76649.httpencoding.patch
 %patch15 -p1 -b .ooo83878.unopkg.enablelinking.patch
-%patch16 -p1 -b .rh133741.alwaysgtk.vcl.patch
-%patch17 -p1 -b .ooo86080.unopkg.bodge.patch
-%patch18 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
-%patch19 -p1 -b .ooo88341.sc.verticalboxes.patch
-%patch20 -p1 -b .ooo87970.vcl.samenamesubs.patch
-%patch21 -p1 -b .ooo91924.svx.consistentordering.patch
-%patch22 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
-%patch23 -p0 -b .ooo98137.filter.redeclared-variables.patch
-%patch24 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch25 -p1 -b .oooXXXXX.solenv.allowmissing.patch
-%patch26 -p1 -b .ooo2497.filter.svg.patch
-%patch27 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
-%patch28 -p2 -b .workspace.slideshow1.patch
-%patch29 -p0 -b .ooo101274.opening-a-directory.patch
-%patch30 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
-%patch31 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
-%patch32 -p0 -b .ooo101567.i18npool.mailocaledata.patch
-%patch33 -p0 -b .ooo102061.sc.cellanchoring.patch
-%patch34 -p0 -b .ooo102142.sd.resleak.patch
-%patch35 -p0 -b .ooo46270.svx.search-dialog.no-find-all-in-draw.patch
-%patch36 -p0 -b .ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
-%patch37 -p0 -b .ooo104329.dbaccess.primarykeys.patch
-%patch38 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
-%patch39 -p1 -b .oooXXXXXX.sal.justcoredump.patch
-%patch40 -p0 -b .workspace.vcl106.patch
-%patch41 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
-%patch42 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
-%patch43 -p0 -b .ooo105988.svx.a11ycrash.patch
-%patch44 -p0 -b .ooo106032.linguistic.defaulttoplain.patch
-%patch45 -p1 -b .workspace.gsminhibit.patch
-%patch46 -p1 -b .workspace.vcl107.patch
-%patch47 -p0 -b .workspace.hb33patches1.patch
-%patch48 -p0 -b .workspace.ause109.patch
-%patch49 -p1 -b .workspace.cmcfixes67.patch
-%patch50 -p1 -b .workspace.srb1.patch
-%patch51 -p0 -b .workspace.impress184.patch
-%patch52 -p0 -b .ooo107137.canvas.fixcolorspace.patch
-%patch53 -p1 -b .ooo107151.sc.pop-empty-cell.patch
-%patch54 -p0 -b .ooo102645.fix.es.patch
-%patch55 -p0 -b .workspace.vcl108.patch
-%patch56 -p1 -b .workspace.pythonssldedux.patch
-%patch57 -p1 -b .ooo106502.svx.fixspelltimer.patch
-%patch58 -p0 -b .ooo47279.sd.objectsave.safe.patch
+%patch16 -p1 -b .ooo86080.unopkg.bodge.patch
+%patch17 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
+%patch18 -p1 -b .ooo88341.sc.verticalboxes.patch
+%patch19 -p1 -b .ooo87970.vcl.samenamesubs.patch
+%patch20 -p1 -b .ooo91924.svx.consistentordering.patch
+%patch21 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
+%patch22 -p0 -b .ooo98137.filter.redeclared-variables.patch
+%patch23 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch24 -p1 -b .oooXXXXX.solenv.allowmissing.patch
+%patch25 -p1 -b .ooo2497.filter.svg.patch
+%patch26 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
+%patch27 -p2 -b .workspace.slideshow1.patch
+%patch28 -p0 -b .ooo101274.opening-a-directory.patch
+%patch29 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
+%patch30 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
+%patch31 -p0 -b .ooo101567.i18npool.mailocaledata.patch
+%patch32 -p0 -b .ooo102061.sc.cellanchoring.patch
+%patch33 -p0 -b .ooo102142.sd.resleak.patch
+%patch34 -p0 -b .ooo46270.svx.search-dialog.no-find-all-in-draw.patch
+%patch35 -p0 -b .ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
+%patch36 -p0 -b .ooo104329.dbaccess.primarykeys.patch
+%patch37 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
+%patch38 -p1 -b .oooXXXXXX.sal.justcoredump.patch
+%patch39 -p0 -b .workspace.vcl106.patch
+%patch40 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
+%patch41 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
+%patch42 -p0 -b .ooo105988.svx.a11ycrash.patch
+%patch43 -p0 -b .ooo106032.linguistic.defaulttoplain.patch
+%patch44 -p1 -b .workspace.gsminhibit.patch
+%patch45 -p1 -b .workspace.vcl107.patch
+%patch46 -p0 -b .workspace.hb33patches1.patch
+%patch47 -p0 -b .workspace.ause109.patch
+%patch48 -p1 -b .workspace.cmcfixes67.patch
+%patch49 -p1 -b .workspace.srb1.patch
+%patch50 -p0 -b .workspace.impress184.patch
+%patch51 -p0 -b .ooo107137.canvas.fixcolorspace.patch
+%patch52 -p1 -b .ooo107151.sc.pop-empty-cell.patch
+%patch53 -p0 -b .ooo102645.fix.es.patch
+%patch54 -p0 -b .workspace.vcl108.patch
+%patch55 -p1 -b .workspace.pythonssldedux.patch
+%patch56 -p1 -b .ooo106502.svx.fixspelltimer.patch
+%patch57 -p0 -b .ooo47279.sd.objectsave.safe.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4166,6 +4167,7 @@ fi
 - latest milestone
 - drop integrated openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
 - drop integrated workspace.fwk132.patch
+- drop unnecessary openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
 
 * Tue Dec 15 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-7.3
 - Resolves: rhbz#529648 add workspace.fwk132.patch


--- openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch DELETED ---