diff --git a/.gitignore b/.gitignore index 27e1085..7a262d8 100644 --- a/.gitignore +++ b/.gitignore @@ -110,3 +110,23 @@ /libreoffice-translations-3.4.0.1.tar.bz2 /libreoffice-ure-3.4.0.1.tar.bz2 /libreoffice-writer-3.4.0.1.tar.bz2 +/libreoffice-artwork-3.4.0.2.tar.bz2 +/libreoffice-base-3.4.0.2.tar.bz2 +/libreoffice-bootstrap-3.4.0.2.tar.bz2 +/libreoffice-calc-3.4.0.2.tar.bz2 +/libreoffice-components-3.4.0.2.tar.bz2 +/libreoffice-extensions-3.4.0.2.tar.bz2 +/libreoffice-extras-3.4.0.2.tar.bz2 +/libreoffice-filters-3.4.0.2.tar.bz2 +/libreoffice-help-3.4.0.2.tar.bz2 +/libreoffice-impress-3.4.0.2.tar.bz2 +/libreoffice-libs-core-3.4.0.2.tar.bz2 +/libreoffice-libs-extern-3.4.0.2.tar.bz2 +/libreoffice-libs-extern-sys-3.4.0.2.tar.bz2 +/libreoffice-libs-gui-3.4.0.2.tar.bz2 +/libreoffice-postprocess-3.4.0.2.tar.bz2 +/libreoffice-sdk-3.4.0.2.tar.bz2 +/libreoffice-testing-3.4.0.2.tar.bz2 +/libreoffice-translations-3.4.0.2.tar.bz2 +/libreoffice-ure-3.4.0.2.tar.bz2 +/libreoffice-writer-3.4.0.2.tar.bz2 diff --git a/libreoffice.spec b/libreoffice.spec index 6c799b8..efa61ae 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -14,8 +14,8 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: 3.4.0.1 -Release: 3%{?dist} +Version: 3.4.0.2 +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 @@ -87,8 +87,7 @@ Patch12: 0001-Resolves-rhbz-695509-crash-in-RefreshDocumentLB.patch Patch13: 0001-bubble-down-configure-test-findings-on-visibility.patch Patch14: vbahelper.visibility.patch Patch15: 0001-rhbz-702635-set-correct-page-number-when-exporting-s.patch -Patch16: 0001-fix-build-with-system-bsh.patch -Patch17: 0001-handle-NULL-display-gracefully.patch +Patch16: 0001-handle-NULL-display-gracefully.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define instdir %{_libdir} @@ -705,8 +704,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch13 -p1 -b .bubble-down-configure-test-findings-on-visibility.patch %patch14 -p0 -b .vbahelper.visibility.patch %patch15 -p1 -b .rhbz702635-set-correct-page-number-when-exporting-s.patch -%patch16 -p1 -b .fix-build-with-system-bsh.patch -%patch17 -p1 -b .handle-NULL-display-gracefully.patch +%patch16 -p1 -b .handle-NULL-display-gracefully.patch # these are horribly incomplete--empty translations and copied english # strings with spattering of translated strings @@ -1983,6 +1981,10 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %{basisinstdir}/program/kde-open-url %changelog +* Fri May 27 2011 David Tardon - 3.4.0.2-1 +- 3.4.0 RC2 +- drop integrated 0001-fix-build-with-system-bsh.patch + * Wed May 25 2011 Caolán McNamara - 3.4.0.1-3 - rebuild for new hunspell diff --git a/sources b/sources index fb5bd1c..0f8fac0 100644 --- a/sources +++ b/sources @@ -8,25 +8,25 @@ a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2. ada24d37d8d638b3d8a9985e80bc2978 ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip b4cae0700aa1c2aef7eb7f345365e6f1 b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 fdb27bfe2dbe2e7b57ae194d9bf36bab fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz -61af4cdd4406c03b0534bc683b747865 libreoffice-artwork-3.4.0.1.tar.bz2 -7b821f1d15ebe9ac588e3d69cfe2821e libreoffice-base-3.4.0.1.tar.bz2 -bf3edfa43e97da54a0fd15ec9689c7d3 libreoffice-bootstrap-3.4.0.1.tar.bz2 -239addc6153a915691979748b804cae9 libreoffice-calc-3.4.0.1.tar.bz2 -f23caf17dd85398972dd21761d719641 libreoffice-components-3.4.0.1.tar.bz2 -fe5aff88db2863324f590f34722387b4 libreoffice-extensions-3.4.0.1.tar.bz2 -76f41326f94bb1afb0f2e4a5060d57bb libreoffice-extras-3.4.0.1.tar.bz2 -9ac0f83afe70417a05b8e2915154ae33 libreoffice-filters-3.4.0.1.tar.bz2 -4ad184879b836d26c009191b88f99c49 libreoffice-help-3.4.0.1.tar.bz2 -0ca0c2d8c204e1139d9f2cae3aa6b90a libreoffice-impress-3.4.0.1.tar.bz2 -b8efd2b00b872c6cb04bfc81afae3ba0 libreoffice-libs-core-3.4.0.1.tar.bz2 -e71ac5ccde6611c0657d8aa1d87f6347 libreoffice-libs-extern-3.4.0.1.tar.bz2 -a59950dbedde977f48366965790607ec libreoffice-libs-extern-sys-3.4.0.1.tar.bz2 -18170643d2663c357e58fca05ff5f1b8 libreoffice-libs-gui-3.4.0.1.tar.bz2 +7427ddd5ae63b6ee7aa868201dfbccaa libreoffice-artwork-3.4.0.2.tar.bz2 +a78a8e08731213da02c65060cedc5589 libreoffice-base-3.4.0.2.tar.bz2 +596da255e2728faccc8f2361171270ec libreoffice-bootstrap-3.4.0.2.tar.bz2 +8ed9803a34d13da1764e7523d550d6b0 libreoffice-calc-3.4.0.2.tar.bz2 +9be46d7c4bf3a60ee8dd0a5ef3638f82 libreoffice-components-3.4.0.2.tar.bz2 +b60db802866ab71c485de42e6382d1bb libreoffice-extensions-3.4.0.2.tar.bz2 +09e374cf3bd8f07a043883393012d69b libreoffice-extras-3.4.0.2.tar.bz2 +af9f25aa04dc4ef7b797f7bcc743877c libreoffice-filters-3.4.0.2.tar.bz2 +ad29de786d76d67759f9d2dd574b29be libreoffice-help-3.4.0.2.tar.bz2 +ff13a8ac0ea324122b75773fd80a9245 libreoffice-impress-3.4.0.2.tar.bz2 +6eb8f53e01da7a945ee4cd42b7297732 libreoffice-libs-core-3.4.0.2.tar.bz2 +90df27d4cbf490668ce4f03ff7dba521 libreoffice-libs-extern-3.4.0.2.tar.bz2 +c0ea197183564c49306a1c79ca571e51 libreoffice-libs-extern-sys-3.4.0.2.tar.bz2 +91e69ed3c0be542fa7f69ca3da2d7808 libreoffice-libs-gui-3.4.0.2.tar.bz2 74939c9ea525374776f09bf972ede99f libreoffice-multiliblauncher.sh -2fccd77f4ee706c2bf418eb712795051 libreoffice-postprocess-3.4.0.1.tar.bz2 -5c2420845e7fc6918808eb388f98071a libreoffice-sdk-3.4.0.1.tar.bz2 -486c4d8e2598330a4215620eebfbb6d0 libreoffice-testing-3.4.0.1.tar.bz2 -2a06397389bf2162a4f7f1b5d22309bf libreoffice-translations-3.4.0.1.tar.bz2 -22bfb0efc041523575fc9d296010971a libreoffice-ure-3.4.0.1.tar.bz2 -b5d436367fd7f57b9f22618c9e880ccf libreoffice-writer-3.4.0.1.tar.bz2 -5786ca0be1fbbb76801de235bb4aff50 redhat-langpacks.tar.gz +a81c787b2e5469c2acc9f335b2c9e52f libreoffice-postprocess-3.4.0.2.tar.bz2 +ee1c78af6553657614b1a43adf4750ac libreoffice-sdk-3.4.0.2.tar.bz2 +c970d6212618fc9b34526907eb030ce6 libreoffice-testing-3.4.0.2.tar.bz2 +04d1a5a05aed8d217a5e45ba6759b4be libreoffice-translations-3.4.0.2.tar.bz2 +6d25488c81af09d87015bf487243042f libreoffice-ure-3.4.0.2.tar.bz2 +9a39234a49516b7035309e28dd4f0784 libreoffice-writer-3.4.0.2.tar.bz2 +35c9d670889318e26aad389ed750012f redhat-langpacks.tar.gz