rpms/openoffice.org/devel openoffice.org.spec, 1.1272, 1.1273 openoffice.org-1.9.115.ooo69368.xmlsec.nss.patch, 1.1, NONE openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch, 1.4, NONE
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Thu Aug 23 14:32:15 UTC 2007
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29002
Modified Files:
openoffice.org.spec
Removed Files:
openoffice.org-1.9.115.ooo69368.xmlsec.nss.patch
openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch
Log Message:
remove openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1272
retrieving revision 1.1273
diff -u -r1.1272 -r1.1273
--- openoffice.org.spec 23 Aug 2007 14:07:29 -0000 1.1272
+++ openoffice.org.spec 23 Aug 2007 14:31:42 -0000 1.1273
@@ -73,62 +73,61 @@
Patch10: openoffice.org-1.9.88.rh133741.alwaysgtk.desktop.patch
Patch11: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
Patch12: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
-Patch13: openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch
%if %{gtkprintui}
-Patch14: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
+Patch13: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
%endif
-Patch15: openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch
-Patch16: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
-Patch17: openoffice.org-1.9.129.ooo54603.fontconfig.patch
-Patch18: openoffice.org-1.9.115.ooo69368.fixxmlsec.patch
-Patch19: openoffice.org-1.9.130.ooo67740.doublefree.xmlhelp.patch
-Patch20: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
-Patch21: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
-Patch22: openoffice.org-2.0.2.rh188467.printingdefaults.patch
-Patch23: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
-Patch24: workspace.fpicker6.patch
-Patch25: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
-Patch26: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
-Patch27: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
-Patch28: pseudoworkspace.valgrind1.patch
-Patch29: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
-Patch30: openoffice.org-2.0.4.rh217065.syncbackspace.patch
-Patch31: openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch
-Patch32: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
-Patch33: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
-Patch34: openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch
-Patch35: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
-Patch36: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
-Patch37: workspace.tl37.patch
-Patch38: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
-Patch39: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
-Patch40: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
-Patch41: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
-Patch42: workspace.configrefactor01.patch
-Patch43: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
-Patch44: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
-Patch45: openoffice.org-2.2.0.rh232389.tango.patch
-Patch46: openoffice.org-2.2.0.ooo53397.linkopt.patch
-Patch47: openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
-Patch48: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
-Patch49: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
-Patch50: openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch
-Patch51: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
-Patch52: openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch
-Patch53: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
-Patch54: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
-Patch55: openoffice.org-2.2.1.ooo80424.vcl.honourwidthtype.patch
-Patch56: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
-Patch57: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
-Patch58: workspace.unifysound01.patch
-Patch59: workspace.npower7.patch
-Patch60: openoffice.org-2.3.0.ooo80721.reportdesign.stlportism.patch
-Patch61: openoffice.org-2.3.0.ooo80735.cppu.map.patch
-Patch62: openoffice.org-2.3.0.ooo80944.sd.sixtyfour.patch
-Patch63: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch64: workspace.dba23e.patch
-Patch65: openoffice.org-2.3.0.ooo80967.ucb.neon27.patch
-Patch66: openoffice.org-2.3.0.ooo80931.sysui.genericname.patch
+Patch14: openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch
+Patch15: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
+Patch16: openoffice.org-1.9.129.ooo54603.fontconfig.patch
+Patch17: openoffice.org-1.9.115.ooo69368.fixxmlsec.patch
+Patch18: openoffice.org-1.9.130.ooo67740.doublefree.xmlhelp.patch
+Patch19: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
+Patch20: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
+Patch21: openoffice.org-2.0.2.rh188467.printingdefaults.patch
+Patch22: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
+Patch23: workspace.fpicker6.patch
+Patch24: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
+Patch25: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
+Patch26: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
+Patch27: pseudoworkspace.valgrind1.patch
+Patch28: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
+Patch29: openoffice.org-2.0.4.rh217065.syncbackspace.patch
+Patch30: openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch
+Patch31: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
+Patch32: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
+Patch33: openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch
+Patch34: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
+Patch35: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
+Patch36: workspace.tl37.patch
+Patch37: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
+Patch38: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
+Patch39: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
+Patch40: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
+Patch41: workspace.configrefactor01.patch
+Patch42: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
+Patch43: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
+Patch44: openoffice.org-2.2.0.rh232389.tango.patch
+Patch45: openoffice.org-2.2.0.ooo53397.linkopt.patch
+Patch46: openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
+Patch47: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
+Patch48: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
+Patch49: openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch
+Patch50: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
+Patch51: openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch
+Patch52: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
+Patch53: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
+Patch54: openoffice.org-2.2.1.ooo80424.vcl.honourwidthtype.patch
+Patch55: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
+Patch56: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
+Patch57: workspace.unifysound01.patch
+Patch58: workspace.npower7.patch
+Patch59: openoffice.org-2.3.0.ooo80721.reportdesign.stlportism.patch
+Patch60: openoffice.org-2.3.0.ooo80735.cppu.map.patch
+Patch61: openoffice.org-2.3.0.ooo80944.sd.sixtyfour.patch
+Patch62: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch63: workspace.dba23e.patch
+Patch64: openoffice.org-2.3.0.ooo80967.ucb.neon27.patch
+Patch65: openoffice.org-2.3.0.ooo80931.sysui.genericname.patch
%define instdir %{_libdir}/openoffice.org
@@ -1009,66 +1008,65 @@
%patch10 -p1 -b .rh133741.alwaysgtk.desktop.patch
%patch11 -p1 -b .rh161886.rpath.desktop.patch
%patch12 -p1 -b .rh151357.setlangtolocale.patch
-%patch13 -p1 -b .rh151356.usetwodotzeropath.patch
%if %{gtkprintui}
-%patch14 -p1 -b .rh127576.gtkunixprintdialog.patch
+%patch13 -p1 -b .rh127576.gtkunixprintdialog.patch
%endif
-%patch15 -p1 -b .rh171692.jvmfwk.defaulttogcj.patch
-%patch16 -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
-%patch17 -p1 -b .ooo54603.fontconfig.patch
-%patch18 -p1 -b .ooo69368.fixxmlsec.patch
-%patch19 -p1 -b .ooo67740.doublefree.xmlhelp.patch
-%patch20 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
-%patch21 -p1 -b .ooo58606.sw.pre-edit.patch
-%patch22 -p1
-%patch23 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
-%patch24 -p1 -b .workspace.fpicker6.patch
-%patch25 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
-%patch26 -p1 -b .ooo68048.vcl.imsurroundtext.patch
-%patch27 -p1 -b .ooo69051.vcl.singlekeypress.patch
-%patch28 -p1 -b .pseudoworkspace.valgrind1.patch
-%patch29 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
-%patch30 -p1 -b .rh217065.syncbackspace.patch
-%patch31 -p1 -b .ooo80412.i18npool.extendgrapheme.patch
-%patch32 -p1 -b .ooo65491.psprint.enablenups.patch
-cat %{PATCH33} >> svtools/source/dialogs/localize.sdf
-%patch34 -p1 -b .ooo78148.lingucomponent.systemhunspell.patch
-%patch35 -p1 -b .rh217269.officecfg.nosequencecheck.patch
-%patch36 -p1 -b .ooo72129.vcl.fontglyphindex.patch
-%patch37 -p1 -b .tl37.patch
-%patch38 -p1 -b .ooo73201.sw.a11yloadcrash.patch
-%patch39 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch
-%patch40 -p1 -b .ooo73863.vcl.imcommit.patch
-%patch41 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
-%patch42 -p0 -b .workspace.configrefactor01.patch
-%patch43 -p0 -b .ooo68717.gstreamer.video.patch
-%patch44 -p1 -b .ooo63159.sal.dtype.patch
-%patch45 -p1 -b .rh232389.tango.patch
+%patch14 -p1 -b .rh171692.jvmfwk.defaulttogcj.patch
+%patch15 -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
+%patch16 -p1 -b .ooo54603.fontconfig.patch
+%patch17 -p1 -b .ooo69368.fixxmlsec.patch
+%patch18 -p1 -b .ooo67740.doublefree.xmlhelp.patch
+%patch19 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
+%patch20 -p1 -b .ooo58606.sw.pre-edit.patch
+%patch21 -p1
+%patch22 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
+%patch23 -p1 -b .workspace.fpicker6.patch
+%patch24 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
+%patch25 -p1 -b .ooo68048.vcl.imsurroundtext.patch
+%patch26 -p1 -b .ooo69051.vcl.singlekeypress.patch
+%patch27 -p1 -b .pseudoworkspace.valgrind1.patch
+%patch28 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
+%patch29 -p1 -b .rh217065.syncbackspace.patch
+%patch30 -p1 -b .ooo80412.i18npool.extendgrapheme.patch
+%patch31 -p1 -b .ooo65491.psprint.enablenups.patch
+cat %{PATCH32} >> svtools/source/dialogs/localize.sdf
+%patch33 -p1 -b .ooo78148.lingucomponent.systemhunspell.patch
+%patch34 -p1 -b .rh217269.officecfg.nosequencecheck.patch
+%patch35 -p1 -b .ooo72129.vcl.fontglyphindex.patch
+%patch36 -p1 -b .tl37.patch
+%patch37 -p1 -b .ooo73201.sw.a11yloadcrash.patch
+%patch38 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch
+%patch39 -p1 -b .ooo73863.vcl.imcommit.patch
+%patch40 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
+%patch41 -p0 -b .workspace.configrefactor01.patch
+%patch42 -p0 -b .ooo68717.gstreamer.video.patch
+%patch43 -p1 -b .ooo63159.sal.dtype.patch
+%patch44 -p1 -b .rh232389.tango.patch
%if %{linkopt}
-%patch46 -p1 -b .ooo53397.linkopt.patch
+%patch45 -p1 -b .ooo53397.linkopt.patch
%endif
-%patch47 -p1 -b .ooo75790.sc.pa-IN.translate.patch
-%patch48 -p1 -b .ooo76393.sal.dynamicsection.patch
-%patch49 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
+%patch46 -p1 -b .ooo75790.sc.pa-IN.translate.patch
+%patch47 -p1 -b .ooo76393.sal.dynamicsection.patch
+%patch48 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
%if %{linkopt}
-%patch50 -p0 -b .ooo77885.stoc.stocmerge.patch
+%patch49 -p0 -b .ooo77885.stoc.stocmerge.patch
%endif
-%patch51 -p1 -b .ooo80816.selinux.bridges.patch
-%patch52 -p1 -b .ooo78971.xmloff.outofrange.patch
-%patch53 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
-%patch54 -p1 -b .ooo79481.sw.rowordcount.patch
-%patch55 -p1 -b .ooo80424.vcl.honourwidthtype.patch
-%patch56 -p1 -b .ooo80257.sd.textonlystyle.patch
-tar xzf %{PATCH57}
-%patch58 -p1 -b .workspace.unifysound01.patch
-%patch59 -p1 -b .workspace.npower7.patch
-%patch60 -p1 -b .ooo80721.reportdesign.stlportism.patch
-%patch61 -p1 -b .ooo80735.cppu.map.patch
-%patch62 -p1 -b .ooo80944.sd.sixtyfour.patch
-%patch63 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch64 -p1 -b .workspace.dba23e.patch
-%patch65 -p1 -b .ooo80967.ucb.neon27.patch
-%patch66 -p1 -b .ooo80931.sysui.genericname.patch
+%patch50 -p1 -b .ooo80816.selinux.bridges.patch
+%patch51 -p1 -b .ooo78971.xmloff.outofrange.patch
+%patch52 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
+%patch53 -p1 -b .ooo79481.sw.rowordcount.patch
+%patch54 -p1 -b .ooo80424.vcl.honourwidthtype.patch
+%patch55 -p1 -b .ooo80257.sd.textonlystyle.patch
+tar xzf %{PATCH56}
+%patch57 -p1 -b .workspace.unifysound01.patch
+%patch58 -p1 -b .workspace.npower7.patch
+%patch59 -p1 -b .ooo80721.reportdesign.stlportism.patch
+%patch60 -p1 -b .ooo80735.cppu.map.patch
+%patch61 -p1 -b .ooo80944.sd.sixtyfour.patch
+%patch62 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch63 -p1 -b .workspace.dba23e.patch
+%patch64 -p1 -b .ooo80967.ucb.neon27.patch
+%patch65 -p1 -b .ooo80931.sysui.genericname.patch
%if %{linkopt}
chmod a+x solenv/bin/mklinkscript.pl
@@ -1218,11 +1216,14 @@
#add our custom configuration options
#default GTK fpicker
$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{PATCH1}
-#default autosave settings
+#don't prompt user to agree to license
$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{PATCH2}
+#default autosave settings
$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{PATCH3}
#libtextcat fingerprint location
$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{PATCH4}
+#rhbz#151356 set a consistent bootstrap value, unfortunately upstream finally picked a different one
+sed -i -e s/org2/org2.0/ $RPM_BUILD_ROOT/%{instdir}/program/bootstraprc
#add the debugging libsalalloc_malloc.so.3 library
cp -f solver/680/unxlng*.pro/lib/libsalalloc_malloc.so.3 $RPM_BUILD_ROOT/%{instdir}/program
@@ -2746,6 +2747,8 @@
%changelog
* Thu Aug 23 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-2.3
- drop integrated openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch
+- drop openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch and do
+ it differently
* Wed Aug 22 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-2.2
- move vba stuff into calc package
--- openoffice.org-1.9.115.ooo69368.xmlsec.nss.patch DELETED ---
--- openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch DELETED ---
More information about the fedora-extras-commits
mailing list