From 4c086c5cb20a36f98db727afe2a4683b59cc2ca10b48b1766c4bf00797d751d1 Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Tue, 2 Jul 2013 13:58:36 +0000 Subject: [PATCH] - update to 4.0.3.3.5 (SUSE 4.0-rc5, tag suse-4.0-5, based on upstream 4.0.3.3) OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=39 --- ...47db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 | 3 -- ...783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz | 3 -- libreoffice-4.0.3.3.4.tar.xz | 3 -- libreoffice-4.0.3.3.5.tar.xz | 3 ++ libreoffice-branding-upstream.changes | 5 ++++ libreoffice-branding-upstream.spec | 2 +- libreoffice-help-4.0.3.3.4.tar.xz | 3 -- libreoffice-help-4.0.3.3.5.tar.xz | 3 ++ libreoffice-help-en-US.changes | 5 ++++ libreoffice-help-en-US.spec | 2 +- libreoffice-help-en-US.spec.in | 2 +- libreoffice-help-group1.changes | 5 ++++ libreoffice-help-group1.spec | 2 +- libreoffice-help-group2.changes | 5 ++++ libreoffice-help-group2.spec | 2 +- libreoffice-help-group3.changes | 5 ++++ libreoffice-help-group3.spec | 2 +- libreoffice-help-group4.changes | 5 ++++ libreoffice-help-group4.spec | 2 +- libreoffice-help-group5.changes | 5 ++++ libreoffice-help-group5.spec | 2 +- libreoffice-help-groupX.spec.in | 2 +- libreoffice-icon-themes.changes | 5 ++++ libreoffice-icon-themes.spec | 2 +- libreoffice-l10n.changes | 5 ++++ libreoffice-l10n.spec | 2 +- libreoffice-l10n.spec.in | 2 +- libreoffice-translations-4.0.3.3.4.tar.xz | 3 -- libreoffice-translations-4.0.3.3.5.tar.xz | 3 ++ libreoffice.changes | 30 +++++++++++++++++++ libreoffice.spec | 7 +---- lo-provides | 5 ++++ lo-requires | 7 ++++- 33 files changed, 108 insertions(+), 34 deletions(-) delete mode 100644 c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 delete mode 100644 f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz delete mode 100644 libreoffice-4.0.3.3.4.tar.xz create mode 100644 libreoffice-4.0.3.3.5.tar.xz delete mode 100644 libreoffice-help-4.0.3.3.4.tar.xz create mode 100644 libreoffice-help-4.0.3.3.5.tar.xz delete mode 100644 libreoffice-translations-4.0.3.3.4.tar.xz create mode 100644 libreoffice-translations-4.0.3.3.5.tar.xz diff --git a/c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 b/c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 deleted file mode 100644 index 3ed660b..0000000 --- a/c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d1bf79329be76103c7d9632a79962178364371807104a10e5f63ae0551731dc -size 468395 diff --git a/f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz b/f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz deleted file mode 100644 index aebc7c9..0000000 --- a/f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41 -size 23558405 diff --git a/libreoffice-4.0.3.3.4.tar.xz b/libreoffice-4.0.3.3.4.tar.xz deleted file mode 100644 index 2684888..0000000 --- a/libreoffice-4.0.3.3.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c04dc63910a1e5fabec1af24088c8774ccc1da1217289db0b8c75305bbd9c6a0 -size 104878816 diff --git a/libreoffice-4.0.3.3.5.tar.xz b/libreoffice-4.0.3.3.5.tar.xz new file mode 100644 index 0000000..a33cfe5 --- /dev/null +++ b/libreoffice-4.0.3.3.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b884dae53e6195c0e7bc546ca8d4a669064e92f34628c0e564198a7ca9a7f610 +size 106460952 diff --git a/libreoffice-branding-upstream.changes b/libreoffice-branding-upstream.changes index 42c9766..81e4d3b 100644 --- a/libreoffice-branding-upstream.changes +++ b/libreoffice-branding-upstream.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 17 17:34:03 UTC 2013 - fridrich.strba@suse.com + +- update to 4.0.3.3.5 (SUSE 4.0-rc5, tag suse-4.0-5, based on upstream 4.0.3.3) + ------------------------------------------------------------------- Fri May 31 15:14:07 UTC 2013 - pmladek@suse.com diff --git a/libreoffice-branding-upstream.spec b/libreoffice-branding-upstream.spec index bb82175..b0dbaaa 100644 --- a/libreoffice-branding-upstream.spec +++ b/libreoffice-branding-upstream.spec @@ -17,7 +17,7 @@ Name: libreoffice-branding-upstream -Version: 4.0.3.3.4 +Version: 4.0.3.3.5 Release: 0 %define lo_home libreoffice Summary: Original Branding for LibreOffice diff --git a/libreoffice-help-4.0.3.3.4.tar.xz b/libreoffice-help-4.0.3.3.4.tar.xz deleted file mode 100644 index 9491ae5..0000000 --- a/libreoffice-help-4.0.3.3.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae5896788ab83e2934eaf74d2961e80f1b2e80c3e14769ae59c6f0e5f99dd392 -size 1855640 diff --git a/libreoffice-help-4.0.3.3.5.tar.xz b/libreoffice-help-4.0.3.3.5.tar.xz new file mode 100644 index 0000000..a6d6188 --- /dev/null +++ b/libreoffice-help-4.0.3.3.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:67c6385d01fe41a212213262c381a30d66f848ba57b6d0bf70255bbb224d42d0 +size 1911556 diff --git a/libreoffice-help-en-US.changes b/libreoffice-help-en-US.changes index 5396a70..956c0a0 100644 --- a/libreoffice-help-en-US.changes +++ b/libreoffice-help-en-US.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 17 17:34:03 UTC 2013 - fridrich.strba@suse.com + +- update to 4.0.3.3.5 (SUSE 4.0-rc5, tag suse-4.0-5, based on upstream 4.0.3.3) + ------------------------------------------------------------------- Fri May 31 15:14:07 UTC 2013 - pmladek@suse.com diff --git a/libreoffice-help-en-US.spec b/libreoffice-help-en-US.spec index ceaad15..8938f61 100644 --- a/libreoffice-help-en-US.spec +++ b/libreoffice-help-en-US.spec @@ -22,7 +22,7 @@ Name: libreoffice-help-en-US ## Generated by: ## perl lo-help-gen-spec libreoffice-help-en-US.spec.in lo-help-en-US ################################################################### -Version: 4.0.3.3.4 +Version: 4.0.3.3.5 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 diff --git a/libreoffice-help-en-US.spec.in b/libreoffice-help-en-US.spec.in index 47c84ac..cac572b 100644 --- a/libreoffice-help-en-US.spec.in +++ b/libreoffice-help-en-US.spec.in @@ -18,7 +18,7 @@ Name: libreoffice-help-en-US @DO_NOT_EDIT_COMMENT@ -Version: 4.0.3.3.4 +Version: 4.0.3.3.5 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 diff --git a/libreoffice-help-group1.changes b/libreoffice-help-group1.changes index 78017bd..23f64b1 100644 --- a/libreoffice-help-group1.changes +++ b/libreoffice-help-group1.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 17 17:34:03 UTC 2013 - fridrich.strba@suse.com + +- update to 4.0.3.3.5 (SUSE 4.0-rc5, tag suse-4.0-5, based on upstream 4.0.3.3) + ------------------------------------------------------------------- Fri May 31 15:14:07 UTC 2013 - pmladek@suse.com diff --git a/libreoffice-help-group1.spec b/libreoffice-help-group1.spec index bcd638e..e65d99b 100644 --- a/libreoffice-help-group1.spec +++ b/libreoffice-help-group1.spec @@ -22,7 +22,7 @@ Name: libreoffice-help-group1 ## Generated by: ## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX ################################################################### -Version: 4.0.3.3.4 +Version: 4.0.3.3.5 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 diff --git a/libreoffice-help-group2.changes b/libreoffice-help-group2.changes index f041700..c38999f 100644 --- a/libreoffice-help-group2.changes +++ b/libreoffice-help-group2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 17 17:34:03 UTC 2013 - fridrich.strba@suse.com + +- update to 4.0.3.3.5 (SUSE 4.0-rc5, tag suse-4.0-5, based on upstream 4.0.3.3) + ------------------------------------------------------------------- Fri May 31 15:14:07 UTC 2013 - pmladek@suse.com diff --git a/libreoffice-help-group2.spec b/libreoffice-help-group2.spec index bbef4b7..d1337eb 100644 --- a/libreoffice-help-group2.spec +++ b/libreoffice-help-group2.spec @@ -22,7 +22,7 @@ Name: libreoffice-help-group2 ## Generated by: ## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX ################################################################### -Version: 4.0.3.3.4 +Version: 4.0.3.3.5 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 diff --git a/libreoffice-help-group3.changes b/libreoffice-help-group3.changes index d27d1ed..d493364 100644 --- a/libreoffice-help-group3.changes +++ b/libreoffice-help-group3.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 17 17:34:03 UTC 2013 - fridrich.strba@suse.com + +- update to 4.0.3.3.5 (SUSE 4.0-rc5, tag suse-4.0-5, based on upstream 4.0.3.3) + ------------------------------------------------------------------- Fri May 31 15:14:07 UTC 2013 - pmladek@suse.com diff --git a/libreoffice-help-group3.spec b/libreoffice-help-group3.spec index 5891ee0..9840d6c 100644 --- a/libreoffice-help-group3.spec +++ b/libreoffice-help-group3.spec @@ -22,7 +22,7 @@ Name: libreoffice-help-group3 ## Generated by: ## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX ################################################################### -Version: 4.0.3.3.4 +Version: 4.0.3.3.5 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 diff --git a/libreoffice-help-group4.changes b/libreoffice-help-group4.changes index 449c120..42af5e8 100644 --- a/libreoffice-help-group4.changes +++ b/libreoffice-help-group4.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 17 17:34:03 UTC 2013 - fridrich.strba@suse.com + +- update to 4.0.3.3.5 (SUSE 4.0-rc5, tag suse-4.0-5, based on upstream 4.0.3.3) + ------------------------------------------------------------------- Fri May 31 15:14:07 UTC 2013 - pmladek@suse.com diff --git a/libreoffice-help-group4.spec b/libreoffice-help-group4.spec index 313b7f4..ce4953c 100644 --- a/libreoffice-help-group4.spec +++ b/libreoffice-help-group4.spec @@ -22,7 +22,7 @@ Name: libreoffice-help-group4 ## Generated by: ## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX ################################################################### -Version: 4.0.3.3.4 +Version: 4.0.3.3.5 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 diff --git a/libreoffice-help-group5.changes b/libreoffice-help-group5.changes index 6f472aa..e716fb3 100644 --- a/libreoffice-help-group5.changes +++ b/libreoffice-help-group5.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 17 17:34:03 UTC 2013 - fridrich.strba@suse.com + +- update to 4.0.3.3.5 (SUSE 4.0-rc5, tag suse-4.0-5, based on upstream 4.0.3.3) + ------------------------------------------------------------------- Fri May 31 15:14:07 UTC 2013 - pmladek@suse.com diff --git a/libreoffice-help-group5.spec b/libreoffice-help-group5.spec index 70f381b..b2df35f 100644 --- a/libreoffice-help-group5.spec +++ b/libreoffice-help-group5.spec @@ -22,7 +22,7 @@ Name: libreoffice-help-group5 ## Generated by: ## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX ################################################################### -Version: 4.0.3.3.4 +Version: 4.0.3.3.5 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 diff --git a/libreoffice-help-groupX.spec.in b/libreoffice-help-groupX.spec.in index be1a405..af266a3 100644 --- a/libreoffice-help-groupX.spec.in +++ b/libreoffice-help-groupX.spec.in @@ -18,7 +18,7 @@ Name: libreoffice-help-group@GROUP_NUMBER@ @DO_NOT_EDIT_COMMENT@ -Version: 4.0.3.3.4 +Version: 4.0.3.3.5 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 diff --git a/libreoffice-icon-themes.changes b/libreoffice-icon-themes.changes index 5f2ca17..5837131 100644 --- a/libreoffice-icon-themes.changes +++ b/libreoffice-icon-themes.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 17 17:34:03 UTC 2013 - fridrich.strba@suse.com + +- update to 4.0.3.3.5 (SUSE 4.0-rc5, tag suse-4.0-5, based on upstream 4.0.3.3) + ------------------------------------------------------------------- Fri May 31 15:14:07 UTC 2013 - pmladek@suse.com diff --git a/libreoffice-icon-themes.spec b/libreoffice-icon-themes.spec index 6ada2e9..8407e1b 100644 --- a/libreoffice-icon-themes.spec +++ b/libreoffice-icon-themes.spec @@ -17,7 +17,7 @@ Name: libreoffice-icon-themes -Version: 4.0.3.3.4 +Version: 4.0.3.3.5 Release: 0 %define ooo_home libreoffice BuildRequires: libreoffice-icon-themes-prebuilt = %version diff --git a/libreoffice-l10n.changes b/libreoffice-l10n.changes index 70553cf..dab76e3 100644 --- a/libreoffice-l10n.changes +++ b/libreoffice-l10n.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 17 17:34:03 UTC 2013 - fridrich.strba@suse.com + +- update to 4.0.3.3.5 (SUSE 4.0-rc5, tag suse-4.0-5, based on upstream 4.0.3.3) + ------------------------------------------------------------------- Fri May 31 15:14:07 UTC 2013 - pmladek@suse.com diff --git a/libreoffice-l10n.spec b/libreoffice-l10n.spec index 2758764..4af6e5f 100644 --- a/libreoffice-l10n.spec +++ b/libreoffice-l10n.spec @@ -22,7 +22,7 @@ ## perl lo-l10n-gen-spec libreoffice-l10n.spec.in lo-l10n-data ################################################################### Name: libreoffice-l10n -Version: 4.0.3.3.4 +Version: 4.0.3.3.5 Release: 0 %define piece l10n %define ooo_home libreoffice diff --git a/libreoffice-l10n.spec.in b/libreoffice-l10n.spec.in index 5596e03..d146ad6 100644 --- a/libreoffice-l10n.spec.in +++ b/libreoffice-l10n.spec.in @@ -18,7 +18,7 @@ @DO_NOT_EDIT_COMMENT@ Name: libreoffice-l10n -Version: 4.0.3.3.4 +Version: 4.0.3.3.5 Release: 0 %define piece l10n %define ooo_home libreoffice diff --git a/libreoffice-translations-4.0.3.3.4.tar.xz b/libreoffice-translations-4.0.3.3.4.tar.xz deleted file mode 100644 index 1c70ae1..0000000 --- a/libreoffice-translations-4.0.3.3.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f58d6d92312c2d31d6a156279dcdbda16b34a3d20eeeb744d92e99d612a22e1b -size 128412940 diff --git a/libreoffice-translations-4.0.3.3.5.tar.xz b/libreoffice-translations-4.0.3.3.5.tar.xz new file mode 100644 index 0000000..8bfbca4 --- /dev/null +++ b/libreoffice-translations-4.0.3.3.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e441ac7adab90545f837ceb3e5afc403e31f60de069b7eced729c20be9956da +size 129284168 diff --git a/libreoffice.changes b/libreoffice.changes index c27eef2..5ae918d 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Tue Jul 2 13:26:21 UTC 2013 - pmladek@suse.com + +- remove the internal libicudata.so, libicui18n.so, libicule.so, + libicuuc.so, and liblcms2.so libraries from provides and requires; + they are not in the system paths and cause dependency problems for + other packages (bnc#823111) + +------------------------------------------------------------------- +Mon Jun 17 17:34:03 UTC 2013 - fridrich.strba@suse.com + +- update to 4.0.3.3.5 (SUSE 4.0-rc5, tag suse-4.0-5, based on upstream 4.0.3.3) + * cairo canvas fixes + * fix emfplus windows build. + * EmfFillPie fix. (fdo#65502) + * EMF: avoid ambiguity in debug output. + * fixup alpha bitmap generation for Windows + * improved label overlap detection. (bnc#816939) + * transform the clipping polygon before using it + * improved label overlap detection (bnc#816939) + * sw: word completion: do not add trailing '.' (fdo#61923) + * fixed libcmis handling of related multipart content types + * avoid setting user time on unrealized windows. (fdo#56583) + * don't display the "broken OLE link" icon except on Windows + * fixed import of custom shapes from PPT. (i#119872, bnc#823049) + * don't hide cell content behind pivot table buttons, (fdo#60877) + * ignore exceptions from checking with the update service. (fdo#64962) +- use the system cairo and pixman again on SLED11; the problems with alpha + channel handling were fixed (bnc#818291) + ------------------------------------------------------------------- Fri May 31 15:14:07 UTC 2013 - pmladek@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 0f280ce..0a6be75 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -202,7 +202,7 @@ BuildRequires: python-lxml %define ct2n_version 1.3.2 %define gdocs_version 3.0.1 %define numbertext_version 0.9.5 -Version: 4.0.3.3.4 +Version: 4.0.3.3.5 Release: 0 Requires: libreoffice-branding >= 4.0 Requires: libreoffice-icon-themes = %version @@ -576,10 +576,6 @@ Source1048: libmspub-0.0.6.tar.bz2 Source1049: 8755aac23317494a9028569374dc87b2-liborcus_0.3.0.tar.bz2 Source1050: 7c53f83e0327343f4060c0eb83842daf-icu4c-49_1_1-src.tgz Source1051: fc188d2ed5c2cbcf7a021b34b9f88478-icudt49l-subset.zip -# sigh, the old system cairo and pixman have problems with alpha channel handling on SLED11 (bnc#818291) -# the fix and maintenance would cost a lot, so it looks more effective and safe to use the internal cairo and pixman -Source1052: f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz -Source1053: c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 # search application icons in /usr/share # FIXME: search both lib and lib64 and push into git Patch2: split-icons-search-usr-share.diff @@ -1443,7 +1439,6 @@ sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" solenv/src/version.c --with-system-libs \ %if 0%{?suse_version} <= 01110 --without-system-postgresql \ - --without-system-cairo \ %endif %if 0%{?suse_version} <= 01130 --without-system-lcms2 \ diff --git a/lo-provides b/lo-provides index e809d6c..3f7b00f 100644 --- a/lo-provides +++ b/lo-provides @@ -1,3 +1,8 @@ # hide some private libraries from provides grep -v -e libmysqlcppconn.so \ + -e libicudata.so \ + -e libicui18n.so \ + -e libicule.so \ + -e libicuuc.so \ + -e liblcms2.so \ | /usr/lib/rpm/find-provides “$@” diff --git a/lo-requires b/lo-requires index abc11a9..85310a5 100644 --- a/lo-requires +++ b/lo-requires @@ -1,3 +1,8 @@ # do not require some internal libraries /usr/lib/rpm/find-requires “$@” | \ -grep -v -e libmysqlcppconn.so +grep -v -e libmysqlcppconn.so \ + -e libicudata.so \ + -e libicui18n.so \ + -e libicule.so \ + -e libicuuc.so \ + -e liblcms2.so