rpms/openoffice.org/devel MathPrintOptions.xcu, NONE, 1.1 openoffice.org.spec, 1.1537, 1.1538
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Mon Jun 16 08:01:57 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10609
Modified Files:
openoffice.org.spec
Added Files:
MathPrintOptions.xcu
Log Message:
Resolves: rhbz#451512 set better math default print options
--- NEW FILE MathPrintOptions.xcu ---
<?xml version="1.0" encoding="UTF-8"?>
<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Math" oor:package="org.openoffice.Office">
<node oor:name="Print">
<prop oor:name="FormulaText" oor:type="xs:boolean">
<value>false</value>
</prop>
<prop oor:name="Frame" oor:type="xs:boolean">
<value>false</value>
</prop>
<prop oor:name="Title" oor:type="xs:boolean">
<value>false</value>
</prop>
</node>
</oor:component-data>
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1537
retrieving revision 1.1538
diff -u -r1.1537 -r1.1538
--- openoffice.org.spec 13 Jun 2008 15:39:12 -0000 1.1537
+++ openoffice.org.spec 16 Jun 2008 08:01:06 -0000 1.1538
@@ -75,67 +75,68 @@
Patch1: openoffice.org-multiliblauncher.sh
Patch2: AutoSaveRecovery.xcu
Patch3: RegisterAndLicence.xcu
-Patch4: libtextcat.xcu
-Patch5: openoffice.org.langpack-cjk.template
-Patch6: openoffice.org.langpack-help.template
-Patch7: openoffice.org.langpack-common.template
-Patch8: openoffice.org.langpack-acor.template
-Patch9: openoffice.org.langpack-ctl.template
-Patch10: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
+Patch4: MathPrintOptions.xcu
+Patch5: libtextcat.xcu
+Patch6: openoffice.org.langpack-cjk.template
+Patch7: openoffice.org.langpack-help.template
+Patch8: openoffice.org.langpack-common.template
+Patch9: openoffice.org.langpack-acor.template
+Patch10: openoffice.org.langpack-ctl.template
+Patch11: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
%if %{gtkprintui}
-Patch11: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
+Patch12: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
%endif
-Patch12: openoffice.org-2.0.0.ooo83140.jvmfwk.retryjvm.patch
-Patch13: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
-Patch14: openoffice.org-1.9.115.ooo69368.fixxmlsec.patch
-Patch15: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
-Patch16: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
-Patch17: openoffice.org-2.0.2.rh188467.printingdefaults.patch
-Patch18: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
-Patch19: pseudoworkspace.valgrind1.patch
-Patch20: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
-Patch21: openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch
-Patch22: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
-Patch23: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
-Patch24: openoffice.org-3.0.0.ooo87882.lingucomponent.systemdicts.patch
-Patch25: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
-Patch26: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
-Patch27: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
-Patch28: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
-Patch29: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
-Patch30: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
-Patch31: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
-Patch32: openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
-Patch33: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
-Patch34: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
-Patch35: openoffice.org-2.3.0.ooo76649.httpencoding.patch
-Patch36: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
-Patch37: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
-Patch38: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
-Patch39: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
-Patch40: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
-Patch41: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
-Patch42: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
-Patch43: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
-Patch44: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
-Patch45: openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch
-Patch46: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
-Patch47: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
-Patch48: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
-Patch49: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch
-Patch50: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch51: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
-Patch52: openoffice.org-3.0.0.ooo90055.swext.allowadmin.patch
-Patch53: openoffice.org-3.0.0.ooo90071.chart2.negativecount.patch
-Patch54: openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch
-Patch55: openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch
-Patch56: openoffice.org-3.0.0.ooo90178.tools.fixmacro.patch
-Patch57: openoffice.org-3.0.0.oooXXXXX.vcl.cairomaxclip.patch
-Patch58: openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch
-Patch59: openoffice.org-3.0.0.ooo90612.sd.insertpasswordedfile.patch
-Patch60: openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch
-Patch61: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch
-Patch62: openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch
+Patch13: openoffice.org-2.0.0.ooo83140.jvmfwk.retryjvm.patch
+Patch14: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
+Patch15: openoffice.org-1.9.115.ooo69368.fixxmlsec.patch
+Patch16: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
+Patch17: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
+Patch18: openoffice.org-2.0.2.rh188467.printingdefaults.patch
+Patch19: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
+Patch20: pseudoworkspace.valgrind1.patch
+Patch21: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
+Patch22: openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch
+Patch23: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
+Patch24: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
+Patch25: openoffice.org-3.0.0.ooo87882.lingucomponent.systemdicts.patch
+Patch26: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
+Patch27: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
+Patch28: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
+Patch29: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
+Patch30: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
+Patch31: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
+Patch32: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
+Patch33: openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
+Patch34: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
+Patch35: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
+Patch36: openoffice.org-2.3.0.ooo76649.httpencoding.patch
+Patch37: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
+Patch38: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
+Patch39: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
+Patch40: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
+Patch41: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
+Patch42: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
+Patch43: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
+Patch44: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
+Patch45: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
+Patch46: openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch
+Patch47: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
+Patch48: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
+Patch49: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
+Patch50: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch
+Patch51: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch52: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
+Patch53: openoffice.org-3.0.0.ooo90055.swext.allowadmin.patch
+Patch54: openoffice.org-3.0.0.ooo90071.chart2.negativecount.patch
+Patch55: openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch
+Patch56: openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch
+Patch57: openoffice.org-3.0.0.ooo90178.tools.fixmacro.patch
+Patch58: openoffice.org-3.0.0.oooXXXXX.vcl.cairomaxclip.patch
+Patch59: openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch
+Patch60: openoffice.org-3.0.0.ooo90612.sd.insertpasswordedfile.patch
+Patch61: openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch
+Patch62: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch
+Patch63: openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/openoffice.org
@@ -1220,61 +1221,61 @@
tail -n 1 extras/source/palettes/standard.soc) > redhat.soc
mv -f redhat.soc extras/source/palettes/standard.soc
cp -p %{SOURCE6} external/unowinreg/unowinreg.dll
-%patch10 -p1 -b .rh151357.setlangtolocale.patch
+%patch11 -p1 -b .rh151357.setlangtolocale.patch
%if %{gtkprintui}
-%patch11 -p1 -b .rh127576.gtkunixprintdialog.patch
+%patch12 -p1 -b .rh127576.gtkunixprintdialog.patch
%endif
-%patch12 -p1 -b .ooo83140.jvmfwk.retryjvm.patch
-%patch13 -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
-%patch14 -p1 -b .ooo69368.fixxmlsec.patch
-%patch15 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
-%patch16 -p1 -b .ooo58606.sw.pre-edit.patch
-%patch17 -p1
-%patch18 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
-%patch19 -p1 -b .pseudoworkspace.valgrind1.patch
-%patch20 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
-%patch21 -p1 -b .ooo80412.i18npool.extendgrapheme.patch
-%patch22 -p1 -b .ooo65491.psprint.enablenups.patch
-cat %{PATCH23} >> svtools/source/dialogs/localize.sdf
-%patch24 -p1 -b .ooo87882.lingucomponent.systemdicts.patch
-%patch25 -p1 -b .ooo73201.sw.a11yloadcrash.patch
-%patch26 -p1 -b .ooo73863.vcl.imcommit.patch
-%patch27 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
-%patch28 -p0 -b .ooo68717.gstreamer.video.patch
-%patch29 -p1 -b .ooo63159.sal.dtype.patch
-%patch30 -p1 -b .ooo76393.sal.dynamicsection.patch
-%patch31 -p1 -b .ooo80816.selinux.bridges.patch
-%patch32 -p1 -b .ooo7065.sw.titlepagedialog.patch
-%patch33 -p1 -b .ooo80257.sd.textonlystyle.patch
-tar xzf %{PATCH34}
-%patch35 -p1 -b .ooo76649.httpencoding.patch
-%patch36 -p1 -b .ooo83878.unopkg.enablelinking.patch
-%patch37 -p1
-%patch38 -p1 -b .rh133741.alwaysgtk.vcl.patch
-%patch39 -p1 -b .ooo85429.sw.a11ycrash.patch
-%patch40 -p1 -b .ooo85448.emptyrpath.patch
-%patch41 -p1 -b .ooo85921.sd.editmasterundermouse.patch
-%patch42 -p1 -b .ooo86080.unopkg.bodge.patch
-%patch43 -p1 -b .oooXXXXX.psprint.debugcups.patch
-%patch44 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
-%patch45 -p1 -b .ooo87604.fixupsystemhunspell.patch
-%patch46 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
-%patch47 -p1 -b .ooo88341.sc.verticalboxes.patch
-%patch48 -p1 -b .ooo6087.sc.sheetnames.patch
-%patch49 -p1 -b .ooo89002.vcl.symbolfonts.patch
-%patch50 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch51 -p1 -b .ooo87970.vcl.samenamesubs.patch
-%patch52 -p1 -b .ooo90055.swext.allowadmin.patch
-%patch53 -p1 -b .ooo90071.chart2.negativecount.patch
-%patch54 -p1 -b .oooXXXXX.odk.3layer.patch
-%patch55 -p1 -b .ooo90037.vcl.cairotransforms.patch
-%patch56 -p1 -b .ooo90178.tools.fixmacro.patch
-%patch57 -p1 -b .oooXXXXX.vcl.cairomaxclip.patch
-%patch58 -p1 -b .ooo82545.np_sdk.x86_64.patch
-%patch59 -p1 -b .ooo90612.sd.insertpasswordedfile.patch
-%patch60 -p1 -b .ooo90306.sw.wrongprotection.patch
-%patch61 -p1 -b .ooo48400.svx.fixspelling.patch
-%patch62 -p1 -b .ooo90697.sd.a11ycrash.patch
+%patch13 -p1 -b .ooo83140.jvmfwk.retryjvm.patch
+%patch14 -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
+%patch15 -p1 -b .ooo69368.fixxmlsec.patch
+%patch16 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
+%patch17 -p1 -b .ooo58606.sw.pre-edit.patch
+%patch18 -p1
+%patch19 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
+%patch20 -p1 -b .pseudoworkspace.valgrind1.patch
+%patch21 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
+%patch22 -p1 -b .ooo80412.i18npool.extendgrapheme.patch
+%patch23 -p1 -b .ooo65491.psprint.enablenups.patch
+cat %{PATCH24} >> svtools/source/dialogs/localize.sdf
+%patch25 -p1 -b .ooo87882.lingucomponent.systemdicts.patch
+%patch26 -p1 -b .ooo73201.sw.a11yloadcrash.patch
+%patch27 -p1 -b .ooo73863.vcl.imcommit.patch
+%patch28 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
+%patch29 -p0 -b .ooo68717.gstreamer.video.patch
+%patch30 -p1 -b .ooo63159.sal.dtype.patch
+%patch31 -p1 -b .ooo76393.sal.dynamicsection.patch
+%patch32 -p1 -b .ooo80816.selinux.bridges.patch
+%patch33 -p1 -b .ooo7065.sw.titlepagedialog.patch
+%patch34 -p1 -b .ooo80257.sd.textonlystyle.patch
+tar xzf %{PATCH35}
+%patch36 -p1 -b .ooo76649.httpencoding.patch
+%patch37 -p1 -b .ooo83878.unopkg.enablelinking.patch
+%patch38 -p1
+%patch39 -p1 -b .rh133741.alwaysgtk.vcl.patch
+%patch40 -p1 -b .ooo85429.sw.a11ycrash.patch
+%patch41 -p1 -b .ooo85448.emptyrpath.patch
+%patch42 -p1 -b .ooo85921.sd.editmasterundermouse.patch
+%patch43 -p1 -b .ooo86080.unopkg.bodge.patch
+%patch44 -p1 -b .oooXXXXX.psprint.debugcups.patch
+%patch45 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
+%patch46 -p1 -b .ooo87604.fixupsystemhunspell.patch
+%patch47 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
+%patch48 -p1 -b .ooo88341.sc.verticalboxes.patch
+%patch49 -p1 -b .ooo6087.sc.sheetnames.patch
+%patch50 -p1 -b .ooo89002.vcl.symbolfonts.patch
+%patch51 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch52 -p1 -b .ooo87970.vcl.samenamesubs.patch
+%patch53 -p1 -b .ooo90055.swext.allowadmin.patch
+%patch54 -p1 -b .ooo90071.chart2.negativecount.patch
+%patch55 -p1 -b .oooXXXXX.odk.3layer.patch
+%patch56 -p1 -b .ooo90037.vcl.cairotransforms.patch
+%patch57 -p1 -b .ooo90178.tools.fixmacro.patch
+%patch58 -p1 -b .oooXXXXX.vcl.cairomaxclip.patch
+%patch59 -p1 -b .ooo82545.np_sdk.x86_64.patch
+%patch60 -p1 -b .ooo90612.sd.insertpasswordedfile.patch
+%patch61 -p1 -b .ooo90306.sw.wrongprotection.patch
+%patch62 -p1 -b .ooo48400.svx.fixspelling.patch
+%patch63 -p1 -b .ooo90697.sd.a11ycrash.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -1576,7 +1577,10 @@
sed -i -e "s#>Patch.*# xsi:nil=\"true\"/>#g" $RPM_BUILD_ROOT/%{brinstdir}/share/registry/data/org/openoffice/Office/Common.xcu
#libtextcat fingerprint location
mkdir -p $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Paths
-cp %{PATCH4} $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Paths
+cp %{PATCH5} $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Paths
+#rhbz#451512 set better math print options
+mkdir -p $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Math
+cp %{PATCH6} $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Math
#add the debugging libsalalloc_malloc.so.3 library
cp -f solver/%{OFFICEUPD}/unxlng*.pro/lib/libsalalloc_malloc.so.3 $RPM_BUILD_ROOT/%{ureinstdir}/lib
@@ -1680,26 +1684,26 @@
i=0
while [ $i -lt ${#langpackdetails[@]} ]; do
lang=${langpackdetails[$i]}
- sed -e "s/LANG/$lang/g" %{PATCH7} > $lang.filelist
+ sed -e "s/LANG/$lang/g" %{PATCH8} > $lang.filelist
i=$[i+1]
help=${langpackdetails[$i]}
if [ "$help" = "help" ]; then
- sed -e "s/LANG/$lang/g" %{PATCH6} >> $lang.filelist
+ sed -e "s/LANG/$lang/g" %{PATCH7} >> $lang.filelist
fi
i=$[i+1]
lingu=${langpackdetails[$i]}
if [ ! "$lingu" = "noacor" ]; then
- sed -e "s/LINGUPATTERN/$lingu/g" %{PATCH8} >> $lang.filelist
+ sed -e "s/LINGUPATTERN/$lingu/g" %{PATCH9} >> $lang.filelist
fi
i=$[i+1]
type=${langpackdetails[$i]}
if [ "$type" = "cjk" ]; then
- sed -e "s/LANG/$lang/g" %{PATCH5} >> $lang.filelist
+ sed -e "s/LANG/$lang/g" %{PATCH6} >> $lang.filelist
fi
#rh217269 upstream made a decision to sequence check all ctl languages
#I think this is wrong, and only Thai should be sequence checked
if [ "$type" = "ctlseqcheck" ]; then
- sed -e "s/LANG/$lang/g" %{PATCH9} >> $lang.filelist
+ sed -e "s/LANG/$lang/g" %{PATCH10} >> $lang.filelist
fi
if [ "$type" = "ctl" ]; then
rm $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_$lang.xcu
@@ -3460,10 +3464,11 @@
%{python_py_sitearch}/unohelper.py*
%changelog
-* Fri Jun 13 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.19-2
+* Mon Jun 16 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.19-2
- Resolves: rhbz#450661 openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch
- Resolves: rhbz#448464 openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch
- Resolves: rhbz#450930 openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch
+- Resolves: rhbz#451512 set better math default print options
* Wed Jun 11 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.19-1
- next version
More information about the fedora-extras-commits
mailing list