diff --git a/build-i18npool-with-icu-4.0.diff b/build-i18npool-with-icu-4.0.diff deleted file mode 100644 index 3600f56..0000000 --- a/build-i18npool-with-icu-4.0.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- i18npool/source/ordinalsuffix/ordinalsuffix.cxx.old 2012-10-12 12:39:47.000000000 +0200 -+++ i18npool/source/ordinalsuffix/ordinalsuffix.cxx 2012-10-15 14:59:19.000000000 +0200 -@@ -97,7 +97,9 @@ uno::Sequence< OUString > SAL_CALL Ordin - return retValue; - - icu::UnicodeString sFormatWithNoOrdinal; -- xNumberFormat->format((int32_t)nNumber, sFormatWithNoOrdinal, NULL, nCode); -+ icu::Formattable ftmNumber((int32_t)nNumber); -+ icu::FieldPosition icuPos; -+ xNumberFormat->format(ftmNumber, sFormatWithNoOrdinal, icuPos, nCode); - if (!U_SUCCESS(nCode)) - return retValue; - diff --git a/install-with-hardlinks.diff b/install-with-hardlinks.diff new file mode 100644 index 0000000..2af9075 --- /dev/null +++ b/install-with-hardlinks.diff @@ -0,0 +1,15 @@ +--- solenv/bin/modules/installer/worker.pm.old 2012-11-07 15:41:56.000000000 +0100 ++++ solenv/bin/modules/installer/worker.pm 2012-11-15 17:46:20.000000000 +0100 +@@ -519,7 +519,11 @@ sub install_simple ($$$$$$) + unlink "$destdir$destination"; + } + +- copy ("$sourcepath", "$destdir$destination") || die "Can't copy file: $sourcepath -> $destdir$destination $!"; ++ my $copied = 0; ++ # try to save space by hardlinking files; symlinks can't be hardlinked ;-) ++ $copied = link ("$sourcepath", "$destdir$destination") if (! -l $sourcepath); ++ $copied = copy ("$sourcepath", "$destdir$destination") if (! $copied); ++ die "Can't copy file: $sourcepath -> $destdir$destination $!" if (! $copied); + my $sourcestat = stat($sourcepath); + utime ($sourcestat->atime, $sourcestat->mtime, "$destdir$destination"); + chmod (oct($unixrights), "$destdir$destination") || die "Can't change permissions: $!"; diff --git a/libreoffice-binfilter-3.6.3.2.2.tar.bz2 b/libreoffice-binfilter-3.6.3.2.2.tar.bz2 deleted file mode 100644 index 63f5d99..0000000 --- a/libreoffice-binfilter-3.6.3.2.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:026184ebf296bf26a82f96ccae326fe140a3ac16360f2fedf7fc7c93fa7f3611 -size 6440344 diff --git a/libreoffice-binfilter-3.6.3.2.3.tar.bz2 b/libreoffice-binfilter-3.6.3.2.3.tar.bz2 new file mode 100644 index 0000000..f5577a1 --- /dev/null +++ b/libreoffice-binfilter-3.6.3.2.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b9a8849e40b09977582670ff5e94bee065b97f51a1154be081e5b49e3b0e061 +size 6440362 diff --git a/libreoffice-branding-upstream.changes b/libreoffice-branding-upstream.changes index 9f8ea43..245eb14 100644 --- a/libreoffice-branding-upstream.changes +++ b/libreoffice-branding-upstream.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 23 15:43:06 UTC 2012 - pmladek@suse.com + +- update to 3.6.3.2.3 (SUSE 3.6-rc3, tag suse-3.6-3, based on upstream 3.6.3.2) + ------------------------------------------------------------------- Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com diff --git a/libreoffice-branding-upstream.spec b/libreoffice-branding-upstream.spec index 8df8379..2e64956 100644 --- a/libreoffice-branding-upstream.spec +++ b/libreoffice-branding-upstream.spec @@ -17,7 +17,7 @@ Name: libreoffice-branding-upstream -Version: 3.6.3.2.2 +Version: 3.6.3.2.3 Release: 0 %define lo_home libreoffice Summary: Original Branding for LibreOffice diff --git a/libreoffice-core-3.6.3.2.2.tar.bz2 b/libreoffice-core-3.6.3.2.2.tar.bz2 deleted file mode 100644 index b930ccd..0000000 --- a/libreoffice-core-3.6.3.2.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:70ad8ed01655f491754ef62b7b1889b36ffab2f9965020592ffb3cb30a5a7428 -size 132919373 diff --git a/libreoffice-core-3.6.3.2.3.tar.bz2 b/libreoffice-core-3.6.3.2.3.tar.bz2 new file mode 100644 index 0000000..07f3fb5 --- /dev/null +++ b/libreoffice-core-3.6.3.2.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2f3e10f5cbea087e21e28120abd5a64dbc8e6510781852de8a6e673f58cb8bdd +size 132950325 diff --git a/libreoffice-help-3.6.3.2.2.tar.bz2 b/libreoffice-help-3.6.3.2.2.tar.bz2 deleted file mode 100644 index a20de71..0000000 --- a/libreoffice-help-3.6.3.2.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c6d1a8f47dc7b2771b838fd98cd7432337e37da310c36da64776aad44de65ee9 -size 1884056 diff --git a/libreoffice-help-3.6.3.2.3.tar.bz2 b/libreoffice-help-3.6.3.2.3.tar.bz2 new file mode 100644 index 0000000..a8399ed --- /dev/null +++ b/libreoffice-help-3.6.3.2.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:46653d3e1ef54b5eb7eb591cbf0c4b292cc228c81e50e8fa31ee54a99445bb97 +size 1884620 diff --git a/libreoffice-help-en-US.changes b/libreoffice-help-en-US.changes index 651c627..22c650c 100644 --- a/libreoffice-help-en-US.changes +++ b/libreoffice-help-en-US.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Nov 23 15:43:06 UTC 2012 - pmladek@suse.com + +- update to 3.6.3.2.3 (SUSE 3.6-rc3, tag suse-3.6-3, based on upstream 3.6.3.2) +- bin obsolete build-i18npool-with-icu-4.0.diff + ------------------------------------------------------------------- Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com diff --git a/libreoffice-help-en-US.spec b/libreoffice-help-en-US.spec index fe94004..47ad1c3 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.3.2.2 +Version: 3.6.3.2.3 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 @@ -124,8 +124,6 @@ Source201: lo-help-gen-spec Source202: lo-help-en-US # cups is not needed for helpcontent build Patch0: build-helpcontent-do-not-check-cups.diff -# use function provided already by icu-4.0 -Patch1: build-i18npool-with-icu-4.0.diff # # Patches against zip-3.0 Patch2000: zip-3.0-iso8859_2.patch @@ -149,7 +147,6 @@ stuff is in LibreOffice-l10n-en-US. %else %setup -q -a30 -a31 -n libreoffice-core-%version %patch0 -%patch1 bin/unpack-sources `pwd` %{S:1} %{S:2} # extra fixes # @@ -336,4 +333,5 @@ rm -f %_datadir/%lo_home/help_en_US_list.txt.postun 2>/dev/null %files -f file-lists/help_en_US_list.txt -n libreoffice-help-en-US %defattr(-,root,root) + %changelog diff --git a/libreoffice-help-en-US.spec.in b/libreoffice-help-en-US.spec.in index 4ad9a22..5df5a8f 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.3.2.2 +Version: 3.6.3.2.3 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 @@ -120,8 +120,6 @@ Source201: lo-help-gen-spec Source202: lo-help-en-US # cups is not needed for helpcontent build Patch0: build-helpcontent-do-not-check-cups.diff -# use function provided already by icu-4.0 -Patch1: build-i18npool-with-icu-4.0.diff # # Patches against zip-3.0 Patch2000: zip-3.0-iso8859_2.patch @@ -145,7 +143,6 @@ stuff is in LibreOffice-l10n-en-US. %else %setup -q -a30 -a31 -n libreoffice-core-%version %patch0 -%patch1 bin/unpack-sources `pwd` %{S:1} %{S:2} # extra fixes # diff --git a/libreoffice-help-group1.changes b/libreoffice-help-group1.changes index 5c81781..e2b2e67 100644 --- a/libreoffice-help-group1.changes +++ b/libreoffice-help-group1.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Nov 23 15:43:06 UTC 2012 - pmladek@suse.com + +- update to 3.6.3.2.3 (SUSE 3.6-rc3, tag suse-3.6-3, based on upstream 3.6.3.2) +- bin obsolete build-i18npool-with-icu-4.0.diff + ------------------------------------------------------------------- Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com diff --git a/libreoffice-help-group1.spec b/libreoffice-help-group1.spec index f6ab664..ccc5852 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.3.2.2 +Version: 3.6.3.2.3 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 @@ -106,8 +106,6 @@ Source201: lo-help-gen-spec Source202: lo-help-groupX # cups is not needed for helpcontent build Patch0: build-helpcontent-do-not-check-cups.diff -# use function provided already by icu-4.0 -Patch1: build-i18npool-with-icu-4.0.diff # # Patches against zip-3.0 Patch2000: zip-3.0-iso8859_2.patch @@ -334,7 +332,6 @@ is in libreoffice-l10n-en-GB. %else %setup -q -a30 -a31 -n libreoffice-core-%version %patch0 -%patch1 bin/unpack-sources `pwd` %{S:1} %{S:2} # # patch zip-3.0 diff --git a/libreoffice-help-group2.changes b/libreoffice-help-group2.changes index 89e66d8..f8e76ca 100644 --- a/libreoffice-help-group2.changes +++ b/libreoffice-help-group2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Nov 23 15:43:06 UTC 2012 - pmladek@suse.com + +- update to 3.6.3.2.3 (SUSE 3.6-rc3, tag suse-3.6-3, based on upstream 3.6.3.2) +- bin obsolete build-i18npool-with-icu-4.0.diff + ------------------------------------------------------------------- Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com diff --git a/libreoffice-help-group2.spec b/libreoffice-help-group2.spec index 2e3e5d8..e203e5f 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.3.2.2 +Version: 3.6.3.2.3 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 @@ -106,8 +106,6 @@ Source201: lo-help-gen-spec Source202: lo-help-groupX # cups is not needed for helpcontent build Patch0: build-helpcontent-do-not-check-cups.diff -# use function provided already by icu-4.0 -Patch1: build-i18npool-with-icu-4.0.diff # # Patches against zip-3.0 Patch2000: zip-3.0-iso8859_2.patch @@ -322,7 +320,6 @@ is in libreoffice-l10n-fr. %else %setup -q -a30 -a31 -n libreoffice-core-%version %patch0 -%patch1 bin/unpack-sources `pwd` %{S:1} %{S:2} # # patch zip-3.0 diff --git a/libreoffice-help-group3.changes b/libreoffice-help-group3.changes index 8ea9b8c..ca06789 100644 --- a/libreoffice-help-group3.changes +++ b/libreoffice-help-group3.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Nov 23 15:43:06 UTC 2012 - pmladek@suse.com + +- update to 3.6.3.2.3 (SUSE 3.6-rc3, tag suse-3.6-3, based on upstream 3.6.3.2) +- bin obsolete build-i18npool-with-icu-4.0.diff + ------------------------------------------------------------------- Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com diff --git a/libreoffice-help-group3.spec b/libreoffice-help-group3.spec index c6d595a..b7838fd 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.3.2.2 +Version: 3.6.3.2.3 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 @@ -106,8 +106,6 @@ Source201: lo-help-gen-spec Source202: lo-help-groupX # cups is not needed for helpcontent build Patch0: build-helpcontent-do-not-check-cups.diff -# use function provided already by icu-4.0 -Patch1: build-i18npool-with-icu-4.0.diff # # Patches against zip-3.0 Patch2000: zip-3.0-iso8859_2.patch @@ -334,7 +332,6 @@ is in libreoffice-l10n-km. %else %setup -q -a30 -a31 -n libreoffice-core-%version %patch0 -%patch1 bin/unpack-sources `pwd` %{S:1} %{S:2} # # patch zip-3.0 diff --git a/libreoffice-help-group4.changes b/libreoffice-help-group4.changes index ee65e30..9f1cd04 100644 --- a/libreoffice-help-group4.changes +++ b/libreoffice-help-group4.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Nov 23 15:43:06 UTC 2012 - pmladek@suse.com + +- update to 3.6.3.2.3 (SUSE 3.6-rc3, tag suse-3.6-3, based on upstream 3.6.3.2) +- bin obsolete build-i18npool-with-icu-4.0.diff + ------------------------------------------------------------------- Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com diff --git a/libreoffice-help-group4.spec b/libreoffice-help-group4.spec index e6abf17..72ba3b1 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.3.2.2 +Version: 3.6.3.2.3 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 @@ -106,8 +106,6 @@ Source201: lo-help-gen-spec Source202: lo-help-groupX # cups is not needed for helpcontent build Patch0: build-helpcontent-do-not-check-cups.diff -# use function provided already by icu-4.0 -Patch1: build-i18npool-with-icu-4.0.diff # # Patches against zip-3.0 Patch2000: zip-3.0-iso8859_2.patch @@ -322,7 +320,6 @@ is in libreoffice-l10n-pt-BR. %else %setup -q -a30 -a31 -n libreoffice-core-%version %patch0 -%patch1 bin/unpack-sources `pwd` %{S:1} %{S:2} # # patch zip-3.0 diff --git a/libreoffice-help-group5.changes b/libreoffice-help-group5.changes index 2c85b08..27803f3 100644 --- a/libreoffice-help-group5.changes +++ b/libreoffice-help-group5.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Nov 23 15:43:06 UTC 2012 - pmladek@suse.com + +- update to 3.6.3.2.3 (SUSE 3.6-rc3, tag suse-3.6-3, based on upstream 3.6.3.2) +- bin obsolete build-i18npool-with-icu-4.0.diff + ------------------------------------------------------------------- Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com diff --git a/libreoffice-help-group5.spec b/libreoffice-help-group5.spec index 8adf532..47e3d6a 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.3.2.2 +Version: 3.6.3.2.3 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 @@ -106,8 +106,6 @@ Source201: lo-help-gen-spec Source202: lo-help-groupX # cups is not needed for helpcontent build Patch0: build-helpcontent-do-not-check-cups.diff -# use function provided already by icu-4.0 -Patch1: build-i18npool-with-icu-4.0.diff # # Patches against zip-3.0 Patch2000: zip-3.0-iso8859_2.patch @@ -349,7 +347,6 @@ is in libreoffice-l10n-zh-TW. %else %setup -q -a30 -a31 -n libreoffice-core-%version %patch0 -%patch1 bin/unpack-sources `pwd` %{S:1} %{S:2} # # patch zip-3.0 diff --git a/libreoffice-help-groupX.spec.in b/libreoffice-help-groupX.spec.in index a797ad6..24b06c2 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.3.2.2 +Version: 3.6.3.2.3 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 @@ -102,8 +102,6 @@ Source201: lo-help-gen-spec Source202: lo-help-groupX # cups is not needed for helpcontent build Patch0: build-helpcontent-do-not-check-cups.diff -# use function provided already by icu-4.0 -Patch1: build-i18npool-with-icu-4.0.diff # # Patches against zip-3.0 Patch2000: zip-3.0-iso8859_2.patch @@ -127,7 +125,6 @@ development. %else %setup -q -a30 -a31 -n libreoffice-core-%version %patch0 -%patch1 bin/unpack-sources `pwd` %{S:1} %{S:2} # # patch zip-3.0 diff --git a/libreoffice-icon-themes.changes b/libreoffice-icon-themes.changes index 4a29c4f..5fd259d 100644 --- a/libreoffice-icon-themes.changes +++ b/libreoffice-icon-themes.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 23 15:43:06 UTC 2012 - pmladek@suse.com + +- update to 3.6.3.2.3 (SUSE 3.6-rc3, tag suse-3.6-3, based on upstream 3.6.3.2) + ------------------------------------------------------------------- Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com diff --git a/libreoffice-icon-themes.spec b/libreoffice-icon-themes.spec index 2bc7b35..5fd0864 100644 --- a/libreoffice-icon-themes.spec +++ b/libreoffice-icon-themes.spec @@ -17,7 +17,7 @@ Name: libreoffice-icon-themes -Version: 3.6.3.2.2 +Version: 3.6.3.2.3 Release: 0 %define ooo_home libreoffice BuildRequires: libreoffice-icon-themes-prebuilt = %version diff --git a/libreoffice-l10n.changes b/libreoffice-l10n.changes index d35ccfe..26944e5 100644 --- a/libreoffice-l10n.changes +++ b/libreoffice-l10n.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 23 15:43:06 UTC 2012 - pmladek@suse.com + +- update to 3.6.3.2.3 (SUSE 3.6-rc3, tag suse-3.6-3, based on upstream 3.6.3.2) + ------------------------------------------------------------------- Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com diff --git a/libreoffice-l10n.spec b/libreoffice-l10n.spec index 36cc8ec..c3d4975 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.3.2.2 +Version: 3.6.3.2.3 Release: 0 %define piece l10n %define ooo_home libreoffice @@ -1664,8 +1664,8 @@ PreReq: grep PreReq: libreoffice >= 3.5 %endif Requires: libreoffice = %{version} -Provides: OpenOffice_org-sh-YU = %version Provides: OpenOffice_org-sh-YU:%_prefix/ooo-2.0/program/resource/sw680sh-YU.res +Provides: OpenOffice_org-sh-YU = %version Obsoletes: OpenOffice_org-sh-YU < %version # compat stuff Provides: OpenOffice_org-sh = %{version} @@ -1752,8 +1752,8 @@ PreReq: libreoffice >= 3.5 %endif Requires: libreoffice = %{version} Requires: scalable-font-ru -Provides: OpenOffice_org-sr-CS = %version Provides: OpenOffice_org-sr-CS:%_prefix/ooo-2.0/program/resource/sw680sr-CS.res +Provides: OpenOffice_org-sr-CS = %version Obsoletes: OpenOffice_org-sr-CS < %version # compat stuff Provides: OpenOffice_org-sr = %{version} diff --git a/libreoffice-l10n.spec.in b/libreoffice-l10n.spec.in index 6ccc6da..8e3b341 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.3.2.2 +Version: 3.6.3.2.3 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 c81e71b..760bfc4 100644 --- a/libreoffice-poppler-0.17.0-reject-fix.diff +++ b/libreoffice-poppler-0.17.0-reject-fix.diff @@ -23,19 +23,24 @@ Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx =================================================================== --- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig +++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -@@ -46,11 +46,7 @@ +@@ -46,16 +46,7 @@ #pragma warning(push, 1) #endif --#if POPPLER_CHECK_VERSION(0, 21, 0) +-// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1 +-// FIXME: we can't use #if POPPLER_CHECK_VERSION(0, 21, 0) && !POPPLER_CHECK_VERSION(0, 21, 1) +-// because the internal poppler does not provide poppler-version.h and the macro always returns 0 +-#if POPPLER_CHECK_VERSION(0, 21, 1) + #include "UTF8.h" +-#elif POPPLER_CHECK_VERSION(0, 21, 0) -#include "UTF.h" -#else - #include "UTF8.h" +-#include "UTF8.h" -#endif #if defined __SUNPRO_CC #pragma enable_warn -@@ -158,11 +154,7 @@ void writeBinaryBuffer( const OutputBuff +@@ -163,11 +154,7 @@ void writeBinaryBuffer( const OutputBuff void writeJpeg_( OutputBuffer& o_rOutputBuf, Stream* str, bool bWithLinefeed ) { // dump JPEG file as-is @@ -47,7 +52,7 @@ Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx str->reset(); int c; -@@ -501,13 +493,7 @@ void PDFOutDev::endPage() +@@ -506,13 +493,7 @@ void PDFOutDev::endPage() printf("endPage\n"); } diff --git a/libreoffice-translations-3.6.3.2.2.tar.bz2 b/libreoffice-translations-3.6.3.2.2.tar.bz2 deleted file mode 100644 index b3dcba0..0000000 --- a/libreoffice-translations-3.6.3.2.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:24f5300624589c8a470cbf2164eabecd0843c3a7e1f16dccd56d5e9d6b720427 -size 143492681 diff --git a/libreoffice-translations-3.6.3.2.3.tar.bz2 b/libreoffice-translations-3.6.3.2.3.tar.bz2 new file mode 100644 index 0000000..fd91b20 --- /dev/null +++ b/libreoffice-translations-3.6.3.2.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:24b9e725010bf9f837017c82574035578a7f288e59dfa60ab91eb4a2393a8075 +size 144697595 diff --git a/libreoffice.changes b/libreoffice.changes index de7c306..e294309 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,44 @@ +------------------------------------------------------------------- +Fri Nov 23 15:43:06 UTC 2012 - pmladek@suse.com + +- update to 3.6.3.2.3 (SUSE 3.6-rc3, tag suse-3.6-3, based on upstream 3.6.3.2) + * hyperlink DOCX export (bnc#789482) + * delete also note caption (fdo#56584) + * numbers as text conversion (fdo#55875) + * special pages in DOC import (fdo#53909) + * column width in DOCX Import (bnc#780645) + * test equality by order index (fdo#54898) + * shrunken text in DOCX import (bnc#773061) + * better input field selection (bnc#780277) + * accept fraction input if preset (fdo#55369) + * fraction formats with hard denom (fdo#56205) + * broken bold text in presentation (fdo#47432) + * non-math/chart OLE in DOCX export (fdo#51550) + * embedded spreadsheets in PPTX export (bnc#780830) + * remove conditional formats without range (fdo#56983) + * rotated text in emf images looks thicker (bnc#782833) + * nicer toolbars even for XP, not only Vista and higher + * only set entries for existing sort entries (fdo#56958) + * squashed glyphs with Cairo canvas (fdo#55931, bnc#681110) + * change in formula options should cause repaint (fdo#56776) + * make sure that the sort vector is large enough (fdo#56958) + * update default Hebrew font to Lucida Sans Unicode (fdo#55034) + * broadcast deletion to dependent formula cells (fdo#53364, i#101869, + fdo#54074, fdo#56278, fdo#55059, i#99844) +- bin obsolete orbit2-devel from BuildRequires +- bin obsolete build-i18npool-with-icu-4.0.diff +- sdext-poppler-0.21.1.diff: fix build with poppler-0.21.1 + +------------------------------------------------------------------- +Thu Nov 15 17:20:52 UTC 2012 - pmladek@suse.com + +- build with debug symbols fails in OBS when creating RPMs because + there is not enough space in the virtual machines; try to save + some space in the %%install phase: + * install-with-hardlinks.diff: use hardlinks in BuildRoot + * remove the huge translation sources + * use these hacks only when %save_space == 1 + ------------------------------------------------------------------- Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index a41bad4..58945e8 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -42,7 +42,6 @@ BuildRequires: libxml2-devel BuildRequires: lpsolve-devel BuildRequires: mono-devel BuildRequires: neon-devel -BuildRequires: orbit2-devel BuildRequires: pam-devel BuildRequires: patch BuildRequires: perl-Archive-Zip @@ -175,6 +174,9 @@ BuildRequires: gst-plugins-base-devel # 1 = yes (the number is defined be the number of cpus) # 2,3,4... = yes (force the number of modules to be built in parallel) %define build_module_in_parallel 1 +# save_space: 0 = no +# 1 = yes (do some hacks to safe space in the installation phase) +%define save_space 1 # debug_build: 0 = no # 1 = yes (enable depency tracking, ccache) %define debug_build 0 @@ -221,7 +223,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.3.2.2 +Version: 3.6.3.2.3 Release: 0 Requires: libreoffice-branding < 4 Requires: libreoffice-branding > 3.2.99.3 @@ -621,12 +623,12 @@ Patch13: jvmfwk-disable-gcj.diff # generate selected bytecode version also in gbuild # 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 poppler-0.21.0 # pushed upstream for LO-4.0 -Patch16: sdext-poppler-0.21.0.diff +Patch15: sdext-poppler-0.21.0.diff +# fix build with poppler-0.21.1 +# pushed upstream for LO-4.0 +Patch16: sdext-poppler-0.21.1.diff # correcly pack KDE and TDE addressbook (bnc#779697) Patch17: pack-addressbook.diff # add pyuno to python path @@ -642,6 +644,8 @@ Patch910: libreoffice-poppler-0.17.0-reject-fix.diff Patch920: redland-rpath-hack.diff # FIXME: temporary disable failing xpdf test on Factory Patch930: sdext-disable-failing-xpdf-test.diff +# try to save space by using hardlinks +Patch990: install-with-hardlinks.diff # # Patches against zip-3.0 Patch2000: zip-3.0-iso8859_2.patch @@ -1340,7 +1344,7 @@ the LibreOffice localizations separately. %patch13 -p1 %patch14 %patch15 -%patch16 +%patch16 -p1 %patch17 %patch18 # @@ -1363,6 +1367,10 @@ the LibreOffice localizations separately. # temporary disable failing xpdf test %patch930 %endif +%if %save_space == 1 +# use hardlinks when installing files +%patch990 +%endif # other sources bin/unpack-sources `pwd` %{S:1} %{S:2} %{S:3} # 256x256 icons @@ -1791,6 +1799,11 @@ fi mkdir -p $RPM_BUILD_ROOT%python_sitelib ln -s %_libdir/libreoffice/program/uno.py $RPM_BUILD_ROOT%python_sitelib/uno.py ln -s %_libdir/libreoffice/program/unohelper.py $RPM_BUILD_ROOT%python_sitelib/unohelper.py +################ +# try to save some more space before creating rpms +%if %save_space == 1 +rm -rf translations/source +%endif %clean rm -rf $RPM_BUILD_ROOT diff --git a/sdext-poppler-0.21.1.diff b/sdext-poppler-0.21.1.diff new file mode 100644 index 0000000..4b4ce14 --- /dev/null +++ b/sdext-poppler-0.21.1.diff @@ -0,0 +1,33 @@ +From 445d88ee22bb5bfbe2c42b5618734b9661defd3d Mon Sep 17 00:00:00 2001 +From: Petr Mladek +Date: Wed, 21 Nov 2012 17:37:26 +0100 +Subject: [PATCH] fix build with poppler-0.21.1 + +heh, they put back UTF8.h + +Change-Id: Id915b1a1e41440a4b53058779355e99e3592e5fa +--- + sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +index 7adc487..765d0be 100644 +--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx ++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +@@ -34,7 +34,12 @@ + #pragma warning(push, 1) + #endif + +-#if POPPLER_CHECK_VERSION(0, 21, 0) ++// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1 ++// FIXME: we can't use #if POPPLER_CHECK_VERSION(0, 21, 0) && !POPPLER_CHECK_VERSION(0, 21, 1) ++// because the internal poppler does not provide poppler-version.h and the macro always returns 0 ++#if POPPLER_CHECK_VERSION(0, 21, 1) ++#include "UTF8.h" ++#elif POPPLER_CHECK_VERSION(0, 21, 0) + #include "UTF.h" + #else + #include "UTF8.h" +-- +1.7.12.3 +