rpms/openoffice.org/devel openoffice.org.spec, 1.911, 1.912 sources, 1.201, 1.202
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sat Nov 4 14:39:45 UTC 2006
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17226
Modified Files:
openoffice.org.spec sources
Log Message:
opensymbol finally upstreamed
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.911
retrieving revision 1.912
diff -u -r1.911 -r1.912
--- openoffice.org.spec 4 Nov 2006 14:31:53 -0000 1.911
+++ openoffice.org.spec 4 Nov 2006 14:39:43 -0000 1.912
@@ -37,17 +37,15 @@
Source1: openoffice.org-myspell-contrib.tar.gz
Source2: openoffice.org-simple-crash_report.sh
Source3: RegisterAndLicence.xcu
-Source4: opens___.ttf
-Source5: GSI_ga.sdf
-Source6: evolocal.odb
-Source7: Tigert-templates.tar.gz
-Source8: documentation.openoffice.org-templates.tar.gz
-Source9: redhat-templates.tar.gz
-Source10: AutoSaveRecovery.xcu
-Source11: AutoSaveCommon.xcu
-Source12: ooo64726.sdf
-Source13: openoffice.org.langpack.template.tar.gz
-Source14: pa-IN-179.sdf
+Source4: evolocal.odb
+Source5: Tigert-templates.tar.gz
+Source6: documentation.openoffice.org-templates.tar.gz
+Source7: redhat-templates.tar.gz
+Source8: AutoSaveRecovery.xcu
+Source9: AutoSaveCommon.xcu
+Source10: ooo64726.sdf
+Source11: openoffice.org.langpack.template.tar.gz
+Source12: pa-IN-179.sdf
BuildRequires: tcsh, perl, sed, zip, bzip2, unzip, tar, findutils, prelink
BuildRequires: autoconf, make >= 3.79.1, flex, bison, perl-Compress-Zlib
BuildRequires: gcc, gcc-c++ >= 4.1.1, binutils, gcc-java >= 4.1.1
@@ -85,49 +83,48 @@
Patch17: openoffice.org-1.9.128.ooo54479.systemicu.patch
Patch18: workspace.icuupgrade.patch
Patch19: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
-Patch20: workspace.opensymbol01.patch
-Patch21: workspace.inplaceobjects.patch
-Patch22: openoffice.org-2.0.2.rh188467.printingdefaults.patch
-Patch23: openoffice.org-2.0.2.ooo64463.extensions.noxaw.patch
-Patch24: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
-Patch25: workspace.fpicker6.patch
-Patch26: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
-Patch27: openoffice.org-2.0.2.ooo59127.vcl.honourcairofont.patch
-Patch28: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
-Patch29: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
-Patch30: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
-Patch31: ooobuild.VBAObjects.patch
-Patch32: openoffice.org-2.0.3.ooo67644.sw.spacing.patch
-Patch33: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
-Patch34: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
-Patch35: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
-Patch36: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
-Patch37: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
-Patch38: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
-Patch39: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
-Patch40: openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
-Patch41: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
-Patch42: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
-Patch43: openoffice.org-2.0.4.oooXXXXX.solenv.warnnoterror.patch
-Patch44: openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch
-Patch45: openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch
-Patch46: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
-Patch47: pseudoworkspace.valgrind1.patch
-Patch48: openoffice.org-2.0.4.gccXXXXX.svtools.fsstorage.patch
-Patch49: openoffice.org-2.0.4.ooo69780.goodies.hugetile.patch
-Patch50: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
-Patch51: openoffice.org-2.0.4.ooo69992.vcl.im_yield.patch
-Patch52: openoffice.org-2.0.4.ooo70779.vcl.setprgname.patch
-Patch53: openoffice.org-2.0.4.ooo70601.sd.sal_uInt32_aslong.patch
-Patch54: openoffice.org-2.0.4.ooo70782.secondaryfpicker.atk.patch
-Patch55: openoffice.org-2.0.4.ooo70835.vcl.minimizealerts.patch
-Patch56: openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch
-Patch57: openoffice.org-2.0.4.ooo71039.svx.purevirtual.patch
-Patch58: openoffice.org.2.0.4.oooXXXXX.i18npool.extendgrapheme.patch
-Patch59: openoffice.org-2.0.4.ooo71076.dtrans.64bitdragdrop.patch
-Patch60: openoffice.org-2.0.4.ooo71077.sc.purevirtual.patch
-Patch61: openoffice.org-2.1.0.ooo71111.sfx2.x86_64.patch
-Patch62: workspace.gtkquickstart2.patch
+Patch20: workspace.inplaceobjects.patch
+Patch21: openoffice.org-2.0.2.rh188467.printingdefaults.patch
+Patch22: openoffice.org-2.0.2.ooo64463.extensions.noxaw.patch
+Patch23: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
+Patch24: workspace.fpicker6.patch
+Patch25: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
+Patch26: openoffice.org-2.0.2.ooo59127.vcl.honourcairofont.patch
+Patch27: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
+Patch28: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
+Patch29: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
+Patch30: ooobuild.VBAObjects.patch
+Patch31: openoffice.org-2.0.3.ooo67644.sw.spacing.patch
+Patch32: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
+Patch33: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
+Patch34: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
+Patch35: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
+Patch36: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
+Patch37: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
+Patch38: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
+Patch39: openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
+Patch40: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
+Patch41: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
+Patch42: openoffice.org-2.0.4.oooXXXXX.solenv.warnnoterror.patch
+Patch43: openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch
+Patch44: openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch
+Patch45: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
+Patch46: pseudoworkspace.valgrind1.patch
+Patch47: openoffice.org-2.0.4.gccXXXXX.svtools.fsstorage.patch
+Patch48: openoffice.org-2.0.4.ooo69780.goodies.hugetile.patch
+Patch49: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
+Patch50: openoffice.org-2.0.4.ooo69992.vcl.im_yield.patch
+Patch51: openoffice.org-2.0.4.ooo70779.vcl.setprgname.patch
+Patch52: openoffice.org-2.0.4.ooo70601.sd.sal_uInt32_aslong.patch
+Patch53: openoffice.org-2.0.4.ooo70782.secondaryfpicker.atk.patch
+Patch54: openoffice.org-2.0.4.ooo70835.vcl.minimizealerts.patch
+Patch55: openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch
+Patch56: openoffice.org-2.0.4.ooo71039.svx.purevirtual.patch
+Patch57: openoffice.org.2.0.4.oooXXXXX.i18npool.extendgrapheme.patch
+Patch58: openoffice.org-2.0.4.ooo71076.dtrans.64bitdragdrop.patch
+Patch59: openoffice.org-2.0.4.ooo71077.sc.purevirtual.patch
+Patch60: openoffice.org-2.1.0.ooo71111.sfx2.x86_64.patch
+Patch61: workspace.gtkquickstart2.patch
%define instdir %{_libdir}/openoffice.org2.1
@@ -947,53 +944,52 @@
%patch17 -p1 -b .ooo54479.systemicu.patch
%patch18 -p1 -b .workspace.icuupgrade.patch
%patch19 -p1 -b .ooo58606.sw.pre-edit.patch
-%patch20 -p1 -b .workspace.opensymbol01.patch
-%patch21 -p1 -b .workspace.inplaceobjects.patch
-%patch22 -p1
-%patch23 -p1 -b .ooo64463.extensions.noxaw.patch
-%patch24 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
-%patch25 -p1 -b .workspace.fpicker6.patch
-%patch26 -p1 -b .oooXXXXX.selinux.bridges.patch
-%patch27 -p1 -b .ooo59127.vcl.honourcairofont.patch
-%patch28 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
-%patch29 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
-%patch30 -p1 -b .rh187919.gtkunderkde.patch
-%patch31 -p0 -b .ooobuild.VBAObjects.patch
-%patch32 -p1 -b .ooo67644.sw.spacing.patch
-%patch33 -p1 -b .ooo67658.sfx2.reloadcrash.patch
-%patch34 -p1 -b .ooo67716.svx.overflow.patch
-%patch35 -p1 -b .gccXXXXX.basegfx.crash.patch
-%patch36 -p1 -b .ooo67740.xmlhelp.doublefree.patch
-%patch37 -p1 -b .rh200118.filter.xalanbroken.patch
-%patch38 -p1 -b .ooo67793.sw.stickymenu.patch
-%patch39 -p1 -b .ooo54603.fontconfig.part2.patch
-%patch40 -p1 -b .ooo67976.svx.macroscrash.patch
-%patch41 -p1 -b .ooo68018.svx.classpathdialog.patch
-%patch42 -p1 -b .ooo68048.vcl.imsurroundtext.patch
-%patch43 -p1 -b .oooXXXXX.solenv.warnnoterror.patch
-%patch44 -p1 -b .oooXXXXX.vcl.x86_64.impressatk.patch
-%patch45 -p1 -b .ooo54603.fontconfig.part3.patch
-%patch46 -p1 -b .ooo69051.vcl.singlekeypress.patch
-%patch47 -p1 -b .pseudoworkspace.valgrind1.patch
-%patch48 -p1 -b .gccXXXXX.svtools.fsstorage.patch
-%patch49 -p1 -b .ooo69780.goodies.hugetile.patch
-%patch50 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
-%patch51 -p1 -b .ooo69992.vcl.im_yield.patch
-%patch52 -p1 -b .ooo70779.vcl.setprgname.patch
-%patch53 -p1 -b .ooo70601.sd.sal_uInt32_aslong.patch
-%patch54 -p1 -b .ooo70782.secondaryfpicker.atk.patch
-%patch55 -p1 -b .ooo70835.vcl.minimizealerts.patch
-%patch56 -p1 -b .ooo70155.fasterhelplinking.patch
-%patch57 -p1 -b .ooo71039.svx.purevirtual.patch
-%patch58 -p1 -b .oooXXXXX.i18npool.extendgrapheme.patch
-%patch59 -p1 -b .ooo71076.dtrans.64bitdragdrop.patch
-%patch60 -p1 -b .ooo71077.sc.purevirtual.patch
-%patch61 -p1 -b .ooo71111.sfx2.x86_64.patch
-%patch62 -p1 -b .workspace.gtkquickstart2.patch
+%patch20 -p1 -b .workspace.inplaceobjects.patch
+%patch21 -p1
+%patch22 -p1 -b .ooo64463.extensions.noxaw.patch
+%patch23 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
+%patch24 -p1 -b .workspace.fpicker6.patch
+%patch25 -p1 -b .oooXXXXX.selinux.bridges.patch
+%patch26 -p1 -b .ooo59127.vcl.honourcairofont.patch
+%patch27 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
+%patch28 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
+%patch29 -p1 -b .rh187919.gtkunderkde.patch
+%patch30 -p0 -b .ooobuild.VBAObjects.patch
+%patch31 -p1 -b .ooo67644.sw.spacing.patch
+%patch32 -p1 -b .ooo67658.sfx2.reloadcrash.patch
+%patch33 -p1 -b .ooo67716.svx.overflow.patch
+%patch34 -p1 -b .gccXXXXX.basegfx.crash.patch
+%patch35 -p1 -b .ooo67740.xmlhelp.doublefree.patch
+%patch36 -p1 -b .rh200118.filter.xalanbroken.patch
+%patch37 -p1 -b .ooo67793.sw.stickymenu.patch
+%patch38 -p1 -b .ooo54603.fontconfig.part2.patch
+%patch39 -p1 -b .ooo67976.svx.macroscrash.patch
+%patch40 -p1 -b .ooo68018.svx.classpathdialog.patch
+%patch41 -p1 -b .ooo68048.vcl.imsurroundtext.patch
+%patch42 -p1 -b .oooXXXXX.solenv.warnnoterror.patch
+%patch43 -p1 -b .oooXXXXX.vcl.x86_64.impressatk.patch
+%patch44 -p1 -b .ooo54603.fontconfig.part3.patch
+%patch45 -p1 -b .ooo69051.vcl.singlekeypress.patch
+%patch46 -p1 -b .pseudoworkspace.valgrind1.patch
+%patch47 -p1 -b .gccXXXXX.svtools.fsstorage.patch
+%patch48 -p1 -b .ooo69780.goodies.hugetile.patch
+%patch49 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
+%patch50 -p1 -b .ooo69992.vcl.im_yield.patch
+%patch51 -p1 -b .ooo70779.vcl.setprgname.patch
+%patch52 -p1 -b .ooo70601.sd.sal_uInt32_aslong.patch
+%patch53 -p1 -b .ooo70782.secondaryfpicker.atk.patch
+%patch54 -p1 -b .ooo70835.vcl.minimizealerts.patch
+%patch55 -p1 -b .ooo70155.fasterhelplinking.patch
+%patch56 -p1 -b .ooo71039.svx.purevirtual.patch
+%patch57 -p1 -b .oooXXXXX.i18npool.extendgrapheme.patch
+%patch58 -p1 -b .ooo71076.dtrans.64bitdragdrop.patch
+%patch59 -p1 -b .ooo71077.sc.purevirtual.patch
+%patch60 -p1 -b .ooo71111.sfx2.x86_64.patch
+%patch61 -p1 -b .workspace.gtkquickstart2.patch
tar xzf %{SOURCE1}
-cp %{SOURCE6} extras/source/database/evolocal.odb
+cp %{SOURCE4} extras/source/database/evolocal.odb
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -1055,9 +1051,8 @@
build --dlv_switch -link --all
fi
deliver -link
-localize -m -x -l ga -f %{SOURCE5}
-localize -m -x -l bn -f %{SOURCE12}
-localize -m -x -l pa-IN -f %{SOURCE14}
+localize -m -x -l bn -f %{SOURCE10}
+localize -m -x -l pa-IN -f %{SOURCE12}
cd ../..
cd instsetoo_native/util
@@ -1135,8 +1130,8 @@
#default GTK fpicker
$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{SOURCE3}
#default autosave settings
-$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{SOURCE10}
-$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{SOURCE11}
+$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{SOURCE8}
+$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{SOURCE9}
#rh#158977# clear execstack requirement
execstack -c $RPM_BUILD_ROOT/%{instdir}/program/libgcc3_uno.so
@@ -1194,7 +1189,7 @@
st help nodict western ss nohelp nodict western \
nr help nodict western ns help nodict western \
)
-tar xzf %{SOURCE13}
+tar xzf %{SOURCE11}
i=0
while [ $i -lt ${#langpackdetails[@]} ]; do
lang=${langpackdetails[$i]}
@@ -1221,9 +1216,9 @@
done
#add in some templates
+tar xzf %{SOURCE5} -C $RPM_BUILD_ROOT/%{instdir}/share
+tar xzf %{SOURCE6} -C $RPM_BUILD_ROOT/%{instdir}/share
tar xzf %{SOURCE7} -C $RPM_BUILD_ROOT/%{instdir}/share
-tar xzf %{SOURCE8} -C $RPM_BUILD_ROOT/%{instdir}/share
-tar xzf %{SOURCE9} -C $RPM_BUILD_ROOT/%{instdir}/share
#skip the swahelli for now
rm -rf $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/*sw_TZ*
@@ -1276,9 +1271,6 @@
cp -f %{SOURCE2} $RPM_BUILD_ROOT/%{instdir}/program/crash_report
chmod a+x $RPM_BUILD_ROOT/%{instdir}/program/crash_report
-# ooo#59997# use ooo-build opens___.ttf with greater coverage
-cp -f %{SOURCE4} $RPM_BUILD_ROOT/%{instdir}/share/fonts/truetype/opens___.ttf
-
#make up some /usr/bin scripts
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
@@ -2536,6 +2528,7 @@
- drop upstreamed openoffice.org-2.0.4.ooo70361.vcl.atkfilechooser.patch
- drop upstreamed openoffice.org-2.0.4.ooo69620.vcl.atkcombo.patch
- drop upstreamed workspace.fwk53.patch
+- drop upstreamed workspace.opensymbol01.patch
- add openoffice.org-2.1.0.ooo71111.sfx2.x86_64.patch
- add workspace.gtkquickstart2.patch
- add workspace.gtkquickstart2.patch
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- sources 2 Nov 2006 14:51:33 -0000 1.201
+++ sources 4 Nov 2006 14:39:43 -0000 1.202
@@ -2,8 +2,6 @@
16cb79cb018c6311e9797e85bd2461b2 evolocal.odb
b54bcc9fdb23389e961b281508d9110c documentation.openoffice.org-templates.tar.gz
1b4d9a03ebb4c864015620153afb77c6 Tigert-templates.tar.gz
-afe937f8dd4c3aa10e9bda068059cdfd opens___.ttf
-7f31494f6d929e03b1e29408d8083d19 GSI_ga.sdf
05a906513ef89af5e189097fa0c50681 ooo64726.sdf
5a7c718e63d09f42fd40017b28dffd10 AutoSaveCommon.xcu
d57f21d70ba34ddb20f40a4d08427722 AutoSaveRecovery.xcu
More information about the fedora-cvs-commits
mailing list