diff --git a/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 b/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 deleted file mode 100644 index 7e7b9ea..0000000 --- a/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a19205ac076973b55d9c5d3c8b664735d5b89fe793629ec10c110caa98e0bc1d -size 92050 diff --git a/3c0037fb07dea2f0bbae8386fa7c6a9a-libcdr-0.0.9.tar.bz2 b/3c0037fb07dea2f0bbae8386fa7c6a9a-libcdr-0.0.9.tar.bz2 new file mode 100644 index 0000000..4bb5df8 --- /dev/null +++ b/3c0037fb07dea2f0bbae8386fa7c6a9a-libcdr-0.0.9.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7394e8a88cbe70195b8111b8bcd42080825a8a4d7a61d613af6416dcbbfef760 +size 682455 diff --git a/9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2 b/9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2 new file mode 100644 index 0000000..524ab36 --- /dev/null +++ b/9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4381b38db6ee807090c6f352d62575ea8ce9768701ad95f01afbcda497e69960 +size 128115 diff --git a/ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2 b/ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2 deleted file mode 100644 index 5ce0781..0000000 --- a/ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7b6695513660bd4a08d3fccbc5ad7152f30fe08f6cf365cf4561c757d0201152 -size 652066 diff --git a/libreoffice-binfilter-3.6.2.2.1.tar.bz2 b/libreoffice-binfilter-3.6.2.2.1.tar.bz2 deleted file mode 100644 index 9ab35ec..0000000 --- a/libreoffice-binfilter-3.6.2.2.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b2f9512a08afcb8d98caa3ffdde9dbe5bdd35f914a387cb0017eb5d6f1daefdb -size 6440847 diff --git a/libreoffice-binfilter-3.6.3.2.2.tar.bz2 b/libreoffice-binfilter-3.6.3.2.2.tar.bz2 new file mode 100644 index 0000000..63f5d99 --- /dev/null +++ b/libreoffice-binfilter-3.6.3.2.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:026184ebf296bf26a82f96ccae326fe140a3ac16360f2fedf7fc7c93fa7f3611 +size 6440344 diff --git a/libreoffice-branding-upstream.changes b/libreoffice-branding-upstream.changes index d6ddbe8..9f8ea43 100644 --- a/libreoffice-branding-upstream.changes +++ b/libreoffice-branding-upstream.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com + +- update to 3.6.3.2.2 (SUSE 3.6-rc2, tag suse-3.6-2, based on upstream 3.6.3.2) +- flat_logo.svg has to be branded as well + ------------------------------------------------------------------- Tue Oct 30 11:58:44 UTC 2012 - pmladek@suse.com diff --git a/libreoffice-branding-upstream.spec b/libreoffice-branding-upstream.spec index ff7f8dd..8df8379 100644 --- a/libreoffice-branding-upstream.spec +++ b/libreoffice-branding-upstream.spec @@ -17,7 +17,7 @@ Name: libreoffice-branding-upstream -Version: 3.6.2.2.1 +Version: 3.6.3.2.2 Release: 0 %define lo_home libreoffice Summary: Original Branding for LibreOffice @@ -79,6 +79,7 @@ install -m 644 $RPM_SOURCE_DIR/sofficerc-upstream \ $RPM_BUILD_ROOT%_datadir/%lo_home/program/sofficerc # pictures for pict in intro.png \ + flat_logo.svg \ shell/about.svg \ shell/backing_left.png \ shell/backing_right.png \ diff --git a/libreoffice-core-3.6.2.2.1.tar.bz2 b/libreoffice-core-3.6.2.2.1.tar.bz2 deleted file mode 100644 index 06221eb..0000000 --- a/libreoffice-core-3.6.2.2.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ab1e3106e0319d47bb9d88f57b7b502f2f2e492685f067c40d609fe7df400f49 -size 132905404 diff --git a/libreoffice-core-3.6.3.2.2.tar.bz2 b/libreoffice-core-3.6.3.2.2.tar.bz2 new file mode 100644 index 0000000..b930ccd --- /dev/null +++ b/libreoffice-core-3.6.3.2.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:70ad8ed01655f491754ef62b7b1889b36ffab2f9965020592ffb3cb30a5a7428 +size 132919373 diff --git a/libreoffice-help-3.6.2.2.1.tar.bz2 b/libreoffice-help-3.6.2.2.1.tar.bz2 deleted file mode 100644 index 8fadd51..0000000 --- a/libreoffice-help-3.6.2.2.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7aaa77a89e3d073291b395dacd73353b6cce92ee5983a317ac41f637f4e71727 -size 1883286 diff --git a/libreoffice-help-3.6.3.2.2.tar.bz2 b/libreoffice-help-3.6.3.2.2.tar.bz2 new file mode 100644 index 0000000..a20de71 --- /dev/null +++ b/libreoffice-help-3.6.3.2.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c6d1a8f47dc7b2771b838fd98cd7432337e37da310c36da64776aad44de65ee9 +size 1884056 diff --git a/libreoffice-help-en-US.changes b/libreoffice-help-en-US.changes index 756f113..651c627 100644 --- a/libreoffice-help-en-US.changes +++ b/libreoffice-help-en-US.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com + +- update to 3.6.3.2.2 (SUSE 3.6-rc2, tag suse-3.6-2, based on upstream 3.6.3.2) + ------------------------------------------------------------------- Tue Oct 30 11:58:44 UTC 2012 - pmladek@suse.com diff --git a/libreoffice-help-en-US.spec b/libreoffice-help-en-US.spec index a2f80fd..fe94004 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: 3.6.2.2.1 +Version: 3.6.3.2.2 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 8ee6fbe..4ad9a22 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: 3.6.2.2.1 +Version: 3.6.3.2.2 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 4b93e96..5c81781 100644 --- a/libreoffice-help-group1.changes +++ b/libreoffice-help-group1.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com + +- update to 3.6.3.2.2 (SUSE 3.6-rc2, tag suse-3.6-2, based on upstream 3.6.3.2) + ------------------------------------------------------------------- Tue Oct 30 11:58:44 UTC 2012 - pmladek@suse.com diff --git a/libreoffice-help-group1.spec b/libreoffice-help-group1.spec index 0bd3905..f6ab664 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: 3.6.2.2.1 +Version: 3.6.3.2.2 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 d587e6f..89e66d8 100644 --- a/libreoffice-help-group2.changes +++ b/libreoffice-help-group2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com + +- update to 3.6.3.2.2 (SUSE 3.6-rc2, tag suse-3.6-2, based on upstream 3.6.3.2) + ------------------------------------------------------------------- Tue Oct 30 11:58:44 UTC 2012 - pmladek@suse.com diff --git a/libreoffice-help-group2.spec b/libreoffice-help-group2.spec index 211dd90..2e3e5d8 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: 3.6.2.2.1 +Version: 3.6.3.2.2 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 2767ec1..8ea9b8c 100644 --- a/libreoffice-help-group3.changes +++ b/libreoffice-help-group3.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com + +- update to 3.6.3.2.2 (SUSE 3.6-rc2, tag suse-3.6-2, based on upstream 3.6.3.2) + ------------------------------------------------------------------- Tue Oct 30 11:58:44 UTC 2012 - pmladek@suse.com diff --git a/libreoffice-help-group3.spec b/libreoffice-help-group3.spec index f81ce5e..c6d595a 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: 3.6.2.2.1 +Version: 3.6.3.2.2 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 a93f93e..ee65e30 100644 --- a/libreoffice-help-group4.changes +++ b/libreoffice-help-group4.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com + +- update to 3.6.3.2.2 (SUSE 3.6-rc2, tag suse-3.6-2, based on upstream 3.6.3.2) + ------------------------------------------------------------------- Tue Oct 30 11:58:44 UTC 2012 - pmladek@suse.com diff --git a/libreoffice-help-group4.spec b/libreoffice-help-group4.spec index e85c0ac..e6abf17 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: 3.6.2.2.1 +Version: 3.6.3.2.2 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 254965e..2c85b08 100644 --- a/libreoffice-help-group5.changes +++ b/libreoffice-help-group5.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com + +- update to 3.6.3.2.2 (SUSE 3.6-rc2, tag suse-3.6-2, based on upstream 3.6.3.2) + ------------------------------------------------------------------- Tue Oct 30 11:58:44 UTC 2012 - pmladek@suse.com diff --git a/libreoffice-help-group5.spec b/libreoffice-help-group5.spec index a9fc570..8adf532 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: 3.6.2.2.1 +Version: 3.6.3.2.2 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 c9207a6..a797ad6 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: 3.6.2.2.1 +Version: 3.6.3.2.2 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 ef67d8e..4a29c4f 100644 --- a/libreoffice-icon-themes.changes +++ b/libreoffice-icon-themes.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com + +- update to 3.6.3.2.2 (SUSE 3.6-rc2, tag suse-3.6-2, based on upstream 3.6.3.2) + ------------------------------------------------------------------- Tue Oct 30 11:58:44 UTC 2012 - pmladek@suse.com diff --git a/libreoffice-icon-themes.spec b/libreoffice-icon-themes.spec index 78b496a..2bc7b35 100644 --- a/libreoffice-icon-themes.spec +++ b/libreoffice-icon-themes.spec @@ -17,7 +17,7 @@ Name: libreoffice-icon-themes -Version: 3.6.2.2.1 +Version: 3.6.3.2.2 Release: 0 %define ooo_home libreoffice BuildRequires: libreoffice-icon-themes-prebuilt = %version diff --git a/libreoffice-l10n.changes b/libreoffice-l10n.changes index 9d86404..d35ccfe 100644 --- a/libreoffice-l10n.changes +++ b/libreoffice-l10n.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com + +- update to 3.6.3.2.2 (SUSE 3.6-rc2, tag suse-3.6-2, based on upstream 3.6.3.2) + ------------------------------------------------------------------- Tue Oct 30 11:58:44 UTC 2012 - pmladek@suse.com diff --git a/libreoffice-l10n.spec b/libreoffice-l10n.spec index 6e342da..36cc8ec 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: 3.6.2.2.1 +Version: 3.6.3.2.2 Release: 0 %define piece l10n %define ooo_home libreoffice diff --git a/libreoffice-l10n.spec.in b/libreoffice-l10n.spec.in index ad59e60..6ccc6da 100644 --- a/libreoffice-l10n.spec.in +++ b/libreoffice-l10n.spec.in @@ -18,7 +18,7 @@ @DO_NOT_EDIT_COMMENT@ Name: libreoffice-l10n -Version: 3.6.2.2.1 +Version: 3.6.3.2.2 Release: 0 %define piece l10n %define ooo_home libreoffice diff --git a/libreoffice-poppler-0.17.0-reject-fix.diff b/libreoffice-poppler-0.17.0-reject-fix.diff index a801f69..c81e71b 100644 --- a/libreoffice-poppler-0.17.0-reject-fix.diff +++ b/libreoffice-poppler-0.17.0-reject-fix.diff @@ -2,7 +2,7 @@ Index: configure.in =================================================================== --- configure.in.orig +++ configure.in -@@ -9140,16 +9140,6 @@ if test "x$enable_ext_pdfimport" != "xno +@@ -9157,16 +9157,6 @@ if test "x$enable_ext_pdfimport" != "xno AC_MSG_RESULT([external]) SYSTEM_POPPLER=YES PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 ) @@ -47,11 +47,13 @@ Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx str->reset(); int c; -@@ -501,11 +493,7 @@ void PDFOutDev::endPage() +@@ -501,13 +493,7 @@ void PDFOutDev::endPage() printf("endPage\n"); } --#if POPPLER_CHECK_VERSION(0, 17, 0) +-#if POPPLER_CHECK_VERSION(0, 19, 0) +-void PDFOutDev::processLink(AnnotLink *link) +-#elif POPPLER_CHECK_VERSION(0, 17, 0) -void PDFOutDev::processLink(AnnotLink *link, Catalog *) -#else void PDFOutDev::processLink(Link* link, Catalog*) @@ -78,14 +80,15 @@ Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx #endif namespace pdfi -@@ -201,12 +194,8 @@ namespace pdfi - // virtual void cvtDevToUser(double dx, double dy, double *ux, double *uy); +@@ -202,13 +195,7 @@ namespace pdfi // virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy); -- #if POPPLER_CHECK_VERSION(0, 17, 0) -- virtual void processLink(AnnotLink *link, Catalog *catalog); -- #else //----- link borders +- #if POPPLER_CHECK_VERSION(0, 19, 0) +- virtual void processLink(AnnotLink *link); +- #elif POPPLER_CHECK_VERSION(0, 17, 0) +- virtual void processLink(AnnotLink *link, Catalog *catalog); +- #else virtual void processLink(Link *link, Catalog *catalog); - #endif diff --git a/libreoffice-translations-3.6.2.2.1.tar.bz2 b/libreoffice-translations-3.6.2.2.1.tar.bz2 deleted file mode 100644 index a0360e5..0000000 --- a/libreoffice-translations-3.6.2.2.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:366ede56f28e8fba88f44c7ea2e6cb51a8c500d9dfb43e531daedb69e97cafa6 -size 143375189 diff --git a/libreoffice-translations-3.6.3.2.2.tar.bz2 b/libreoffice-translations-3.6.3.2.2.tar.bz2 new file mode 100644 index 0000000..b3dcba0 --- /dev/null +++ b/libreoffice-translations-3.6.3.2.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:24f5300624589c8a470cbf2164eabecd0843c3a7e1f16dccd56d5e9d6b720427 +size 143492681 diff --git a/libreoffice.changes b/libreoffice.changes index 63749ee..de7c306 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,9 +1,84 @@ +------------------------------------------------------------------- +Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com + +- update to 3.6.3.2.2 (SUSE 3.6-rc2, tag suse-3.6-2, based on upstream 3.6.3.2) + * OOXML color export + * faster sorted cache write-out + * table undo crasher (rh#852128) + * skipped merged cells (fdo#54862) + * some new ADO constants (bnc#787452) + * can't connect ADO source (fdo#53070) + * overflowing left margin (bnc#707779) + * parent style in XLSX import (fdo#55198) + * layout format in DOC export (fdo#54648) + * section break in DOCX import (fdo#52208) + * correct hex color conversion (fdo#55800) + * column width in DOCX import (bnc#785767) + * table spacing in DOCX import (bnc#778836) + * table position in DOCX import (bnc#780645) + * allow adding external templates (bnc#782597) + * broken time field in page header (fdo#53531) + * crash on switching to outline view (rh#855972) + * wrong conversion factor for "tspm" (fdo#55367) + * text rotation handling (bnc#773048, bnc#783433) + * crash when deleting last table cell (rh#689053) + * column has no Catalog/Schema/Table name crasher + * upside down text box in PPTX import (bnc#757387) + * work with empty TrustedAuthor entries (fdo#55019) + * hard coded sheet limit in XLSX import (rh#864858) + * faster updating of row flags in pivot table cache + * slide fragment handling in DOCX import (bnc#785727) + * subscript/superscript with autofit text (fdo#55931) + * more intuitive editing of relative refs (fdo#54940) + * do not double-expand bootstrap variables (fdo#55138) + * add back compatible Hungarian date format acceptance + * cell notes upon cell insertion / deletion (fdo#55885) + * import values and formulas from lotus-123 (fdo#55066) + * default table cell margins in DOCX export (bnc#780645) + * chart complex category placement (fdo#44832, fdo#55297) + * crash on DOCX export of inline anchored frame (fdo#48569) + * cyclic references in XLSX import (bnc#781166, bnc#780296) + * corrupted styles with multi-saved XLSX document (fdo#55418) + * inform about unsupported PDF encryption formats (rh#826526) + * exchange sort settings between the two tab pages (fdo#53482) + * correctly clear DataColumns read-only information (fdo#37529) + * misc broadcaster cells fixes (fdo#54553, fdo#55712, fdo#55059) + * crash with 0 dyaLinePitch in DOCX import (fdo#40686, rh#831755) + * hiding windows based on "Visible" property (fdo#46071, fdo#46074) + * ignore time stamp differences in XLSX import (fdo#54609, fdo#49819) + * doubled '~' in German OK/Cancel translations (fdo#56281, rh#868479) + * display upper case Greek letters in page numbering option (fdo#55732) + * misc ODF export fixes (fdo#30711, fdo#49678, fdo#49677, fdo#49876, + fdo#49571, fdo#45700) + * various conditional formatting fixes (fdo#54749, fdo#55379, fdo#56316, + fdo#52535, fdo#54661, fdo#54555, fdo#54349) + * several RTF import/export fixes (fdo#48442, fdo#55526, fdo#52475, + fdo#50539, fdo#55939, fdo#52389, fdo#55493, fdo#49655, fdo#52989) +- update mdds to version 0.6.1: + * mixed_type_matrix: speed up + * flat_segment_tree, point_quad_tree: broken iterator implementation + * multi_type_vector(new): efficient storage of data of different types + * multi_type_matrix(new): eventually replace mixed_type_matrix +- update libcdr to version 0.0.9: + * better color import (fdo#54785, fdo#55522) +* bin obsolete patches: + * mono-enable-climaker-stuff-in-unoil.diff + * mono-install-cli-when-mono-enabled.diff + * mono-install-mono-before-finalizing-filelits.diff +* pack-addressbook.diff: correctly pack KDE and TDE addressbook (bnc#779697) +- flat_logo.svg need to be modified by the branding packages +- update mime, desktop files, and icon theme cache from the main package +- update desktop files cache also from subpackages that install desktop + files (bnc#782638) +- sync the prebuilt sofficerc with upstream sources + ------------------------------------------------------------------- Wed Oct 31 16:52:02 UTC 2012 - pmladek@suse.com - sdext-poppler-0.21.0.diff: fix build with poppler-0.21.0 - libreoffice-poppler-0.17.0-reject-fix.diff: reject the check for poppler-0.21.0 on too old distributions +- mono-enable-climaker-stuff-in-unoil.diff: support also prebuilt dlls - do not pack obsolete README-mono; keep it in sources for future ------------------------------------------------------------------- diff --git a/libreoffice.spec b/libreoffice.spec index eefe403..a41bad4 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -221,7 +221,7 @@ BuildRequires: gst-plugins-base-devel # the manifest file must be in the right place; registration does not work with some repacked jars %define __jar_repack %{nil} %endif -Version: 3.6.2.2.1 +Version: 3.6.3.2.2 Release: 0 Requires: libreoffice-branding < 4 Requires: libreoffice-branding > 3.2.99.3 @@ -568,7 +568,7 @@ Source1030: 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip Source1031: 86261f06c097d3e425a2f6d0b0635380-hyphen-2.8.3.tar.gz Source1032: 48d8169acc35f97e05d8dcdfd45be7f2-lucene-2.3.2.tar.gz Source1033: 9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2 -Source1034: 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 +Source1034: 9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2 Source1035: 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip Source1036: 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip Source1037: c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2 @@ -581,7 +581,7 @@ Source1043: d7a242ca43e33e1b63d3073f9d46a6a8-librsvg-2.32.1.tar.gz # FIXME: the system clucene does not include stuff from contribs-lib (CJKAnalyzer.h) Source1044: 48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz # newly developed library for LO feature -Source1045: ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2 +Source1045: 3c0037fb07dea2f0bbae8386fa7c6a9a-libcdr-0.0.9.tar.bz2 # this library is not available on older distributions Source1046: 327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz # internal boost headers are needed on openSUSE <= 11.3; the system one has broken dst_adjustment_offsets definition (bnc#767949) @@ -604,7 +604,7 @@ Patch6: pack-desktop-files-for-optional-filters.diff # put internal rhino into XBootClasspath to fix build with OpenJDK # FIXME: make it clean to be able to push upstream Patch7: scripting-prefer-internal-rhino.diff -# we started to use the vendor SUSE +# we started to use the vendor SUSE; pushed upstream for 4.0 Patch8: install-with-vendor-SUSE.diff # search /share/template/common for language independent templates # FIXME: make it configurable to push upstream @@ -622,16 +622,16 @@ Patch13: jvmfwk-disable-gcj.diff # FIXME: push upstream and be ready to fix problem on other systems Patch14: solenv-java-source-version.diff # use function provided already by icu-4.0 +# pushed upstream for lo-4.0 Patch15: build-i18npool-with-icu-4.0.diff -# fix build with mono enabled on SLED11 -Patch16: mono-enable-climaker-stuff-in-unoil.diff -Patch17: mono-install-cli-when-mono-enabled.diff -Patch18: mono-install-mono-before-finalizing-filelits.diff # fix build with poppler-0.21.0 -Patch19: sdext-poppler-0.21.0.diff +# pushed upstream for LO-4.0 +Patch16: sdext-poppler-0.21.0.diff +# correcly pack KDE and TDE addressbook (bnc#779697) +Patch17: pack-addressbook.diff # add pyuno to python path # FIXME: related to system-python-ure-bootstrap.diff -Patch26: pyuno-path.diff +Patch18: pyuno-path.diff # # default to MS Office 97/2000/XP file formats on MeeGo; asked by HP Patch900: officecfg-defaul-export-ms-file-formats.diff @@ -1343,8 +1343,6 @@ the LibreOffice localizations separately. %patch16 %patch17 %patch18 -%patch19 -%patch26 # %if 0%{?meego_version} # default to MS Office 97/2000/XP file formats on MeeGo; asked by HP @@ -1706,6 +1704,7 @@ fi mkdir -p $RPM_BUILD_ROOT/%_datadir/%lo_home/program/shell for file in sofficerc \ intro.png \ + flat_logo.svg \ shell/about.svg \ shell/backing_left.png \ shell/backing_right.png \ @@ -1812,42 +1811,48 @@ fi %post /sbin/ldconfig -/usr/bin/update-mime-database /usr/share/mime >/dev/null || true -# update GNOME icon caches -%if 0%{?suse_version} > 01130 +%if %suse_version > 1130 +%mime_database_post +%desktop_database_post %icon_theme_cache_post -%endif -%if 0%{?suse_version} && 0%{?suse_version} <= 01130 -SuSEconfig --module gtk2 || true +%else +test -f /usr/bin/update-mime-database && /usr/bin/update-mime-database %{_datadir}/mime > /dev/null || : +test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : +test -f /sbin/conf.d/SuSEconfig.gtk2 && SuSEconfig --module gtk2 > /dev/null || : +test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : %endif # do not crate the cache because it is not secure # remove the system cache for bundled extensions; it is not secure (fdo#53006, fdo#51252) # it has not been created since LO-3.6.1, August 2012 bundled_cache="%lo_prefix/%lo_home/share/prereg/bundled" test -d "$bundled_cache" && rm -rf "$bundled_cache"/* || true; +exit 0 %preun test "$1" = "0" && rm -rf ./%lo_prefix/%lo_home/share/uno_packages/cache || true %postun /sbin/ldconfig -/usr/bin/update-mime-database /usr/share/mime >/dev/null || true -# update GNOME icon caches -%if 0%{?suse_version} > 01130 +%if %suse_version > 1130 %icon_theme_cache_postun -%endif -%if 0%{?suse_version} && 0%{?suse_version} <= 01130 -SuSEconfig --module gtk2 || true +%desktop_database_postun +%mime_database_postun +%else +test -f /usr/bin/update-mime-database && /usr/bin/update-mime-database %{_datadir}/mime > /dev/null || : +test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : +test -f /sbin/conf.d/SuSEconfig.gtk2 && SuSEconfig --module gtk2 > /dev/null || : +test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : %endif # %ifarch %ix86 if test $1 = 0 ; then - # OOo is removed => remove the link as well if it is not created by stlport-devel package (bnc#458952) + # LO is removed => remove the link as well if it is not created by stlport-devel package (bnc#458952) if test -L %_libdir/libstlport_gcc.so -a ! -r %_prefix/include/stlport/ctime ; then rm -f %_libdir/libstlport_gcc.so fi fi %endif +exit 0 %posttrans %ifarch %ix86 @@ -1890,6 +1895,133 @@ exit 0 %endif ##################### +# base + +%post base +%if %suse_version > 1130 +%desktop_database_post +%else +test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : +test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : +%endif +exit 0 + +%postun base +%if %suse_version > 1130 +%desktop_database_postun +%else +test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : +test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : +%endif +exit 0 + +##################### +# calc + +%post calc +%if %suse_version > 1130 +%desktop_database_post +%else +test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : +test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : +%endif +exit 0 + +%postun calc +%if %suse_version > 1130 +%desktop_database_postun +%else +test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : +test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : +%endif +exit 0 + +##################### +# draw + +%post draw +%if %suse_version > 1130 +%desktop_database_post +%else +test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : +test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : +%endif +exit 0 + +%postun draw +%if %suse_version > 1130 +%desktop_database_postun +%else +test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : +test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : +%endif +exit 0 + +##################### +# math + +%post math +%if %suse_version > 1130 +%desktop_database_post +%else +test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : +test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : +%endif +exit 0 + +%postun math +%if %suse_version > 1130 +%desktop_database_postun +%else +test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : +test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : +%endif +exit 0 + +##################### +# impress + +%post impress +%if %suse_version > 1130 +%desktop_database_post +%else +test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : +test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : +%endif +exit 0 + +%postun impress +%if %suse_version > 1130 +%desktop_database_postun +%else +test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : +test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : +%endif +exit 0 + +##################### +# writer + +%post writer +%if %suse_version > 1130 +%desktop_database_post +%else +test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : +test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : +%endif +exit 0 + +%postun writer +%if %suse_version > 1130 +%desktop_database_postun +%else +test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : +test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : +%endif +exit 0 + +##################### +# filters-optional %pre filters-optional if test $1 -gt 1 ; then @@ -2150,6 +2282,7 @@ fi # common extensions # ignore helper files for brp-symlink check %exclude %_datadir/%lo_home/program/sofficerc +%exclude %_datadir/%lo_home/program/flat_logo.svg %exclude %_datadir/%lo_home/program/*.png %exclude %_datadir/%lo_home/program/shell/*.png %exclude %_datadir/%lo_home/program/shell/*.svg diff --git a/mono-enable-climaker-stuff-in-unoil.diff b/mono-enable-climaker-stuff-in-unoil.diff deleted file mode 100644 index 9123f1e..0000000 --- a/mono-enable-climaker-stuff-in-unoil.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- unoil/Module_unoil.mk.old 2012-10-15 15:45:49.000000000 +0200 -+++ unoil/Module_unoil.mk 2012-10-29 11:28:00.000000000 +0100 -@@ -39,6 +39,13 @@ $(eval $(call gb_Module_add_targets,unoi - endif - - ifeq ($(COM),MSC) -+unoil_climaker_build := YES -+endif -+ifeq ($(ENABLE_MONO),YES) -+unoil_climaker_build := YES -+endif -+ -+ifeq ($(unoil_climaker_build),YES) - $(eval $(call gb_Module_add_targets,unoil,\ - CustomTarget_climaker \ - Package_climaker \ diff --git a/mono-install-cli-when-mono-enabled.diff b/mono-install-cli-when-mono-enabled.diff deleted file mode 100644 index 74a2f0d..0000000 --- a/mono-install-cli-when-mono-enabled.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- scp2/InstallModule_ure.mk.old 2012-10-15 15:45:49.000000000 +0200 -+++ scp2/InstallModule_ure.mk 2012-10-29 11:45:57.000000000 +0100 -@@ -34,6 +34,7 @@ $(eval $(call gb_InstallModule_use_packa - - $(eval $(call gb_InstallModule_define_if_set,scp2/ure,\ - SYSTEM_LIBXML \ -+ ENABLE_MONO \ - )) - - $(eval $(call gb_InstallModule_define_value_if_set,scp2/ure,\ diff --git a/mono-install-mono-before-finalizing-filelits.diff b/mono-install-mono-before-finalizing-filelits.diff deleted file mode 100644 index b399fb9..0000000 --- a/mono-install-mono-before-finalizing-filelits.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- Makefile.top.old 2012-10-15 15:45:49.000000000 +0200 -+++ Makefile.top 2012-10-29 12:09:25.000000000 +0100 -@@ -441,8 +441,8 @@ distro-pack-install: install - $(SRCDIR)/bin/distro-install-clean-up - $(SRCDIR)/bin/distro-install-desktop-integration - $(SRCDIR)/bin/distro-install-sdk -- $(SRCDIR)/bin/distro-install-file-lists - $(SRCDIR)/bin/distro-install-mono -+ $(SRCDIR)/bin/distro-install-file-lists - - id: - @create-ids diff --git a/pack-addressbook.diff b/pack-addressbook.diff new file mode 100644 index 0000000..c30707d --- /dev/null +++ b/pack-addressbook.diff @@ -0,0 +1,22 @@ +--- bin/distro-install-file-lists.old 2012-11-05 21:12:36.000000000 +0100 ++++ bin/distro-install-file-lists 2012-11-06 14:05:45.000000000 +0100 +@@ -222,7 +222,8 @@ if test "z$OOO_VENDOR" != "zDebian" ; th + mv_file_between_flists tde_list.txt common_list.txt $INSTALLDIR/program/tdefilepicker + mv_file_between_flists tde_list.txt common_list.txt $INSTALLDIR/program/fps_tde.uno.so + mv_file_between_flists tde_list.txt common_list.txt $INSTALLDIR/program/libvclplug_tdel..so +- mv_file_between_flists tde_list.txt common_list.txt $INSTALLDIR/program/libtdeabdrv1.so ++ mv_file_between_flists tde_list.txt common_list.txt $INSTALLDIR/program/libtdeab1l..so ++ mv_file_between_flists tde_list.txt common_list.txt $INSTALLDIR/program/libtdeabdrv1l..so + add_used_directories tde_list.txt common_list.txt + + # kde subpackage +@@ -230,7 +231,8 @@ if test "z$OOO_VENDOR" != "zDebian" ; th + mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/kdefilepicker + mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/fps_kde.uno.so + mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/libvclplug_kdel..so +- mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/libkabdrv1.so ++ mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/libkab1l..so ++ mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/libkabdrv1l..so + add_used_directories kde_list.txt common_list.txt + + # create kde4 subpackage diff --git a/sofficerc-upstream b/sofficerc-upstream index 3002636..c5aff14 100644 --- a/sofficerc-upstream +++ b/sofficerc-upstream @@ -6,4 +6,6 @@ ProgressBarColor=255,255,255 ProgressFrameColor=20,136,3 ProgressPosition=61,317 ProgressSize=407,6 +ProgressTextBaseline=287 +ProgressTextColor=255,255,255 URE_BOOTSTRAP=${ORIGIN}/fundamentalrc