diff --git a/.gitignore b/.gitignore index 11f181a..669d877 100644 --- a/.gitignore +++ b/.gitignore @@ -6,23 +6,23 @@ /ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip /fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz /redhat-langpacks.tar.gz -/libreoffice-artwork-3.2.99.3.tar.bz2 -/libreoffice-base-3.2.99.3.tar.bz2 -/libreoffice-bootstrap-3.2.99.3.tar.bz2 -/libreoffice-calc-3.2.99.3.tar.bz2 -/libreoffice-components-3.2.99.3.tar.bz2 -/libreoffice-extensions-3.2.99.3.tar.bz2 -/libreoffice-extras-3.2.99.3.tar.bz2 -/libreoffice-filters-3.2.99.3.tar.bz2 -/libreoffice-help-3.2.99.3.tar.bz2 -/libreoffice-impress-3.2.99.3.tar.bz2 -/libreoffice-l10n-3.2.99.3.tar.bz2 -/libreoffice-libs-core-3.2.99.3.tar.bz2 -/libreoffice-libs-extern-sys-3.2.99.3.tar.bz2 -/libreoffice-libs-extern-3.2.99.3.tar.bz2 -/libreoffice-libs-gui-3.2.99.3.tar.bz2 -/libreoffice-postprocess-3.2.99.3.tar.bz2 -/libreoffice-sdk-3.2.99.3.tar.bz2 -/libreoffice-testing-3.2.99.3.tar.bz2 -/libreoffice-ure-3.2.99.3.tar.bz2 -/libreoffice-writer-3.2.99.3.tar.bz2 +/libreoffice-artwork-3.3.0.1.tar.bz2 +/libreoffice-base-3.3.0.1.tar.bz2 +/libreoffice-bootstrap-3.3.0.1.tar.bz2 +/libreoffice-calc-3.3.0.1.tar.bz2 +/libreoffice-components-3.3.0.1.tar.bz2 +/libreoffice-extensions-3.3.0.1.tar.bz2 +/libreoffice-extras-3.3.0.1.tar.bz2 +/libreoffice-filters-3.3.0.1.tar.bz2 +/libreoffice-help-3.3.0.1.tar.bz2 +/libreoffice-impress-3.3.0.1.tar.bz2 +/libreoffice-l10n-3.3.0.1.tar.bz2 +/libreoffice-libs-core-3.3.0.1.tar.bz2 +/libreoffice-libs-extern-3.3.0.1.tar.bz2 +/libreoffice-libs-extern-sys-3.3.0.1.tar.bz2 +/libreoffice-libs-gui-3.3.0.1.tar.bz2 +/libreoffice-postprocess-3.3.0.1.tar.bz2 +/libreoffice-sdk-3.3.0.1.tar.bz2 +/libreoffice-testing-3.3.0.1.tar.bz2 +/libreoffice-ure-3.3.0.1.tar.bz2 +/libreoffice-writer-3.3.0.1.tar.bz2 diff --git a/libreoffice.spec b/libreoffice.spec index c7e82f7..409590e 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -27,43 +27,42 @@ Summary: Free Software Productivity Suite Name: libreoffice -Version: 3.2.99.3 -Release: 2%{?dist} +Version: 3.3.0.1 +Release: 1%{?dist} License: LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain Group: Applications/Productivity URL: http://www.documentfoundation.org/develop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: http://download.documentfoundation.org/libreoffice/src/libreoffice-artwork-3.2.99.3.tar.bz2 -Source1: http://download.documentfoundation.org/libreoffice/src/libreoffice-base-3.2.99.3.tar.bz2 -Source2: http://download.documentfoundation.org/libreoffice/src/libreoffice-bootstrap-3.2.99.3.tar.bz2 -Source3: http://download.documentfoundation.org/libreoffice/src/libreoffice-calc-3.2.99.3.tar.bz2 -Source4: http://download.documentfoundation.org/libreoffice/src/libreoffice-components-3.2.99.3.tar.bz2 -Source5: http://download.documentfoundation.org/libreoffice/src/libreoffice-extensions-3.2.99.3.tar.bz2 -Source6: http://download.documentfoundation.org/libreoffice/src/libreoffice-extras-3.2.99.3.tar.bz2 -Source7: http://download.documentfoundation.org/libreoffice/src/libreoffice-filters-3.2.99.3.tar.bz2 -Source8: http://download.documentfoundation.org/libreoffice/src/libreoffice-help-3.2.99.3.tar.bz2 -Source9: http://download.documentfoundation.org/libreoffice/src/libreoffice-impress-3.2.99.3.tar.bz2 -Source10: http://download.documentfoundation.org/libreoffice/src/libreoffice-libs-core-3.2.99.3.tar.bz2 -Source11: http://download.documentfoundation.org/libreoffice/src/libreoffice-libs-extern-3.2.99.3.tar.bz2 -Source12: http://download.documentfoundation.org/libreoffice/src/libreoffice-libs-extern-sys-3.2.99.3.tar.bz2 -Source13: http://download.documentfoundation.org/libreoffice/src/libreoffice-libs-gui-3.2.99.3.tar.bz2 -Source14: http://download.documentfoundation.org/libreoffice/src/libreoffice-postprocess-3.2.99.3.tar.bz2 -Source15: http://download.documentfoundation.org/libreoffice/src/libreoffice-sdk-3.2.99.3.tar.bz2 -Source16: http://download.documentfoundation.org/libreoffice/src/libreoffice-testing-3.2.99.3.tar.bz2 -Source17: http://download.documentfoundation.org/libreoffice/src/libreoffice-ure-3.2.99.3.tar.bz2 -Source18: http://download.documentfoundation.org/libreoffice/src/libreoffice-writer-3.2.99.3.tar.bz2 -Source19: http://cgit.freedesktop.org/ooo-build/ooo-build/plain/src/evolocal.odb +Source0: http://download.documentfoundation.org/libreoffice/src/libreoffice-artwork-%{version}.tar.bz2 +Source1: http://download.documentfoundation.org/libreoffice/src/libreoffice-base-%{version}.tar.bz2 +Source2: http://download.documentfoundation.org/libreoffice/src/libreoffice-bootstrap-%{version}.tar.bz2 +Source3: http://download.documentfoundation.org/libreoffice/src/libreoffice-calc-%{version}.tar.bz2 +Source4: http://download.documentfoundation.org/libreoffice/src/libreoffice-components-%{version}.tar.bz2 +Source5: http://download.documentfoundation.org/libreoffice/src/libreoffice-extensions-%{version}.tar.bz2 +Source6: http://download.documentfoundation.org/libreoffice/src/libreoffice-extras-%{version}.tar.bz2 +Source7: http://download.documentfoundation.org/libreoffice/src/libreoffice-filters-%{version}.tar.bz2 +Source8: http://download.documentfoundation.org/libreoffice/src/libreoffice-help-%{version}.tar.bz2 +Source9: http://download.documentfoundation.org/libreoffice/src/libreoffice-impress-%{version}.tar.bz2 +Source10: http://download.documentfoundation.org/libreoffice/src/libreoffice-libs-core-%{version}.tar.bz2 +Source11: http://download.documentfoundation.org/libreoffice/src/libreoffice-libs-extern-%{version}.tar.bz2 +Source12: http://download.documentfoundation.org/libreoffice/src/libreoffice-libs-extern-sys-%{version}.tar.bz2 +Source13: http://download.documentfoundation.org/libreoffice/src/libreoffice-libs-gui-%{version}.tar.bz2 +Source14: http://download.documentfoundation.org/libreoffice/src/libreoffice-postprocess-%{version}.tar.bz2 +Source15: http://download.documentfoundation.org/libreoffice/src/libreoffice-sdk-%{version}.tar.bz2 +Source16: http://download.documentfoundation.org/libreoffice/src/libreoffice-testing-%{version}.tar.bz2 +Source17: http://download.documentfoundation.org/libreoffice/src/libreoffice-ure-%{version}.tar.bz2 +Source18: http://download.documentfoundation.org/libreoffice/src/libreoffice-writer-%{version}.tar.bz2 +Source19: http://download.documentfoundation.org/libreoffice/src/libreoffice-l10n-%{version}.tar.bz2 Source20: http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll Source21: redhat-langpacks.tar.gz -Source23: libreoffice-multiliblauncher.sh -Source26: http://hg.services.openoffice.org/binaries/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz -Source27: http://hg.services.openoffice.org/binaries/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip -Source28: http://hg.services.openoffice.org/binaries/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz -Source29: http://hg.services.openoffice.org/binaries/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip -Source30: http://hg.services.openoffice.org/binaries/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip -Source31: http://hg.services.openoffice.org/binaries/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip -Source32: http://hg.services.openoffice.org/binaries/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz -Source33: http://download.documentfoundation.org/libreoffice/src/libreoffice-l10n-3.2.99.3.tar.bz2 +Source22: libreoffice-multiliblauncher.sh +Source23: http://hg.services.openoffice.org/binaries/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz +Source24: http://hg.services.openoffice.org/binaries/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip +Source25: http://hg.services.openoffice.org/binaries/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz +Source26: http://hg.services.openoffice.org/binaries/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip +Source27: http://hg.services.openoffice.org/binaries/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip +Source28: http://hg.services.openoffice.org/binaries/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip +Source29: http://hg.services.openoffice.org/binaries/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz BuildRequires: zip, findutils, autoconf, flex, bison, icu, gperf, gcc-c++ BuildRequires: binutils, java-devel >= 1.6.0, boost-devel, zlib-devel BuildRequires: python-devel, expat-devel, libxml2-devel, libxslt-devel, bc @@ -680,7 +679,7 @@ Rules for auto-correcting common %{langname} typing errors. \ %endif %prep -%setup -q -c -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 33 +%setup -q -c -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 for a in */*; do mv `pwd`/$a .; done #remove "debugging" translations rm -rf l10n/source/kid @@ -693,8 +692,6 @@ rm -rf l10n/source/kid ' && \ tail -n 1 extras/source/palettes/standard.soc) > redhat.soc mv -f redhat.soc extras/source/palettes/standard.soc -cp -p %{SOURCE19} extras/source/database/evolocal.odb -cp -p %{SOURCE20} external/unowinreg/unowinreg.dll %patch1 -p1 -b .ooo53397.prelinkoptimize.desktop.patch %patch2 -p1 %patch3 -p1 -b .ooo86080.unopkg.bodge.patch @@ -750,13 +747,13 @@ autoconf mkdir -p ext_sources cp %{SOURCE20} ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll +cp %{SOURCE23} ext_sources +cp %{SOURCE24} ext_sources +cp %{SOURCE25} ext_sources cp %{SOURCE26} ext_sources cp %{SOURCE27} ext_sources cp %{SOURCE28} ext_sources cp %{SOURCE29} ext_sources -cp %{SOURCE30} ext_sources -cp %{SOURCE31} ext_sources -cp %{SOURCE32} ext_sources #use the RPM_OPT_FLAGS but remove the OOo overridden ones for i in $RPM_OPT_FLAGS; do @@ -1116,12 +1113,12 @@ echo \#\!/bin/sh > $RPM_BUILD_ROOT/%{_bindir}/oobase echo exec libreoffice -base \"\$@\" >> $RPM_BUILD_ROOT/%{_bindir}/oobase chmod a+x $RPM_BUILD_ROOT/%{_bindir}/oobase -cp -f %{SOURCE23} $RPM_BUILD_ROOT/%{_bindir}/unopkg +cp -f %{SOURCE22} $RPM_BUILD_ROOT/%{_bindir}/unopkg sed -i -e "s/LAUNCHER/unopkg/g" $RPM_BUILD_ROOT/%{_bindir}/unopkg sed -i -e "s/BRAND/libreoffice/g" $RPM_BUILD_ROOT/%{_bindir}/unopkg chmod a+x $RPM_BUILD_ROOT/%{_bindir}/unopkg -cp -f %{SOURCE23} $RPM_BUILD_ROOT/%{_bindir}/libreoffice +cp -f %{SOURCE22} $RPM_BUILD_ROOT/%{_bindir}/libreoffice sed -i -e "s/LAUNCHER/soffice/g" $RPM_BUILD_ROOT/%{_bindir}/libreoffice sed -i -e "s/BRAND/libreoffice/g" $RPM_BUILD_ROOT/%{_bindir}/libreoffice chmod a+x $RPM_BUILD_ROOT/%{_bindir}/libreoffice @@ -2017,8 +2014,10 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %{baseinstdir}/share/extensions/script-provider-for-python %{basisinstdir}/share/registry/pyuno.xcd - %changelog +* Sun Dec 05 2010 Caolán McNamara 3.3.0.1-1 +- release candidate 1 + * Sat Nov 27 2010 Caolán McNamara 3.2.99.3-2 - Resolves: rhbz#610103 exit quickstarter when libs deleted - Resolves: rhbz#652695 release desktop in timeout diff --git a/sources b/sources index a42fb2b..5cac61b 100644 --- a/sources +++ b/sources @@ -6,23 +6,23 @@ a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2. ada24d37d8d638b3d8a9985e80bc2978 ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip fdb27bfe2dbe2e7b57ae194d9bf36bab fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz 7d38610a11453ee5d12aefe7abda7e91 redhat-langpacks.tar.gz -75c7a8ce88f3ba72246517338912c0d8 libreoffice-artwork-3.2.99.3.tar.bz2 -a721cac9741e22efa9b8f9848685b18c libreoffice-base-3.2.99.3.tar.bz2 -070bc02f54737e2d837e0f34298702db libreoffice-bootstrap-3.2.99.3.tar.bz2 -1a9cf9075cd4ef81d894898f69d91224 libreoffice-calc-3.2.99.3.tar.bz2 -4b79db72d5b18a29c54f4a6e3915b332 libreoffice-components-3.2.99.3.tar.bz2 -5f8fe4669551239f6a8e48a333462949 libreoffice-extensions-3.2.99.3.tar.bz2 -eaf9ed72ef2aa8eddbc3c0ab1eff81aa libreoffice-extras-3.2.99.3.tar.bz2 -fc367831b28c127b52af88e46673ad4a libreoffice-filters-3.2.99.3.tar.bz2 -3c3f604df53afc485d2718bf228ec8c9 libreoffice-help-3.2.99.3.tar.bz2 -ce0306299936e0dcb45f3a3793c62b87 libreoffice-impress-3.2.99.3.tar.bz2 -120afae2dadb6adb55a263fd874b97ff libreoffice-l10n-3.2.99.3.tar.bz2 -89be374be52889461fc5a95b510b0a7e libreoffice-libs-core-3.2.99.3.tar.bz2 -84b3bac50df52c27bbc2da6ec5e84de4 libreoffice-libs-extern-sys-3.2.99.3.tar.bz2 -af28aed3d9f72fce3617841bc516950d libreoffice-libs-extern-3.2.99.3.tar.bz2 -8fc5778204613f10ea2474fc96912aa5 libreoffice-libs-gui-3.2.99.3.tar.bz2 -428c7dc8cc5ed9cefe19eb96fb5ac54b libreoffice-postprocess-3.2.99.3.tar.bz2 -3917e52d0254421a4767985b6540520c libreoffice-sdk-3.2.99.3.tar.bz2 -e57d74b5fb0da6fdc2d0c92e7f4061c9 libreoffice-testing-3.2.99.3.tar.bz2 -1b6b16e561854a0cadfc4d8ff83c95d8 libreoffice-ure-3.2.99.3.tar.bz2 -916e479975f99283d8108bf37e3407b3 libreoffice-writer-3.2.99.3.tar.bz2 +70443d68797b04e6fdfb41a0b3fd6bac libreoffice-artwork-3.3.0.1.tar.bz2 +52450011cf1bd3d1766eff2f3de44c8f libreoffice-base-3.3.0.1.tar.bz2 +7692be15664db00acfbef0dc5c788ca0 libreoffice-bootstrap-3.3.0.1.tar.bz2 +49b39c2ac59c705e2935db20da6e10d2 libreoffice-calc-3.3.0.1.tar.bz2 +f69037884f97f152ab371a100363517a libreoffice-components-3.3.0.1.tar.bz2 +17d7502b0fe9e24e5d61b80f3b4a773c libreoffice-extensions-3.3.0.1.tar.bz2 +7c849bf4fe07b2835d26e8d6d0066f74 libreoffice-extras-3.3.0.1.tar.bz2 +d28a9714ae3cb366cfb8eb82df92c40d libreoffice-filters-3.3.0.1.tar.bz2 +b51831de2f44c49879d2937946fe450a libreoffice-help-3.3.0.1.tar.bz2 +8cc6cde4a9d54b07e7115624f3477625 libreoffice-impress-3.3.0.1.tar.bz2 +6613524cf10aeba7fe80d74403bfc0bf libreoffice-l10n-3.3.0.1.tar.bz2 +53662c62cba6bbc0f73a9d629390f70a libreoffice-libs-core-3.3.0.1.tar.bz2 +ed735b0fc23a010e95d3153d94e28176 libreoffice-libs-extern-3.3.0.1.tar.bz2 +9cb29a01ef0706dc5adbe6960435f248 libreoffice-libs-extern-sys-3.3.0.1.tar.bz2 +7c105962189eb3a0f48279416b717c70 libreoffice-libs-gui-3.3.0.1.tar.bz2 +ccf9556a3736756c4781b2da97022d65 libreoffice-postprocess-3.3.0.1.tar.bz2 +4bb016318032994ca88e5066d942b965 libreoffice-sdk-3.3.0.1.tar.bz2 +2111be322729e14a6447383923d1671a libreoffice-testing-3.3.0.1.tar.bz2 +8c25924e5e9afbc21c4333ab94e854b1 libreoffice-ure-3.3.0.1.tar.bz2 +ccc42fc6875d817297d83e56af74bbe2 libreoffice-writer-3.3.0.1.tar.bz2