3.4.2 rc2

14 years ago · f8c1b47685
parent da058f67ba
commit f8c1b47685
5 changed files with 50 additions and 26 deletions
--- a/.gitignore
+++ b/.gitignore
@ -70,3 +70,23 @@
 /libreoffice-filters-3.4.2.1.tar.bz2
 /libreoffice-help-3.4.2.1.tar.bz2
 /libreoffice-impress-3.4.2.1.tar.bz2
+/libreoffice-artwork-3.4.2.2.tar.bz2
+/libreoffice-base-3.4.2.2.tar.bz2
+/libreoffice-libs-core-3.4.2.2.tar.bz2
+/libreoffice-libs-extern-3.4.2.2.tar.bz2
+/libreoffice-libs-extern-sys-3.4.2.2.tar.bz2
+/libreoffice-libs-gui-3.4.2.2.tar.bz2
+/libreoffice-postprocess-3.4.2.2.tar.bz2
+/libreoffice-sdk-3.4.2.2.tar.bz2
+/libreoffice-testing-3.4.2.2.tar.bz2
+/libreoffice-ure-3.4.2.2.tar.bz2
+/libreoffice-writer-3.4.2.2.tar.bz2
+/libreoffice-translations-3.4.2.2.tar.bz2
+/libreoffice-bootstrap-3.4.2.2.tar.bz2
+/libreoffice-calc-3.4.2.2.tar.bz2
+/libreoffice-components-3.4.2.2.tar.bz2
+/libreoffice-extensions-3.4.2.2.tar.bz2
+/libreoffice-extras-3.4.2.2.tar.bz2
+/libreoffice-filters-3.4.2.2.tar.bz2
+/libreoffice-help-3.4.2.2.tar.bz2
+/libreoffice-impress-3.4.2.2.tar.bz2
--- a/0001-Resolves-rhbz-715549-use-fontconfig-s-detected-forma.patch
+++ b/0001-Resolves-rhbz-715549-use-fontconfig-s-detected-forma.patch
@ -34,9 +34,9 @@ index e4b2f00..5e97bec 100644
 +    #ifndef FC_FONTFORMAT
 +        #define FC_FONTFORMAT "fontformat"
 +    #endif
- #else
-     typedef void FcConfig;
-     typedef void FcObjectSet;
+     #ifndef FC_EMBOLDEN
+         #define FC_EMBOLDEN "embolden"
+     #endif
@@ -697,6 +700,7 @@
             FcChar8* file = NULL;
             FcChar8* family = NULL;
--- a/0001-handle-NULL-display-gracefully.patch
+++ b/0001-handle-NULL-display-gracefully.patch
@ -21,13 +21,14 @@ index a8a87b0..dc88343 100755
     // sanity
     if ( progress < 0 )
         progress = 0;
-@@ -604,7 +607,8 @@ void splash_draw_progress( int progress )
+@@ -604,8 +607,9 @@ void splash_draw_progress( int progress )
 // Close the window & cleanup
 void splash_close_window()
 {
 -    XCloseDisplay( display );
 +    if (display)
 +        XCloseDisplay( display );
+     display = NULL;
 #ifdef USE_LIBPNG
     png_destroy_read_struct( &png_ptr, &info_ptr, NULL );
 #else
--- a/libreoffice.spec
+++ b/libreoffice.spec
@ -26,8 +26,8 @@
 Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
-Version:        3.4.2.1
-Release:        3%{?dist}
+Version:        3.4.2.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
@ -2026,6 +2026,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %{basisinstdir}/program/kde-open-url

 %changelog
+* Wed Jul 20 2011 David Tardon <dtardon@redhat.com> - 3.4.2.2-1
+- 3.4.2 rc2
+
 * Tue Jul 19 2011 Caolán McNamara <caolanm@redhat.com> - 3.4.2.1-3
 - Resolves: rhbz#715549 use fontconfig's detected format

--- a/40
+++ b/40
@ -1,16 +1,16 @@
-5829f1003eb730948327142137057815  libreoffice-artwork-3.4.2.1.tar.bz2
-ec893aac2b46eadd0d651fbefb0e8c75  libreoffice-base-3.4.2.1.tar.bz2
-1c342f6f1227b60a3eabb7c958a62076  libreoffice-libs-core-3.4.2.1.tar.bz2
-ca88faadcb450a4f7569f5e211b7ab34  libreoffice-libs-extern-3.4.2.1.tar.bz2
-74f4c9c7576b819e080223d961fb367b  libreoffice-libs-extern-sys-3.4.2.1.tar.bz2
-f988b40bf3328bfc0d2102bf90decc35  libreoffice-libs-gui-3.4.2.1.tar.bz2
-9910fb6d20e49461ec75a0c0443ec91e  libreoffice-postprocess-3.4.2.1.tar.bz2
-7a848a8ede3d6e49a314c99bbd187444  libreoffice-sdk-3.4.2.1.tar.bz2
-054127e979d7d24736bc644a12272e28  libreoffice-testing-3.4.2.1.tar.bz2
-47f9342e31f667e9bd7e319704494306  libreoffice-ure-3.4.2.1.tar.bz2
-62d28c0dfd1d59e5164b467d213797b9  libreoffice-writer-3.4.2.1.tar.bz2
-bbf6fb09fe58a9375ec507b0d3c156f3  libreoffice-translations-3.4.2.1.tar.bz2
-9e8c507689262f7e04f693fddcf48dfd  libreoffice-bootstrap-3.4.2.1.tar.bz2
+65371f11bcd48b5d4aed68c429784747  libreoffice-artwork-3.4.2.2.tar.bz2
+566b7a01605517acd3d0e302614ce22d  libreoffice-base-3.4.2.2.tar.bz2
+c802f43a5a099106b2833d27fb0e1324  libreoffice-libs-core-3.4.2.2.tar.bz2
+b1306ffbd5aafa2ff3e03ce4932b33d7  libreoffice-libs-extern-3.4.2.2.tar.bz2
+439816b03287e0c4b3c3175f2bf9bcee  libreoffice-libs-extern-sys-3.4.2.2.tar.bz2
+61f45fe2c82439543fc5b39ce9868c77  libreoffice-libs-gui-3.4.2.2.tar.bz2
+3b0c3300c90f50983042de7d704078eb  libreoffice-postprocess-3.4.2.2.tar.bz2
+01f0f8ae20201eb08889ebd14a14af79  libreoffice-sdk-3.4.2.2.tar.bz2
+95245eb754a75a4912ceaeaf9b69a00c  libreoffice-testing-3.4.2.2.tar.bz2
+4af50ce86fd2ad3eca30ef2e93c59988  libreoffice-ure-3.4.2.2.tar.bz2
+eaa63fc295b57c834db1b839d215027c  libreoffice-writer-3.4.2.2.tar.bz2
+1f23836308640685053117fe4e6de0b3  libreoffice-translations-3.4.2.2.tar.bz2
+4becc4d081d59a68355cadf8a2dbfd38  libreoffice-bootstrap-3.4.2.2.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
-01d8637c1c988e5cebe1ce3cf1afbf18  libreoffice-calc-3.4.2.1.tar.bz2
+a426818aee9927d09e26d951594e2d2b  libreoffice-calc-3.4.2.2.tar.bz2
 17410483b5b5f267aa18b7e00b65e6e0  17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 b4cae0700aa1c2aef7eb7f345365e6f1  b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
-9c8eb8b34476bcdbbb1d37fb84bb0d6a  libreoffice-components-3.4.2.1.tar.bz2
-ceb863b121cbe56298bc77de64627254  libreoffice-extensions-3.4.2.1.tar.bz2
-9f71f3a23e690acc9d0f4685ef52b829  libreoffice-extras-3.4.2.1.tar.bz2
-797205de3db3ab1e3ff84bb875152823  libreoffice-filters-3.4.2.1.tar.bz2
-e8e72b2d22e8f504d8d8d163e90422f8  libreoffice-help-3.4.2.1.tar.bz2
-1ee6032abbc2de86c0d0822dc2c210a4  libreoffice-impress-3.4.2.1.tar.bz2
+609633d4b6c94b14c53f28a7cdf822e5  libreoffice-components-3.4.2.2.tar.bz2
+31d9f27c33fd60764941a80715aaedde  libreoffice-extensions-3.4.2.2.tar.bz2
+86a3cb09af51802ce1856db7cd9977cc  libreoffice-extras-3.4.2.2.tar.bz2
+8296feb6f6583b7247ef0345e2ac0e8e  libreoffice-filters-3.4.2.2.tar.bz2
+610661f26b8997b858dec836cb6b638d  libreoffice-help-3.4.2.2.tar.bz2
+2aa17ecc635f94e647c487ca826431ac  libreoffice-impress-3.4.2.2.tar.bz2