diff --git a/.gitignore b/.gitignore index c668617..b1f9e69 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,24 @@ /libreoffice-filters-3.4.2.3.tar.bz2 /libreoffice-help-3.4.2.3.tar.bz2 /libreoffice-impress-3.4.2.3.tar.bz2 +/libreoffice-artwork-3.4.3.1.tar.bz2 +/libreoffice-base-3.4.3.1.tar.bz2 +/libreoffice-libs-core-3.4.3.1.tar.bz2 +/libreoffice-libs-extern-3.4.3.1.tar.bz2 +/libreoffice-libs-extern-sys-3.4.3.1.tar.bz2 +/libreoffice-libs-gui-3.4.3.1.tar.bz2 +/libreoffice-postprocess-3.4.3.1.tar.bz2 +/libreoffice-sdk-3.4.3.1.tar.bz2 +/libreoffice-testing-3.4.3.1.tar.bz2 +/libreoffice-ure-3.4.3.1.tar.bz2 +/libreoffice-writer-3.4.3.1.tar.bz2 +/libreoffice-translations-3.4.3.1.tar.bz2 +/libreoffice-bootstrap-3.4.3.1.tar.bz2 +/libreoffice-multiliblauncher.sh +/libreoffice-calc-3.4.3.1.tar.bz2 +/libreoffice-components-3.4.3.1.tar.bz2 +/libreoffice-extensions-3.4.3.1.tar.bz2 +/libreoffice-extras-3.4.3.1.tar.bz2 +/libreoffice-filters-3.4.3.1.tar.bz2 +/libreoffice-help-3.4.3.1.tar.bz2 +/libreoffice-impress-3.4.3.1.tar.bz2 diff --git a/libreoffice.spec b/libreoffice.spec index b44b9da..6d708b7 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -26,8 +26,8 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: 3.4.2.3 -Release: 3%{?dist} +Version: 3.4.3.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 @@ -117,9 +117,8 @@ Patch22: 0001-Related-rhbz-718976-crash-in-SwTxtSizeInfo-GetMultiC.patch Patch23: libreoffice-poppler-0.17.0.patch Patch24: 0001-Resolves-rhbz-715549-use-fontconfig-s-detected-forma.patch Patch25: 0001-this-is-definitely-not-present-in-qt-4.8.0-beta1.patch -Patch26: 0001-Resolves-rhbz-725144-wrong-csh-syntax.patch -Patch27: 0001-Resolves-rhbz-693265-fix-crash-from-unhandled-except.patch -Patch28: 0001-Related-rhbz-730225-avoid-segv-in-ld-this-was-set-to.patch +Patch26: 0001-Resolves-rhbz-693265-fix-crash-from-unhandled-except.patch +Patch27: 0001-Related-rhbz-730225-avoid-segv-in-ld-this-was-set-to.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define instdir %{_libdir} @@ -747,9 +746,8 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch23 -p1 -b .poppler-0.17.0.patch %patch24 -p1 -b .rhbz715549-use-fontconfig-s-detected-forma.patch %patch25 -p1 -b .this-is-definitely-not-present-in-qt-4.8.0-beta1.patch -%patch26 -p1 -b .rhbz725144-wrong-csh-syntax.patch -%patch27 -p1 -b .rhbz693265-fix-crash-from-unhandled-except.patch -%patch28 -p1 -b .rhbz730225-avoid-segv-in-ld-this-was-set-to.patch +%patch26 -p1 -b .rhbz693265-fix-crash-from-unhandled-except.patch +%patch27 -p1 -b .rhbz730225-avoid-segv-in-ld-this-was-set-to.patch # these are horribly incomplete--empty translations and copied english # strings with spattering of translated strings @@ -2034,6 +2032,10 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %{basisinstdir}/program/kde-open-url %changelog +* Tue Aug 16 2011 David Tardon - 3.4.3.1-1 +- 3.4.3 rc1 +- drop integrated 0001-Resolves-rhbz-725144-wrong-csh-syntax.patch + * Fri Aug 12 2011 Caolán McNamara - 3.4.2.3-3 - Related: rhbz#730225 avoid segv in ld diff --git a/sources b/sources index 15a9e1f..988a2b0 100644 --- a/sources +++ b/sources @@ -1,16 +1,16 @@ -1600ebf998ec7075bd0e96e7a49513dc libreoffice-artwork-3.4.2.3.tar.bz2 -0e12b4a03d14645dac1f073eb2f67423 libreoffice-base-3.4.2.3.tar.bz2 -bd2027fc2160798728e49d0fd331d163 libreoffice-libs-core-3.4.2.3.tar.bz2 -9a948012496fcd27c31f755314ff98e3 libreoffice-libs-extern-3.4.2.3.tar.bz2 -a5a8d9080492968eef001314093cd82d libreoffice-libs-extern-sys-3.4.2.3.tar.bz2 -810aa9e69b96af0f4de2e6d74b7b1847 libreoffice-libs-gui-3.4.2.3.tar.bz2 -45de04dcbb6f6ff7474110ee982da7b8 libreoffice-postprocess-3.4.2.3.tar.bz2 -545d65e92b674d354dd6511ee552d23f libreoffice-sdk-3.4.2.3.tar.bz2 -99e306957e38ce5e68deed9568874be6 libreoffice-testing-3.4.2.3.tar.bz2 -2e7277588ef610b7a06953c59dc77c9b libreoffice-ure-3.4.2.3.tar.bz2 -281973e517d3b5626f5eedd746378fcc libreoffice-writer-3.4.2.3.tar.bz2 -3e5bff19d7aa5478b7330bd608a2daf2 libreoffice-translations-3.4.2.3.tar.bz2 -f106511220a2a0b2a45571cf7605953a libreoffice-bootstrap-3.4.2.3.tar.bz2 +6f3ba9fccf42ace5ca51e4766ba7be3d libreoffice-artwork-3.4.3.1.tar.bz2 +41428447cc5b7751038389be75c97a55 libreoffice-base-3.4.3.1.tar.bz2 +45844c201b64682c154f2776cdaee5f7 libreoffice-libs-core-3.4.3.1.tar.bz2 +32fb19a28d9c5e0d4ae0068875e811ab libreoffice-libs-extern-3.4.3.1.tar.bz2 +05ad2aea9167dcb1bab2c46b5e563abd libreoffice-libs-extern-sys-3.4.3.1.tar.bz2 +4b991cf9b4a5a4ebb3ae268c8aa28cfd libreoffice-libs-gui-3.4.3.1.tar.bz2 +015d004c73d149d4cca8bf658d75c20e libreoffice-postprocess-3.4.3.1.tar.bz2 +6088b104881171b3775e5e3fb39adbca libreoffice-sdk-3.4.3.1.tar.bz2 +b09b89c34d25c5bfd6a592205cd95f83 libreoffice-testing-3.4.3.1.tar.bz2 +274048864e8a1b606e6cab9fd1aaf2c8 libreoffice-ure-3.4.3.1.tar.bz2 +b84620672dff6f22edca0266c4de0359 libreoffice-writer-3.4.3.1.tar.bz2 +569295821cdd482a11dc8e9f9f094a76 libreoffice-translations-3.4.3.1.tar.bz2 +91075b6f34215e0318dcfa9d64c8111b libreoffice-bootstrap-3.4.3.1.tar.bz2 185d60944ea767075d27247c3162b3bc 185d60944ea767075d27247c3162b3bc-unowinreg.dll 03c019658ec49050c8103ba0f10b5067 redhat-langpacks.tar.gz 74939c9ea525374776f09bf972ede99f libreoffice-multiliblauncher.sh @@ -21,12 +21,12 @@ a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2. 35c94d2df8893241173de1d16b6034c0 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ada24d37d8d638b3d8a9985e80bc2978 ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip 18f577b374d60b3c760a3a3350407632 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz -20854b5961b8b0b38219376a93ecf362 libreoffice-calc-3.4.2.3.tar.bz2 +fdb98f710d000b12fcc3449752798191 libreoffice-calc-3.4.3.1.tar.bz2 17410483b5b5f267aa18b7e00b65e6e0 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip b4cae0700aa1c2aef7eb7f345365e6f1 b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 -5799be1571289b7c17bd8fd2020c00f6 libreoffice-components-3.4.2.3.tar.bz2 -75ca9da214abe072e37fb4d19fc2c34f libreoffice-extensions-3.4.2.3.tar.bz2 -73aa766053ea8f4c84dd0a76c0888f18 libreoffice-extras-3.4.2.3.tar.bz2 -4416cc18cfa84f61eae905ff441a18d0 libreoffice-filters-3.4.2.3.tar.bz2 -ecfd57a3dfd0ce230e5837b5099a0d5a libreoffice-help-3.4.2.3.tar.bz2 -40e23531e95617c7fe91e7025f007a91 libreoffice-impress-3.4.2.3.tar.bz2 +d0cb5f73a63b102400c93fe5049bc978 libreoffice-components-3.4.3.1.tar.bz2 +bcdb25b77d4321ef3681fc403b4276ad libreoffice-extensions-3.4.3.1.tar.bz2 +3d9e96e513a3cd57a86f08b9846123fb libreoffice-extras-3.4.3.1.tar.bz2 +3c37ed0f57a5f7f593bbf81af7f79697 libreoffice-filters-3.4.3.1.tar.bz2 +775f247adadc8a31d436bde4ec1070a1 libreoffice-help-3.4.3.1.tar.bz2 +9d202ce3af5cf78544ac9e34fefcbb35 libreoffice-impress-3.4.3.1.tar.bz2