From 701d96e34a148690e91efce4352590eb3cea9029476dbd545c3c48726370c8ee Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Wed, 17 Apr 2013 12:53:49 +0000 Subject: [PATCH] Accepting request 171281 from LibreOffice:Unstable - update to 4.0.2.2.1 (SUSE 4.0-rc1, tag suse-4.0-1, based on upstream 4.0.2.2) OBS-URL: https://build.opensuse.org/request/show/171281 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=30 --- ...24cfac409e766913506961a8-ucpp-1.3.2.tar.gz | 3 + ...9358ed60f33ecff78-postgresql-9.1.1.tar.bz2 | 3 - ...d6208751b33057f5361f0-libcmis-0.2.3.tar.gz | 3 - ...cab7321239406fde0-gdocs_3.0.1_modified.oxt | 3 + ...67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz | 3 - ...109b14435125c0dd1f2217-graphite2-1.0.3.tgz | 3 - ...ea2f0bbae8386fa7c6a9a-libcdr-0.0.9.tar.bz2 | 3 - ...1e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz | 3 + ...35f97e05d8dcdfd45be7f2-lucene-2.3.2.tar.gz | 3 - ...69c72be22adcb2195-liblangtag-0.4.0.tar.bz2 | 3 + ...1332b9cc593ae7-libexttextcat-3.3.1.tar.bz2 | 3 - ...7343f4060c0eb83842daf-icu4c-49_1_1-src.tgz | 3 + ...fa0bc018f9ddc932c4ad8b6dd-lcms2-2.4.tar.gz | 3 + ...97d3e425a2f6d0b0635380-hyphen-2.8.3.tar.gz | 3 - ...94a9028569374dc87b2-liborcus_0.3.0.tar.bz2 | 3 + ...6462558b4278590178-libvisio-0.0.19.tar.bz2 | 3 - README-draw-extensions.txt | 9 + README-mono.txt | 2 +- README-scsolver.txt | 2 +- ...e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz | 3 + ...38b3d8a9985e80bc2978-source-9.0.0.7-bj.zip | 3 - ...811c9d32146eec913d296-libcmis-0.3.0.tar.gz | 3 + ...23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt | 3 + ...3e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt | 3 - bridges-missing-cxxflags.diff | 11 + build-helpcontent-do-not-check-cups.diff | 13 - build-max-64-jobs.diff | 17 + build_prepare.inc | 79 + ...b205de755d58769288224-libwpd-0.9.4.tar.bz2 | 3 - ...e3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 | 3 + ...fcbd882031df44346-gdocs_3.0.0_modified.oxt | 3 - ...3e1b63d3073f9d46a6a8-librsvg-2.32.1.tar.gz | 3 - ...6e80f6701f6763-libexttextcat-3.4.0.tar.bz2 | 3 + do-not-delete-PropertyMapEntry-instance.diff | 75 - ...dbcbb34cb19e8a0eba90ae-mythes-1.2.2.tar.gz | 3 - ...fee9122949448cab3823f-libwpd-0.9.6.tar.bz2 | 3 + ...fa8c3542c6a085a233080b-graphite2-1.2.0.tgz | 3 + ...c2cbcf7a021b34b9f88478-icudt49l-subset.zip | 3 + ...e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz | 3 - install-with-vendor-SUSE.diff | 56 - libcdr-0.0.11.tar.bz2 | 3 + libmspub-0.0.5.tar.bz2 | 3 + libreoffice-4.0.2.2.1.tar.xz | 3 + libreoffice-binfilter-3.6.3.2.4.tar.bz2 | 3 - libreoffice-branding-upstream.changes | 48 + libreoffice-branding-upstream.spec | 14 +- libreoffice-core-3.6.3.2.4.tar.bz2 | 3 - libreoffice-help-3.6.3.2.4.tar.bz2 | 3 - libreoffice-help-4.0.2.2.1.tar.xz | 3 + libreoffice-help-en-US.changes | 77 + libreoffice-help-en-US.spec | 129 +- libreoffice-help-en-US.spec.in | 130 +- libreoffice-help-group1.changes | 75 + libreoffice-help-group1.spec | 135 +- libreoffice-help-group2.changes | 75 + libreoffice-help-group2.spec | 135 +- libreoffice-help-group3.changes | 75 + libreoffice-help-group3.spec | 135 +- libreoffice-help-group4.changes | 75 + libreoffice-help-group4.spec | 135 +- libreoffice-help-group5.changes | 75 + libreoffice-help-group5.spec | 135 +- libreoffice-help-groupX.spec.in | 135 +- libreoffice-icon-themes.changes | 45 + libreoffice-icon-themes.spec | 5 +- libreoffice-l10n.changes | 45 + libreoffice-l10n.spec | 89 +- libreoffice-l10n.spec.in | 4 +- libreoffice-poppler-0.17.0-reject-fix.diff | 1278 ++++++++++++++++- libreoffice-translations-3.6.3.2.4.tar.bz2 | 3 - libreoffice-translations-4.0.2.2.1.tar.xz | 3 + libreoffice.changes | 404 ++++++ libreoffice.spec | 635 +++----- libvisio-0.0.25.tar.bz2 | 3 + lo-provides | 7 +- lo-requires | 6 +- mediawiki-no-broken-help.diff | 4 +- nlpsolver-no-broken-help.diff | 4 +- officecfg-defaul-export-ms-file-formats.diff | 29 - pack-addressbook.diff | 22 - pack-desktop-files-for-optional-filters.diff | 11 +- pyuno-path.diff | 15 - scripting-prefer-internal-rhino.diff | 58 +- sdext-disable-failing-xpdf-test.diff | 25 - sdext-poppler-0.21.0.diff | 14 - sdext-poppler-0.21.1.diff | 33 - sofficerc-upstream | 10 +- solenv-java-source-version.diff | 2 +- split-help-buildhack-no-vcl.diff | 17 + split-icons-search-usr-share.diff | 75 +- system-python-ure-bootstrap.diff | 15 - system-pyuno.diff | 41 + touch-no-dereference.diff | 37 + 93 files changed, 3041 insertions(+), 1859 deletions(-) create mode 100644 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz delete mode 100644 061a9f17323117c9358ed60f33ecff78-postgresql-9.1.1.tar.bz2 delete mode 100644 0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz create mode 100644 27211596cf0ad97cab7321239406fde0-gdocs_3.0.1_modified.oxt delete mode 100644 327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz delete mode 100644 3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz delete mode 100644 3c0037fb07dea2f0bbae8386fa7c6a9a-libcdr-0.0.9.tar.bz2 create mode 100644 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz delete mode 100644 48d8169acc35f97e05d8dcdfd45be7f2-lucene-2.3.2.tar.gz create mode 100644 54e578c91b1b68e69c72be22adcb2195-liblangtag-0.4.0.tar.bz2 delete mode 100644 6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2 create mode 100644 7c53f83e0327343f4060c0eb83842daf-icu4c-49_1_1-src.tgz create mode 100644 861ef15fa0bc018f9ddc932c4ad8b6dd-lcms2-2.4.tar.gz delete mode 100644 86261f06c097d3e425a2f6d0b0635380-hyphen-2.8.3.tar.gz create mode 100644 8755aac23317494a9028569374dc87b2-liborcus_0.3.0.tar.bz2 delete mode 100644 94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2 create mode 100644 README-draw-extensions.txt create mode 100644 a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz delete mode 100644 ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip create mode 100644 b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz create mode 100644 b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt delete mode 100644 b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt create mode 100644 bridges-missing-cxxflags.diff delete mode 100644 build-helpcontent-do-not-check-cups.diff create mode 100644 build-max-64-jobs.diff create mode 100644 build_prepare.inc delete mode 100644 c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2 create mode 100644 c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 delete mode 100644 cea0f63d5985ba4fcbd882031df44346-gdocs_3.0.0_modified.oxt delete mode 100644 d7a242ca43e33e1b63d3073f9d46a6a8-librsvg-2.32.1.tar.gz create mode 100644 dc3d21a3921931096d6e80f6701f6763-libexttextcat-3.4.0.tar.bz2 delete mode 100644 do-not-delete-PropertyMapEntry-instance.diff delete mode 100644 e1e255dc43dbcbb34cb19e8a0eba90ae-mythes-1.2.2.tar.gz create mode 100644 e7f84e3199dfee9122949448cab3823f-libwpd-0.9.6.tar.bz2 create mode 100644 f5ef3f7f10fa8c3542c6a085a233080b-graphite2-1.2.0.tgz create mode 100644 fc188d2ed5c2cbcf7a021b34b9f88478-icudt49l-subset.zip delete mode 100644 fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz delete mode 100644 install-with-vendor-SUSE.diff create mode 100644 libcdr-0.0.11.tar.bz2 create mode 100644 libmspub-0.0.5.tar.bz2 create mode 100644 libreoffice-4.0.2.2.1.tar.xz delete mode 100644 libreoffice-binfilter-3.6.3.2.4.tar.bz2 delete mode 100644 libreoffice-core-3.6.3.2.4.tar.bz2 delete mode 100644 libreoffice-help-3.6.3.2.4.tar.bz2 create mode 100644 libreoffice-help-4.0.2.2.1.tar.xz delete mode 100644 libreoffice-translations-3.6.3.2.4.tar.bz2 create mode 100644 libreoffice-translations-4.0.2.2.1.tar.xz create mode 100644 libvisio-0.0.25.tar.bz2 delete mode 100644 officecfg-defaul-export-ms-file-formats.diff delete mode 100644 pack-addressbook.diff delete mode 100644 pyuno-path.diff delete mode 100644 sdext-disable-failing-xpdf-test.diff delete mode 100644 sdext-poppler-0.21.0.diff delete mode 100644 sdext-poppler-0.21.1.diff create mode 100644 split-help-buildhack-no-vcl.diff delete mode 100644 system-python-ure-bootstrap.diff create mode 100644 system-pyuno.diff create mode 100644 touch-no-dereference.diff diff --git a/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz b/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz new file mode 100644 index 0000000..9abd3a2 --- /dev/null +++ b/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776 +size 96939 diff --git a/061a9f17323117c9358ed60f33ecff78-postgresql-9.1.1.tar.bz2 b/061a9f17323117c9358ed60f33ecff78-postgresql-9.1.1.tar.bz2 deleted file mode 100644 index fceec2f..0000000 --- a/061a9f17323117c9358ed60f33ecff78-postgresql-9.1.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c794016bcf3fc1f561bc86796c6c9d050e3d8d2d55356515126e048275ae56f2 -size 14884071 diff --git a/0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz b/0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz deleted file mode 100644 index 5dec849..0000000 --- a/0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a4ace7c0280e5ee8d4941b33449ee10edf1515437483d55ae387cc4de2c2bea0 -size 432064 diff --git a/27211596cf0ad97cab7321239406fde0-gdocs_3.0.1_modified.oxt b/27211596cf0ad97cab7321239406fde0-gdocs_3.0.1_modified.oxt new file mode 100644 index 0000000..1624f13 --- /dev/null +++ b/27211596cf0ad97cab7321239406fde0-gdocs_3.0.1_modified.oxt @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a8a8a9ad79352f4d07ec162a356955dde3d3efb808bbc0d8a432ff150c2d09e1 +size 2603105 diff --git a/327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz b/327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz deleted file mode 100644 index 0329a6b..0000000 --- a/327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3ea177bbde947be5b9256b817d1cf98ab9c67c558b35703c48f5dbf8e0afafe4 -size 4461644 diff --git a/3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz b/3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz deleted file mode 100644 index 78bf189..0000000 --- a/3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:643c5307a3fdc31754a18c8c1398d4036a107e4bdc03d9a265fcadfc85d4a07a -size 4352127 diff --git a/3c0037fb07dea2f0bbae8386fa7c6a9a-libcdr-0.0.9.tar.bz2 b/3c0037fb07dea2f0bbae8386fa7c6a9a-libcdr-0.0.9.tar.bz2 deleted file mode 100644 index 4bb5df8..0000000 --- a/3c0037fb07dea2f0bbae8386fa7c6a9a-libcdr-0.0.9.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7394e8a88cbe70195b8111b8bcd42080825a8a4d7a61d613af6416dcbbfef760 -size 682455 diff --git a/46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz b/46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz new file mode 100644 index 0000000..6fc6394 --- /dev/null +++ b/46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:92383930f110d691a38b64684d96cb4f30d7f0550dbcfe8b227ca5c7a33fb838 +size 4910188 diff --git a/48d8169acc35f97e05d8dcdfd45be7f2-lucene-2.3.2.tar.gz b/48d8169acc35f97e05d8dcdfd45be7f2-lucene-2.3.2.tar.gz deleted file mode 100644 index afddfa1..0000000 --- a/48d8169acc35f97e05d8dcdfd45be7f2-lucene-2.3.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5a0cd4a6e33a24ee11d3bfde50e9bbcfc237afa5d20713ffd994f90bdde193c3 -size 4603398 diff --git a/54e578c91b1b68e69c72be22adcb2195-liblangtag-0.4.0.tar.bz2 b/54e578c91b1b68e69c72be22adcb2195-liblangtag-0.4.0.tar.bz2 new file mode 100644 index 0000000..268cce2 --- /dev/null +++ b/54e578c91b1b68e69c72be22adcb2195-liblangtag-0.4.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cbb71d5d1af345c3bd9ceebbc78ddfbe70e3747c3cf95532a4fdef2abb034bae +size 613182 diff --git a/6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2 b/6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2 deleted file mode 100644 index 1c02a41..0000000 --- a/6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae12a40ebc03843bca8fdf4fe0d6376375d499d51ba34fa7d25d9c7344dfe69e -size 1088522 diff --git a/7c53f83e0327343f4060c0eb83842daf-icu4c-49_1_1-src.tgz b/7c53f83e0327343f4060c0eb83842daf-icu4c-49_1_1-src.tgz new file mode 100644 index 0000000..9c861a0 --- /dev/null +++ b/7c53f83e0327343f4060c0eb83842daf-icu4c-49_1_1-src.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6f079e9bd92d9eddc3fcdeb943408c4bfd3d25a569a7060c9221f174403cdf1 +size 19001722 diff --git a/861ef15fa0bc018f9ddc932c4ad8b6dd-lcms2-2.4.tar.gz b/861ef15fa0bc018f9ddc932c4ad8b6dd-lcms2-2.4.tar.gz new file mode 100644 index 0000000..7238a52 --- /dev/null +++ b/861ef15fa0bc018f9ddc932c4ad8b6dd-lcms2-2.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a514d10eff26901505c191a15c2588c751eb7fb86577118f6c235aff0be37e8 +size 4293291 diff --git a/86261f06c097d3e425a2f6d0b0635380-hyphen-2.8.3.tar.gz b/86261f06c097d3e425a2f6d0b0635380-hyphen-2.8.3.tar.gz deleted file mode 100644 index ed90a93..0000000 --- a/86261f06c097d3e425a2f6d0b0635380-hyphen-2.8.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:21c461c558c61a51f24d35a48e2bf3b3bebf27ffc361f99bec45496903938c42 -size 614264 diff --git a/8755aac23317494a9028569374dc87b2-liborcus_0.3.0.tar.bz2 b/8755aac23317494a9028569374dc87b2-liborcus_0.3.0.tar.bz2 new file mode 100644 index 0000000..98e1a1f --- /dev/null +++ b/8755aac23317494a9028569374dc87b2-liborcus_0.3.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:30829484b2328d0666c859b32370d3826b3468f3945d054abdac8234f4083c77 +size 1373518 diff --git a/94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2 b/94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2 deleted file mode 100644 index fa573b1..0000000 --- a/94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4980e2815275985d0922eb8cc5f8d6c5797bd2239f559191dcad6874ea7089c3 -size 388940 diff --git a/README-draw-extensions.txt b/README-draw-extensions.txt new file mode 100644 index 0000000..aa3a459 --- /dev/null +++ b/README-draw-extensions.txt @@ -0,0 +1,9 @@ +Dear customer, + +the PDF import extension has been integrated into the main application. +The result is that this package is empty. We keep it for future use +because it makes the maintenance process easier. + + +Sincerely, +Your SUSE team diff --git a/README-mono.txt b/README-mono.txt index bd4f19f..382da0c 100644 --- a/README-mono.txt +++ b/README-mono.txt @@ -5,4 +5,4 @@ provide it in a later bugfix release. Thanks for understanding. Sincerely, -Your openSUSE team +Your SUSE team diff --git a/README-scsolver.txt b/README-scsolver.txt index 20acd13..8a22035 100644 --- a/README-scsolver.txt +++ b/README-scsolver.txt @@ -7,5 +7,5 @@ Thanks for understanding. Have a good experience with the upstream solver, - Your openSUSE team + Your SUSE team diff --git a/a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz b/a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz new file mode 100644 index 0000000..db23321 --- /dev/null +++ b/a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eeffe2d931217efc4c0a5ea0a1e46d843a4c65b2346f22e543d619da7282562e +size 636667 diff --git a/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip b/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip deleted file mode 100644 index 2947211..0000000 --- a/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:64f8d737c32756713d60c22efe3978a59fa167cdeaa2d3d0a1646b1f2232b825 -size 2732347 diff --git a/b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz b/b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz new file mode 100644 index 0000000..c15ed26 --- /dev/null +++ b/b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8c1271cba2494d8c52bba08fa3b14cdca7401b5f90faacb8b206364c84233ffb +size 515564 diff --git a/b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt b/b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt new file mode 100644 index 0000000..dff9cf7 --- /dev/null +++ b/b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1568ed1d2feb8210bb5de61d69574a165cded536cfa17c6953c9064076469de2 +size 70349 diff --git a/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt b/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt deleted file mode 100644 index c4fb8de..0000000 --- a/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:27ac68831ff430882b29a23e4af041fff646c1bfd143b76cd1b1ecbc09e0f29d -size 72340 diff --git a/bridges-missing-cxxflags.diff b/bridges-missing-cxxflags.diff new file mode 100644 index 0000000..1341b2f --- /dev/null +++ b/bridges-missing-cxxflags.diff @@ -0,0 +1,11 @@ +--- bridges/Library_gcc3_linux_intel.mk.old 2012-12-18 16:11:42.000000000 +0100 ++++ bridges/Library_gcc3_linux_intel.mk 2013-01-04 18:14:38.000000000 +0100 +@@ -69,7 +69,7 @@ $(eval $(call gb_Library_add_exception_o + + $(eval $(call gb_Library_add_cxxobjects,gcc3_uno,\ + bridges/source/cpp_uno/shared/cppinterfaceproxy \ +- , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ ++ , $(CXXFLAGS) $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ + )) + + # vim: set noet sw=4 ts=4: diff --git a/build-helpcontent-do-not-check-cups.diff b/build-helpcontent-do-not-check-cups.diff deleted file mode 100644 index ddcf39b..0000000 --- a/build-helpcontent-do-not-check-cups.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: configure.in -=================================================================== ---- configure.in.orig -+++ configure.in -@@ -150,7 +150,7 @@ dnl ==================================== - #defaults unless the os test overrides this: - test_randr=yes - test_xrender=yes --test_cups=yes -+test_cups=no - test_fontconfig=yes - test_cairo=yes - diff --git a/build-max-64-jobs.diff b/build-max-64-jobs.diff new file mode 100644 index 0000000..f7b6ed0 --- /dev/null +++ b/build-max-64-jobs.diff @@ -0,0 +1,17 @@ +Index: configure.ac +=================================================================== +--- configure.ac.orig ++++ configure.ac +@@ -11999,6 +11999,12 @@ if test "$no_parallelism_make" = "YES" & + fi + fi + ++if test $PARALLELISM -gt 64 ; then ++ AC_MSG_WARN([dmake does not work with more than 64 jobs, reducing parallelism to 64.]) ++ add_warning "dmake does not work with more than 64 jobs, reducing parallelism to 64." ++ PARALLELISM="64" ++fi ++ + AC_MSG_RESULT([$PARALLELISM]) + AC_SUBST(PARALLELISM) + diff --git a/build_prepare.inc b/build_prepare.inc new file mode 100644 index 0000000..19fcf4d --- /dev/null +++ b/build_prepare.inc @@ -0,0 +1,79 @@ +%if %prepare_build != 0 +# first build make-3.82 +%if 0%{?suse_version} < 01230 +cd make-* +CFLAGS=$RPM_OPT_FLAGS ./configure +make %{?_smp_mflags} +cd - +%endif +# second build zip-3.0 on older distributions +%if %suse_version < 1140 +cd zip30 +make %{?jobs:-j%jobs} -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc +cd - +%endif +# +# Parallel build settings ... +lo_jobs="%{?jobs:%jobs}" +%ifarch %arm +%if ! 0%{?qemu_user_space_build:1} +# native hardware is not that powerful +lo_jobs="1" +%endif +%endif +# do not eat all memory +echo "Available memory:" +free +echo "System limits:" +ulimit -a +lo_jobs_reduced= +if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then + if test `uname -i` = "x86_64" ; then + mem_per_process=1000 + else + mem_per_process=600 + fi +%if 0%{?qemu_user_space_build:1} + mem_per_process=1200 +%endif + max_mem=`LANG=C free -t -m | sed -n "s|^Mem: *\([0-9]*\).*$|\1|p"` + max_jobs="$(($max_mem / $mem_per_process))" + test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits" + test "$lo_jobs" -le 0 && lo_jobs=1 && echo "Warning: Do not use the parallel build at all becuse of memory limits" +fi +# finally set jobs +PARALLEL_BUILD= +if test -n "$lo_jobs" ; then + PARALLEL_BUILD="--with-parallelism=$lo_jobs" +fi +# using icecream +if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then + PARALLEL_BUILD="$PARALLEL_BUILD --enable-icecream" +fi +%endif +# make sure that JAVA_HOME is set correctly +%if 0%{?suse_version} +source /etc/profile.d/alljava.sh +%endif +# use RPM_OPT_FLAGS, ... +# FIXME: -fno-omit-frame-pointer is needed in LO-4.0; the order of compliation flags is already fixed in master for LO-4.1 +# The current situation causes build (bridge test) failure on i586 systems +ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-fexceptions//g'` -fno-strict-aliasing -fno-omit-frame-pointer" +CFLAGS="$ARCH_FLAGS" +CXXFLAGS="$ARCH_FLAGS" +export ARCH_FLAGS CFLAGS CXXFLAGS +# FIXME: genccode from the system icu is in /usr/sbin +# FIXME: we need make-3.82 for parallel build +%if 0%{?suse_version} < 01230 +export PATH="$RPM_BUILD_DIR/libreoffice-%version/make-%gnu_make_version-gbuild:$PATH:/usr/sbin" +%endif +# use the extra built zip-3.0 on older distributions +%if %suse_version < 1140 +export PATH="$RPM_BUILD_DIR/libreoffice-%version/zip30:$PATH" +%endif +# Whack in our python2 so we don't have to use internal one +# which is quite nightmare. +export PYTHON=/usr/bin/python +export PYTHON_CFLAGS=`pkg-config --cflags python` +export PYTHON_LIBS=`pkg-config --libs python` + diff --git a/c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2 b/c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2 deleted file mode 100644 index 0ee0513..0000000 --- a/c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7895f0cf07ac98bd88f6d5cf26ba7f1d72fd8acaeb43b27ffa24846fccc80343 -size 629054 diff --git a/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 b/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 new file mode 100644 index 0000000..1586ae8 --- /dev/null +++ b/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461 +size 16113737 diff --git a/cea0f63d5985ba4fcbd882031df44346-gdocs_3.0.0_modified.oxt b/cea0f63d5985ba4fcbd882031df44346-gdocs_3.0.0_modified.oxt deleted file mode 100644 index d64160a..0000000 --- a/cea0f63d5985ba4fcbd882031df44346-gdocs_3.0.0_modified.oxt +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4a1b995fc558bea6e1d85cb6a371bd8ecd60ed5ff4b8bfa66e4465ee396fd8ac -size 2262874 diff --git a/d7a242ca43e33e1b63d3073f9d46a6a8-librsvg-2.32.1.tar.gz b/d7a242ca43e33e1b63d3073f9d46a6a8-librsvg-2.32.1.tar.gz deleted file mode 100644 index 27e310b..0000000 --- a/d7a242ca43e33e1b63d3073f9d46a6a8-librsvg-2.32.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:92565e1283cd9834bfef155ba29ff6f4e62699ef0debdf86687e21e9fbc9b68e -size 636510 diff --git a/dc3d21a3921931096d6e80f6701f6763-libexttextcat-3.4.0.tar.bz2 b/dc3d21a3921931096d6e80f6701f6763-libexttextcat-3.4.0.tar.bz2 new file mode 100644 index 0000000..eb428c8 --- /dev/null +++ b/dc3d21a3921931096d6e80f6701f6763-libexttextcat-3.4.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c1f668f29f00024bf91387c2de65a80c47d9db4561083c054d7fb95b45b51abb +size 1088762 diff --git a/do-not-delete-PropertyMapEntry-instance.diff b/do-not-delete-PropertyMapEntry-instance.diff deleted file mode 100644 index f36df54..0000000 --- a/do-not-delete-PropertyMapEntry-instance.diff +++ /dev/null @@ -1,75 +0,0 @@ -From 4153bcbc8e568e8e33c56bab68e9ea036c5dce5b Mon Sep 17 00:00:00 2001 -From: Kohei Yoshida -Date: Thu, 24 Jan 2013 22:24:44 -0500 -Subject: [PATCH] bnc#798271: Don't delete the PropertyMapEntry instance - prematurely. - -When using comphelper::PropertyMapEntry array to create a UNO property -set, we need to make sure we keep this instance while the property set -object is alive, else it would cause a very hard-to-debug problem down -the road... - -In this particular case, the aExportInfoMap array instance was destroyed -when it went out of scope, but the xInfoSet which references it was used -afterward. - -Change-Id: I02132b6b2e6bef7b461f0f77c2c4a3e911e42014 ---- - chart2/source/model/filter/XMLFilter.cxx | 40 +++++++++++++++----------------- - 1 file changed, 19 insertions(+), 21 deletions(-) - -diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx -index 2a6e35b..551e9b2 100644 ---- a/chart2/source/model/filter/XMLFilter.cxx -+++ b/chart2/source/model/filter/XMLFilter.cxx -@@ -644,28 +644,26 @@ sal_Int32 XMLFilter::impl_Export( - xServiceFactory->createInstanceWithArguments( - C2U("com.sun.star.comp.Svx.GraphicExportHelper"), aGraphicResolverArgs ), uno::UNO_QUERY ); - -- uno::Reference< beans::XPropertySet > xInfoSet; -+ // property map for export info set -+ comphelper::PropertyMapEntry aExportInfoMap[] = - { -- // property map for export info set -- comphelper::PropertyMapEntry aExportInfoMap[] = -- { -- { MAP_LEN("UsePrettyPrinting"), 0, &::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0}, -- { MAP_LEN("BaseURI"), 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, -- { MAP_LEN("StreamRelPath"), 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, -- { MAP_LEN("StreamName"), 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, -- { MAP_LEN("ExportTableNumberList"), 0, &::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0 }, -- { NULL, 0, 0, NULL, 0, 0 } -- }; -- -- xInfoSet = comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo( aExportInfoMap ) ); -- -- SvtSaveOptions aSaveOpt; -- OUString sUsePrettyPrinting(RTL_CONSTASCII_USTRINGPARAM("UsePrettyPrinting")); -- sal_Bool bUsePrettyPrinting( aSaveOpt.IsPrettyPrinting() ); -- xInfoSet->setPropertyValue( sUsePrettyPrinting, uno::makeAny( bUsePrettyPrinting ) ); -- if( ! bOasis ) -- xInfoSet->setPropertyValue( C2U("ExportTableNumberList"), uno::makeAny( true )); -- } -+ { MAP_LEN("UsePrettyPrinting"), 0, &::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0}, -+ { MAP_LEN("BaseURI"), 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, -+ { MAP_LEN("StreamRelPath"), 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, -+ { MAP_LEN("StreamName"), 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, -+ { MAP_LEN("ExportTableNumberList"), 0, &::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0 }, -+ { NULL, 0, 0, NULL, 0, 0 } -+ }; -+ -+ uno::Reference< beans::XPropertySet > xInfoSet = -+ comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo( aExportInfoMap ) ); -+ -+ SvtSaveOptions aSaveOpt; -+ OUString sUsePrettyPrinting(RTL_CONSTASCII_USTRINGPARAM("UsePrettyPrinting")); -+ sal_Bool bUsePrettyPrinting( aSaveOpt.IsPrettyPrinting() ); -+ xInfoSet->setPropertyValue( sUsePrettyPrinting, uno::makeAny( bUsePrettyPrinting ) ); -+ if( ! bOasis ) -+ xInfoSet->setPropertyValue( C2U("ExportTableNumberList"), uno::makeAny( true )); - - sal_Int32 nArgs = 2; - if( xGraphicObjectResolver.is()) --- -1.8.0.2 - diff --git a/e1e255dc43dbcbb34cb19e8a0eba90ae-mythes-1.2.2.tar.gz b/e1e255dc43dbcbb34cb19e8a0eba90ae-mythes-1.2.2.tar.gz deleted file mode 100644 index 1efbde2..0000000 --- a/e1e255dc43dbcbb34cb19e8a0eba90ae-mythes-1.2.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1a1bec56d05b52a9fcc94ce7c53eb3c85defcb6b7770448d79b8be0a62e85677 -size 4906938 diff --git a/e7f84e3199dfee9122949448cab3823f-libwpd-0.9.6.tar.bz2 b/e7f84e3199dfee9122949448cab3823f-libwpd-0.9.6.tar.bz2 new file mode 100644 index 0000000..1d08aeb --- /dev/null +++ b/e7f84e3199dfee9122949448cab3823f-libwpd-0.9.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:87081d5a81fb08e3aae88dc959aec769c4c62df44b59d5f9c0561f039cc9db6b +size 675826 diff --git a/f5ef3f7f10fa8c3542c6a085a233080b-graphite2-1.2.0.tgz b/f5ef3f7f10fa8c3542c6a085a233080b-graphite2-1.2.0.tgz new file mode 100644 index 0000000..98fb831 --- /dev/null +++ b/f5ef3f7f10fa8c3542c6a085a233080b-graphite2-1.2.0.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:630fba251c7e570f2b0c4a0c63a7abb4d45b0246d390f53188b1a9b73de7b96e +size 4663935 diff --git a/fc188d2ed5c2cbcf7a021b34b9f88478-icudt49l-subset.zip b/fc188d2ed5c2cbcf7a021b34b9f88478-icudt49l-subset.zip new file mode 100644 index 0000000..42a2131 --- /dev/null +++ b/fc188d2ed5c2cbcf7a021b34b9f88478-icudt49l-subset.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bbd8b4f5a9f94cd55fd069f11bf79be9e2e290867ae7499c52930f9ac55ef2b4 +size 4859398 diff --git a/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz b/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz deleted file mode 100644 index f664186..0000000 --- a/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e6bcbfc521d23899511799c912ce21fbc003d55c3d56408e3c8dabf20fea8256 -size 547217 diff --git a/install-with-vendor-SUSE.diff b/install-with-vendor-SUSE.diff deleted file mode 100644 index d37061d..0000000 --- a/install-with-vendor-SUSE.diff +++ /dev/null @@ -1,56 +0,0 @@ ---- bin/distro-install-file-lists.old 2012-07-27 14:37:04.000000000 +0200 -+++ bin/distro-install-file-lists 2012-08-09 14:22:58.000000000 +0200 -@@ -122,7 +122,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; th - merge_flists gid_Module_Optional_OGLTrans $FILELISTSDIR/common_list.txt - fi - -- if test "$SPLIT_APP_MODULES" = "YES" -a "$OOO_VENDOR" = "Novell, Inc." ; then -+ if test "$SPLIT_APP_MODULES" = "YES" -a "$OOO_VENDOR" = "SUSE" ; then - # move the prebuilt icons into a hacky temporary package - # we want to repack them into a noarch package as soon as possible - # without the build dependency on the huge devel package -@@ -164,7 +164,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; th - # lang packs - for lang in `echo $WITH_LANG_LIST | sed -e s/-/_/g`; do - lang_lists= -- if test "$OOO_VENDOR" = "Mandriva" -o \( "$OOO_VENDOR" = "Novell, Inc." -a "$SPLIT_APP_MODULES" = "YES" \) ; then -+ if test "$OOO_VENDOR" = "Mandriva" -o \( "$OOO_VENDOR" = "SUSE" -a "$SPLIT_APP_MODULES" = "YES" \) ; then - test -f gid_Module_Langpack_Basis_$lang && lang_lists="$lang_lists gid_Module_Langpack_Basis_$lang" || : - test -f gid_Module_Langpack_Brand_$lang && lang_lists="$lang_lists gid_Module_Langpack_Brand_$lang" || : - test -f gid_Module_Langpack_Resource_$lang && lang_lists="$lang_lists gid_Module_Langpack_Resource_$lang" || : -@@ -197,7 +197,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; th - fi - # some help files are in _Langpack_{Writer,Impress,...}_ - # move them from -l10n to -help -- if test "$OOO_VENDOR" = "Mandriva" -o \( "$OOO_VENDOR" = "Novell, Inc." -a "$SPLIT_APP_MODULES" = "YES" \) ; then -+ if test "$OOO_VENDOR" = "Mandriva" -o \( "$OOO_VENDOR" = "SUSE" -a "$SPLIT_APP_MODULES" = "YES" \) ; then - for lang in `echo $WITH_LANG_LIST | sed -e s/-/_/g`; do - test -f $FILELISTSDIR/help_${lang}_list.txt || continue; - mv_file_between_flists $FILELISTSDIR/help_${lang}_list.txt $FILELISTSDIR/lang_${lang}_list.txt $INSTALLDIR/help/.* -@@ -206,7 +206,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; th - fi - done - -- if test -f $FILELISTSDIR/lang_en_US_list.txt -a "$OOO_VENDOR" = "Novell, Inc." -a "$SPLIT_APP_MODULES" != "YES" ; then -+ if test -f $FILELISTSDIR/lang_en_US_list.txt -a "$OOO_VENDOR" = "SUSE" -a "$SPLIT_APP_MODULES" != "YES" ; then - cat $FILELISTSDIR/lang_en_US_list.txt >>$FILELISTSDIR/common_list.txt - rm $FILELISTSDIR/lang_en_US_list.txt - fi -@@ -272,7 +272,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; th - add_used_directories $flist common_list.txt - fi - -- if test "z$OOO_VENDOR" = "zNovell, Inc." ; then -+ if test "z$OOO_VENDOR" = "zSUSE" ; then - # officebean subpackage - test -f $DESTDIR/gid_Module_Optional_Extensions_Script_Provider_For_Beanshell && cp $DESTDIR/gid_Module_Optional_Extensions_Script_Provider_For_Beanshell officebean_list.txt || : - mv_file_between_flists officebean_list.txt common_list.txt $INSTALLDIR/program/classes/officebean.jar -@@ -541,7 +541,7 @@ fi - - # mark the config files - RPM_CONFIG_FILE_TAGS= --if test "$OOO_VENDOR" = "Novell, Inc." -o "$OOO_VENDOR" = "RedHat"; then -+if test "$OOO_VENDOR" = "SUSE" -o "$OOO_VENDOR" = "RedHat"; then - RPM_CONFIG_FILE_TAGS="%config" - elif test "$OOO_VENDOR" = "PLD" ; then - RPM_CONFIG_FILE_TAGS="%config(noreplace) %verify(not md5 size mtime)" diff --git a/libcdr-0.0.11.tar.bz2 b/libcdr-0.0.11.tar.bz2 new file mode 100644 index 0000000..e267ef1 --- /dev/null +++ b/libcdr-0.0.11.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:213eeb7be856a97b7dc2b8bcc9af63484ea90231d950ff490e9c08cb86d8b62f +size 687939 diff --git a/libmspub-0.0.5.tar.bz2 b/libmspub-0.0.5.tar.bz2 new file mode 100644 index 0000000..7bfaa9e --- /dev/null +++ b/libmspub-0.0.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:94c19838cc9c120ed04c2a5ea0c751ee74604e95b76163d1771efc6024139c25 +size 428286 diff --git a/libreoffice-4.0.2.2.1.tar.xz b/libreoffice-4.0.2.2.1.tar.xz new file mode 100644 index 0000000..6b70eaf --- /dev/null +++ b/libreoffice-4.0.2.2.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:039c48253804e5ffc73d441ff152de78f0ff8fc67155e543687fba4c5f1184ae +size 104534248 diff --git a/libreoffice-binfilter-3.6.3.2.4.tar.bz2 b/libreoffice-binfilter-3.6.3.2.4.tar.bz2 deleted file mode 100644 index a176a34..0000000 --- a/libreoffice-binfilter-3.6.3.2.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b5a558f79ff295ad7c0ef06b9c48c17978779f66a69d74d7136d715d51f3c46d -size 6441587 diff --git a/libreoffice-branding-upstream.changes b/libreoffice-branding-upstream.changes index 1fd7817..6ae3690 100644 --- a/libreoffice-branding-upstream.changes +++ b/libreoffice-branding-upstream.changes @@ -1,3 +1,51 @@ +------------------------------------------------------------------- +Wed Apr 17 10:10:05 UTC 2013 - pmladek@suse.com + +- update to 4.0.2.2.1 (SUSE 4.0-rc1, tag suse-4.0-1, based on upstream 4.0.2.2) + +------------------------------------------------------------------- +Wed Apr 3 13:17:12 UTC 2013 - pmladek@suse.com + +- update to 4.0.2.2 + +------------------------------------------------------------------- +Tue Mar 19 18:04:38 UTC 2013 - pmladek@suse.com + +- update to 4.0.2.1 + +------------------------------------------------------------------- +Thu Feb 28 10:27:15 UTC 2013 - pmladek@suse.com + +- update to 4.0.1.2 + +------------------------------------------------------------------- +Thu Feb 21 10:27:15 UTC 2013 - tchvatal@suse.com + +- update to 4.0.1.1: + * new upstream branding + +------------------------------------------------------------------- +Tue Jan 22 12:28:43 UTC 2013 - tchvatal@suse.com + +- update to 4.0.0.3 + +------------------------------------------------------------------- +Wed Jan 9 15:31:16 UTC 2013 - tchvatal@suse.com + +- update to 4.0.0.1 + +------------------------------------------------------------------- +Wed Dec 19 13:14:12 UTC 2012 - tchvatal@suse.com + +- update to 4.0.0.0.beta2 + +------------------------------------------------------------------- +Wed Dec 19 09:01:42 UTC 2012 - tchvatal@suse.com + +- update to 4.0.0.0.beta1 +- use xz tarballs instead of bz ones +- add "xz" to BuildRequires; explicitly needed on older SUSE versions + ------------------------------------------------------------------- Fri Dec 14 16:08:15 UTC 2012 - pmladek@suse.com diff --git a/libreoffice-branding-upstream.spec b/libreoffice-branding-upstream.spec index 63fab67..1d2ef3d 100644 --- a/libreoffice-branding-upstream.spec +++ b/libreoffice-branding-upstream.spec @@ -16,8 +16,9 @@ # + Name: libreoffice-branding-upstream -Version: 3.6.3.2.4 +Version: 4.0.2.2.1 Release: 0 %define lo_home libreoffice Summary: Original Branding for LibreOffice @@ -34,11 +35,12 @@ Conflicts: otherproviders(libreoffice-branding) Supplements: packageand(branding-upstream:libreoffice) %endif Url: http://www.documentfoundation.org/ -Source0: libreoffice-core-%version.tar.bz2 +Source0: libreoffice-%version.tar.xz +BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build #!ExclusiveArch: %ix86 x86_64 ppc BuildArch: noarch -#BRAND: source: libreoffice-core.tar.bz2:libreoffice-core/default_images/brand/intro.png +#BRAND: source: libreoffice.tar.xz:libreoffice/default_images/brand/intro.png #BRAND: type: PNG image data, 440 x 286, 8-bit/color RGB, non-interlaced #BRAND: purpose: "splash" image displayed for a short time, when the application is launching #BRAND: text: should mention the app name "LibreOffice" @@ -47,7 +49,7 @@ BuildArch: noarch #BRAND: the default progress bar color is 0,0,128 (blue) #BRAND: the progress bar has 1 pixel width white border # -#BRAND: source: libreoffice-core.tar.bz2:libreoffice-core/default_images/brand/shell/about.svg +#BRAND: source: libreoffice.tar.xz:libreoffice/default_images/brand/shell/about.svg #BRAND: type: SVG image data, 486 x 322 #BRAND: purpose: background for the the Help/About LibreOffice dialog #BRAND: text: no space for text; all text is written by the application @@ -57,7 +59,7 @@ BuildArch: noarch #BRAND: there are few buttons on the bottom of the dialog #BRAND: the text is black on a white background # -#BRAND: source: libreoffice-core.tar.bz2:src/sofficerc-upstream +#BRAND: source: libreoffice.tar.xz:src/sofficerc-upstream #BRAND: type: text config file (ini-files-like) #BRAND: purpose: defines the position, size and, color of the status bar @@ -68,7 +70,7 @@ office suite. %prep -%setup -q -n libreoffice-core-%version +%setup -q -n libreoffice-%version %build diff --git a/libreoffice-core-3.6.3.2.4.tar.bz2 b/libreoffice-core-3.6.3.2.4.tar.bz2 deleted file mode 100644 index 4e100f2..0000000 --- a/libreoffice-core-3.6.3.2.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:56f817508bccbe4c215e980e909a1b2198c8f1d385cbbb3f6a8c96549038befc -size 132895451 diff --git a/libreoffice-help-3.6.3.2.4.tar.bz2 b/libreoffice-help-3.6.3.2.4.tar.bz2 deleted file mode 100644 index fa614f3..0000000 --- a/libreoffice-help-3.6.3.2.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c70332c66b4f6b534c94a8c8214cc8186dfe8d2ce5e939bc6a67774576add39d -size 1883255 diff --git a/libreoffice-help-4.0.2.2.1.tar.xz b/libreoffice-help-4.0.2.2.1.tar.xz new file mode 100644 index 0000000..11eb761 --- /dev/null +++ b/libreoffice-help-4.0.2.2.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b981d68fa8fd62309223bcf9c2c93ff6466ff79dae5fba9ca9b28f2c4db3423 +size 1855836 diff --git a/libreoffice-help-en-US.changes b/libreoffice-help-en-US.changes index ce3d8d0..453c520 100644 --- a/libreoffice-help-en-US.changes +++ b/libreoffice-help-en-US.changes @@ -1,3 +1,80 @@ +------------------------------------------------------------------- +Wed Apr 17 10:10:05 UTC 2013 - pmladek@suse.com + +- update to 4.0.2.2.1 (SUSE 4.0-rc1, tag suse-4.0-1, based on upstream 4.0.2.2) +- split-help-buildhack-no-vcl.diff: avoid build dependency on vcl + +------------------------------------------------------------------- +Wed Apr 3 13:17:12 UTC 2013 - pmladek@suse.com + +- update to 4.0.2.2 + +------------------------------------------------------------------- +Tue Mar 19 18:04:38 UTC 2013 - pmladek@suse.com + +- update to 4.0.2.1 +- build-max-64-jobs.diff: dmake does not work with more than 64 jobs + +------------------------------------------------------------------- +Thu Feb 28 10:27:15 UTC 2013 - pmladek@suse.com + +- update to 4.0.1.2 + +------------------------------------------------------------------- +Thu Feb 21 10:27:15 UTC 2013 - tchvatal@suse.com + +- update to 4.0.1.1 +- bin obsolete configure-detect-icerun.diff + +------------------------------------------------------------------- +Mon Feb 4 16:38:05 UTC 2013 - pmladek@suse.com + +- configure-detect-icerun.diff: icerun wrapper is not provided by the old + icecream-0.9.2 on SLED11 + +------------------------------------------------------------------- +Tue Jan 22 12:28:43 UTC 2013 - tchvatal@suse.com + +- update to 4.0.0.3 +- build_prepare.inc: share the common build preparation steps between spec files + +------------------------------------------------------------------- +Wed Jan 10 17:14:14 UTC 2013 - tchvatal@suse.com + +- bridges-missing-cxxflags.diff: lost RPM optflags when compiling bridges + +------------------------------------------------------------------- +Wed Jan 9 15:31:16 UTC 2013 - tchvatal@suse.com + +- update to 4.0.0.1 + +------------------------------------------------------------------- +Wed Dec 19 13:14:12 UTC 2012 - tchvatal@suse.com + +- update to 4.0.0.0.beta2 + +------------------------------------------------------------------- +Wed Dec 19 09:01:42 UTC 2012 - tchvatal@suse.com + +- update to 4.0.0.0.beta1 +- remove unused build_module_in_parallel define +- use xz tarballs instead of bz ones +- add "xz" to BuildRequires; explicitly needed on older SUSE versions +- remove obsolete patches: + * build-helpcontent-do-not-check-cups.diff +- remove obsolete configure switches: + * --disable-ldap + * --disable-mozilla + * --disable-fontconfig + * --disable-strip-solver + * --without-stlport + * --with-system-db + * --with-java-target-version=1.5 +- use configure switches: + * --disable-dbus: dbus is not need for help + * --disable-gstreamer-0-10: gstreamer is not needed for help + * --without-system-icu: system ICU is too old on openSUSE < 12.1 + ------------------------------------------------------------------- Fri Dec 14 16:08:15 UTC 2012 - pmladek@suse.com diff --git a/libreoffice-help-en-US.spec b/libreoffice-help-en-US.spec index 2226e79..d22ca13 100644 --- a/libreoffice-help-en-US.spec +++ b/libreoffice-help-en-US.spec @@ -22,17 +22,13 @@ 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.4 +Version: 4.0.2.2.1 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 %define zip_version 3.0 %define lo_langs "" %define lo_home libreoffice -# build_module_in_parallel 0 = no -# 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 # debug_build: 0 = no # 1 = yes (enable depency tracking, ccache) %define debug_build 0 @@ -41,6 +37,7 @@ Release: 0 %define prepare_build 1 #!BuildIgnore: libreoffice # both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22 +BuildRequires: xz BuildRequires: ant BuildRequires: ant-apache-regexp BuildRequires: automake @@ -109,9 +106,10 @@ Summary: American Help Localization for LibreOffice License: LGPL-3.0 Group: Productivity/Office/Suite Url: http://www.documentfoundation.org/ -Source0: libreoffice-core-%version.tar.bz2 -Source1: libreoffice-help-%version.tar.bz2 -Source2: libreoffice-translations-%version.tar.bz2 +Source0: libreoffice-%version.tar.xz +Source1: libreoffice-help-%version.tar.xz +Source2: libreoffice-translations-%version.tar.xz +Source10: build_prepare.inc # make-3.82 is needed for parallel build # this version extends plain make-3.82 with --warn-undefined-functions option # URL: http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/make-3.82-gbuild, snapshot 2011-08-17 @@ -122,8 +120,13 @@ Source31: zip-%zip_version.tar.bz2 Source200: libreoffice-help-en-US.spec.in 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 +# lost RPM optflags when compiling bridges +Patch1: bridges-missing-cxxflags.diff +# dmake does not work with more than 64 jobs +# FIXME: this patch won't be necessary in LO-4.1 where dmake has finally been removed +Patch2: build-max-64-jobs.diff +# try to avoid build depency on vcl +Patch3: split-help-buildhack-no-vcl.diff # # Patches against zip-3.0 Patch2000: zip-3.0-iso8859_2.patch @@ -143,12 +146,12 @@ stuff is in LibreOffice-l10n-en-US. %prep %if %prepare_build == 0 -%setup -D -T -q -n libreoffice-core-%version +%setup -D -T -q -n libreoffice-%version %else -%setup -q -a30 -a31 -n libreoffice-core-%version -%patch0 -bin/unpack-sources `pwd` %{S:1} %{S:2} -# extra fixes +%setup -q -a30 -a31 -b1 -b2 -n libreoffice-%version +%patch1 +%patch2 +%patch3 # # patch zip-3.0 %if %suse_version < 1140 @@ -165,82 +168,7 @@ cd - %endif %build -%if %prepare_build != 0 -# first build make-3.82 -cd make-* -CFLAGS=$RPM_OPT_FLAGS ./configure -make %{?_smp_mflags} -cd - -# -# second build zip-3.0 on older distributions -%if %suse_version < 1140 -cd zip30 -make %{?jobs:-j%jobs} -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc -cd - -%endif -# -# Parallel build settings ... -PARALLEL_BUILD= -BUILD_SCRIPT_FLAGS= -ncpus= -# -# Parallel build settings ... -BUILD_SCRIPT_FLAGS= -# dmake does not work with more than 64 jobs -lo_jobs="%{?jobs:%jobs}" -if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then - echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs" - lo_jobs="64" -fi -# do not eat all memory -lo_jobs_reduced= -if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then - if test `uname -i` = "x86_64" ; then - mem_per_process=300 - else - mem_per_process=200 - fi - max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"` - max_jobs="$(($max_mem / $mem_per_process))" - test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits" - test "$lo_jobs" -le 0 && lo_jobs= && echo "Warning: Do not use the parallel build at all becuse of memory limits" -fi -# finally set jobs -PARALLEL_BUILD= -if test -n "$lo_jobs" ; then - PARALLEL_BUILD="--with-max-jobs=$lo_jobs" - BUILD_SCRIPT_FLAGS="-- -P$lo_jobs" -fi -# parallel build of modules -# it makes sense on machines with more CPUs -num_cpus=`grep ^processor /proc/cpuinfo | wc -l` -# again reduce to 64 CPUs because of dmake -test "$num_cpus" -gt "64" && num_cpus="64" && echo "Warning: dmake does not support more than 64 processes => reducing number of used cpus" -# allow only 2 modules if there more jobs allowed in one module -test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" -PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" -BUILD_SCRIPT_FLAGS="-P$num_cpus $BUILD_SCRIPT_FLAGS" -# using icecream -if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then - PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream" -fi -%endif -# make sure that JAVA_HOME is set correctly -%if 0%{?suse_version} -source /etc/profile.d/alljava.sh -%endif -%if 0%{?meego_version} -export JAVA_HOME=%{java_home} -%endif -# use RPM_OPT_FLAGS, ... -export ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-O[0-9s]//g' -e 's/\-fexceptions//g'` -fno-strict-aliasing" -# FIXME: genccode from the system icu is in /usr/sbin -# FIXME: we need make-3.82 for parallel build -export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/make-%gnu_make_version-gbuild:$PATH:/usr/sbin" -# use the extra built zip-3.0 on older distributions -%if %suse_version < 1140 -export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin" -%endif +%{expand:%(cat %_sourcedir/build_prepare.inc)} %if %prepare_build != 0 ./autogen.sh $PARALLEL_BUILD \ --libdir=%{_libdir} \ @@ -253,9 +181,7 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin" --disable-fetch-external \ --with-external-tar="$RPM_SOURCE_DIR" \ --with-alloc=system \ - --disable-strip-solver \ --with-jdk-home=$JAVA_HOME \ - --with-java-target-version=1.5 \ --with-ant-home=/usr/share/ant \ --without-fonts \ --without-myspell-dicts \ @@ -267,6 +193,8 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin" --disable-evolution2 \ --disable-gstreamer \ --disable-opengl \ + --disable-dbus \ + --disable-gstreamer-0-10 \ --disable-python \ --disable-mono \ --disable-odk \ @@ -274,20 +202,17 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin" %if %debug_build == 0 --disable-ccache \ %endif - --without-stlport \ - --disable-mozilla \ --without-system-mozilla \ +%if %suse_version < 1210 + --without-system-icu \ +%endif --disable-postgresql-sdbc \ - --disable-ldap \ --disable-cups \ - --disable-fontconfig \ --with-system-dicts \ --with-system-libxml \ --with-system-openssl \ - --with-system-icu \ --with-system-cppunit \ --with-system-expat \ - --with-system-db \ --with-system-boost \ --without-system-jpeg %endif @@ -295,7 +220,10 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin" make helpcontent2.all %install -. ./config_host.mk.source +sed '/SOLARVER/!d' config_host.mk > "${RPM_BUILD_ROOT}/config_host.mk.parsed" +sed '/INPATH/!d' config_host.mk >> "${RPM_BUILD_ROOT}/config_host.mk.parsed" +. "${RPM_BUILD_ROOT}/config_host.mk.parsed" +rm -rf "${RPM_BUILD_ROOT}/config_host.mk.parsed" test -z %lo_langs && langs="en-US" || langs=%lo_langs mkdir -p file-lists for lang in $langs ; do @@ -333,4 +261,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 5c08153..e5c226a 100644 --- a/libreoffice-help-en-US.spec.in +++ b/libreoffice-help-en-US.spec.in @@ -1,7 +1,7 @@ # # spec file for package libreoffice-help-en-US # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,17 +18,13 @@ Name: libreoffice-help-en-US @DO_NOT_EDIT_COMMENT@ -Version: 3.6.3.2.4 +Version: 4.0.2.2.1 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 %define zip_version 3.0 %define lo_langs "" %define lo_home libreoffice -# build_module_in_parallel 0 = no -# 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 # debug_build: 0 = no # 1 = yes (enable depency tracking, ccache) %define debug_build 0 @@ -37,6 +33,7 @@ Release: 0 %define prepare_build 1 #!BuildIgnore: libreoffice # both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22 +BuildRequires: xz BuildRequires: ant BuildRequires: ant-apache-regexp BuildRequires: automake @@ -105,9 +102,10 @@ Summary: American Help Localization for LibreOffice License: LGPL-3.0 Group: Productivity/Office/Suite Url: http://www.documentfoundation.org/ -Source0: libreoffice-core-%version.tar.bz2 -Source1: libreoffice-help-%version.tar.bz2 -Source2: libreoffice-translations-%version.tar.bz2 +Source0: libreoffice-%version.tar.xz +Source1: libreoffice-help-%version.tar.xz +Source2: libreoffice-translations-%version.tar.xz +Source10: build_prepare.inc # make-3.82 is needed for parallel build # this version extends plain make-3.82 with --warn-undefined-functions option # URL: http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/make-3.82-gbuild, snapshot 2011-08-17 @@ -118,8 +116,13 @@ Source31: zip-%zip_version.tar.bz2 Source200: libreoffice-help-en-US.spec.in 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 +# lost RPM optflags when compiling bridges +Patch1: bridges-missing-cxxflags.diff +# dmake does not work with more than 64 jobs +# FIXME: this patch won't be necessary in LO-4.1 where dmake has finally been removed +Patch2: build-max-64-jobs.diff +# try to avoid build depency on vcl +Patch3: split-help-buildhack-no-vcl.diff # # Patches against zip-3.0 Patch2000: zip-3.0-iso8859_2.patch @@ -139,12 +142,12 @@ stuff is in LibreOffice-l10n-en-US. %prep %if %prepare_build == 0 -%setup -D -T -q -n libreoffice-core-%version +%setup -D -T -q -n libreoffice-%version %else -%setup -q -a30 -a31 -n libreoffice-core-%version -%patch0 -bin/unpack-sources `pwd` %{S:1} %{S:2} -# extra fixes +%setup -q -a30 -a31 -b1 -b2 -n libreoffice-%version +%patch1 +%patch2 +%patch3 # # patch zip-3.0 %if %suse_version < 1140 @@ -161,82 +164,7 @@ cd - %endif %build -%if %prepare_build != 0 -# first build make-3.82 -cd make-* -CFLAGS=$RPM_OPT_FLAGS ./configure -make %{?_smp_mflags} -cd - -# -# second build zip-3.0 on older distributions -%if %suse_version < 1140 -cd zip30 -make %{?jobs:-j%jobs} -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc -cd - -%endif -# -# Parallel build settings ... -PARALLEL_BUILD= -BUILD_SCRIPT_FLAGS= -ncpus= -# -# Parallel build settings ... -BUILD_SCRIPT_FLAGS= -# dmake does not work with more than 64 jobs -lo_jobs="%{?jobs:%jobs}" -if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then - echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs" - lo_jobs="64" -fi -# do not eat all memory -lo_jobs_reduced= -if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then - if test `uname -i` = "x86_64" ; then - mem_per_process=300 - else - mem_per_process=200 - fi - max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"` - max_jobs="$(($max_mem / $mem_per_process))" - test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits" - test "$lo_jobs" -le 0 && lo_jobs= && echo "Warning: Do not use the parallel build at all becuse of memory limits" -fi -# finally set jobs -PARALLEL_BUILD= -if test -n "$lo_jobs" ; then - PARALLEL_BUILD="--with-max-jobs=$lo_jobs" - BUILD_SCRIPT_FLAGS="-- -P$lo_jobs" -fi -# parallel build of modules -# it makes sense on machines with more CPUs -num_cpus=`grep ^processor /proc/cpuinfo | wc -l` -# again reduce to 64 CPUs because of dmake -test "$num_cpus" -gt "64" && num_cpus="64" && echo "Warning: dmake does not support more than 64 processes => reducing number of used cpus" -# allow only 2 modules if there more jobs allowed in one module -test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" -PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" -BUILD_SCRIPT_FLAGS="-P$num_cpus $BUILD_SCRIPT_FLAGS" -# using icecream -if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then - PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream" -fi -%endif -# make sure that JAVA_HOME is set correctly -%if 0%{?suse_version} -source /etc/profile.d/alljava.sh -%endif -%if 0%{?meego_version} -export JAVA_HOME=%{java_home} -%endif -# use RPM_OPT_FLAGS, ... -export ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-O[0-9s]//g' -e 's/\-fexceptions//g'` -fno-strict-aliasing" -# FIXME: genccode from the system icu is in /usr/sbin -# FIXME: we need make-3.82 for parallel build -export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/make-%gnu_make_version-gbuild:$PATH:/usr/sbin" -# use the extra built zip-3.0 on older distributions -%if %suse_version < 1140 -export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin" -%endif +%{expand:%(cat %_sourcedir/build_prepare.inc)} %if %prepare_build != 0 ./autogen.sh $PARALLEL_BUILD \ --libdir=%{_libdir} \ @@ -249,9 +177,7 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin" --disable-fetch-external \ --with-external-tar="$RPM_SOURCE_DIR" \ --with-alloc=system \ - --disable-strip-solver \ --with-jdk-home=$JAVA_HOME \ - --with-java-target-version=1.5 \ --with-ant-home=/usr/share/ant \ --without-fonts \ --without-myspell-dicts \ @@ -263,6 +189,8 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin" --disable-evolution2 \ --disable-gstreamer \ --disable-opengl \ + --disable-dbus \ + --disable-gstreamer-0-10 \ --disable-python \ --disable-mono \ --disable-odk \ @@ -270,20 +198,17 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin" %if %debug_build == 0 --disable-ccache \ %endif - --without-stlport \ - --disable-mozilla \ --without-system-mozilla \ +%if %suse_version < 1210 + --without-system-icu \ +%endif --disable-postgresql-sdbc \ - --disable-ldap \ --disable-cups \ - --disable-fontconfig \ --with-system-dicts \ --with-system-libxml \ --with-system-openssl \ - --with-system-icu \ --with-system-cppunit \ --with-system-expat \ - --with-system-db \ --with-system-boost \ --without-system-jpeg %endif @@ -291,7 +216,10 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin" make helpcontent2.all %install -. ./config_host.mk.source +sed '/SOLARVER/!d' config_host.mk > "${RPM_BUILD_ROOT}/config_host.mk.parsed" +sed '/INPATH/!d' config_host.mk >> "${RPM_BUILD_ROOT}/config_host.mk.parsed" +. "${RPM_BUILD_ROOT}/config_host.mk.parsed" +rm -rf "${RPM_BUILD_ROOT}/config_host.mk.parsed" test -z %lo_langs && langs="en-US" || langs=%lo_langs mkdir -p file-lists for lang in $langs ; do diff --git a/libreoffice-help-group1.changes b/libreoffice-help-group1.changes index fac85aa..541b2d7 100644 --- a/libreoffice-help-group1.changes +++ b/libreoffice-help-group1.changes @@ -1,3 +1,78 @@ +------------------------------------------------------------------- +Wed Apr 17 10:10:05 UTC 2013 - pmladek@suse.com + +- update to 4.0.2.2.1 (SUSE 4.0-rc1, tag suse-4.0-1, based on upstream 4.0.2.2) +- split-help-buildhack-no-vcl.diff: avoid build dependency on vcl + +------------------------------------------------------------------- +Wed Apr 3 13:17:12 UTC 2013 - pmladek@suse.com + +- update to 4.0.2.2 + +------------------------------------------------------------------- +Tue Mar 19 18:04:38 UTC 2013 - pmladek@suse.com + +- update to 4.0.2.1 +- build-max-64-jobs.diff: dmake does not work with more than 64 jobs + +------------------------------------------------------------------- +Thu Feb 28 10:27:15 UTC 2013 - pmladek@suse.com + +- update to 4.0.1.2 + +------------------------------------------------------------------- +Thu Feb 21 10:27:15 UTC 2013 - tchvatal@suse.com + +- update to 4.0.1.1 +- bin obsolete configure-detect-icerun.diff + +------------------------------------------------------------------- +Mon Feb 4 16:38:05 UTC 2013 - pmladek@suse.com + +- configure-detect-icerun.diff: icerun wrapper is not provided by the old + icecream-0.9.2 on SLED11 + +------------------------------------------------------------------- +Tue Jan 22 12:28:43 UTC 2013 - tchvatal@suse.com + +- update to 4.0.0.3 +- build_prepare.inc: share the common build preparation steps between spec files + +* Jan 10 2013 by tchvatal@suse.com in LibreOffice:Unstable + +- bridges-missing-cxxflags.diff: lost RPM optflags when compiling bridges + +* Jan 9 2013 by tchvatal@suse.com in LibreOffice:Unstable + +- update to 4.0.0.1 + +* Dec 19 2012 by tchvatal@suse.com in LibreOffice:Unstable + +- update to 4.0.0.0.beta2 + +* Dec 19 2012 by tchvatal@suse.com in LibreOffice:Unstable + +- update to 4.0.0.0.beta1 +- remove unused build_module_in_parallel define +- use xz tarballs instead of bz ones +- remove unused python-devel from BuildRequires +- add "xz" to BuildRequires; explicitly needed on older SUSE versions +- remove obsolete patches: + * build-helpcontent-do-not-check-cups.diff +- remove obsolete configure switches: + * --disable-ldap + * --disable-mozilla + * --disable-fontconfig + * --disable-strip-solver + * --without-stlport + * --with-system-db + * --with-java-target-version=1.5 +- use configure switches: + * --disable-dbus: dbus is not need for help + * --disable-gstreamer-0-10: gstreamer is not needed for help + * --disable-python: python is not longer needed for localizing sources + * --without-system-icu: system ICU is too old on openSUSE < 12.1 + ------------------------------------------------------------------- Sat Jan 19 14:31:31 UTC 2013 - dmueller@suse.com diff --git a/libreoffice-help-group1.spec b/libreoffice-help-group1.spec index 9c0f9be..4420b60 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.4 +Version: 4.0.2.2.1 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 @@ -31,10 +31,6 @@ Release: 0 # test_build_langs: 1 = de and cs # 2 = all supported languages %define test_build_langs 2 -# build_module_in_parallel 0 = no -# 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 # debug_build: 0 = no # 1 = yes (enable depency tracking, ccache) %define debug_build 0 @@ -53,6 +49,7 @@ Release: 0 %endif #!BuildIgnore: libreoffice # both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22 +BuildRequires: xz BuildRequires: ant BuildRequires: ant-apache-regexp BuildRequires: automake @@ -76,7 +73,6 @@ BuildRequires: perl-Archive-Zip BuildRequires: perl-Compress-Zlib BuildRequires: pkg-config BuildRequires: procps -BuildRequires: python-devel BuildRequires: unzip BuildRequires: xorg-x11-devel BuildRequires: zip @@ -91,9 +87,10 @@ Summary: LibreOffice Help Development License: LGPL-3.0 Group: Productivity/Office/Suite Url: http://www.documentfoundation.org/ -Source0: libreoffice-core-%version.tar.bz2 -Source1: libreoffice-help-%version.tar.bz2 -Source2: libreoffice-translations-%version.tar.bz2 +Source0: libreoffice-%version.tar.xz +Source1: libreoffice-help-%version.tar.xz +Source2: libreoffice-translations-%version.tar.xz +Source10: build_prepare.inc # make-3.82 is needed for parallel build # this version extends plain make-3.82 with --warn-undefined-functions option # URL: http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/make-3.82-gbuild, snapshot 2011-08-17 @@ -104,8 +101,13 @@ Source31: zip-%zip_version.tar.bz2 Source200: libreoffice-help-groupX.spec.in Source201: lo-help-gen-spec Source202: lo-help-groupX -# cups is not needed for helpcontent build -Patch0: build-helpcontent-do-not-check-cups.diff +# lost RPM optflags when compiling bridges +Patch1: bridges-missing-cxxflags.diff +# dmake does not work with more than 64 jobs +# FIXME: this patch won't be necessary in LO-4.1 where dmake has finally been removed +Patch2: build-max-64-jobs.diff +# try to avoid build depency on vcl +Patch3: split-help-buildhack-no-vcl.diff # # Patches against zip-3.0 Patch2000: zip-3.0-iso8859_2.patch @@ -123,7 +125,6 @@ This package provides files related to the LibreOffice help development. %if %test_build_langs >= 2 - %package -n libreoffice-help-ast Summary: Asturian Help Localization for LibreOffice Group: Productivity/Office/Suite @@ -329,11 +330,12 @@ is in libreoffice-l10n-en-GB. %prep %if %prepare_build == 0 -%setup -D -T -q -n libreoffice-core-%version +%setup -D -T -q -n libreoffice-%version %else -%setup -q -a30 -a31 -n libreoffice-core-%version -%patch0 -bin/unpack-sources `pwd` %{S:1} %{S:2} +%setup -q -a30 -a31 -b1 -b2 -n libreoffice-%version +%patch1 +%patch2 +%patch3 # # patch zip-3.0 %if %suse_version < 1140 @@ -350,86 +352,7 @@ cd - %endif %build -%if %prepare_build != 0 -# first build make-3.82 -cd make-* -CFLAGS=$RPM_OPT_FLAGS ./configure -make %{?_smp_mflags} -cd - -# -# second build zip-3.0 on older distributions -%if %suse_version < 1140 -cd zip30 -make %{?jobs:-j%jobs} -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc -cd - -%endif -# -# Parallel build settings ... -BUILD_SCRIPT_FLAGS= -# dmake does not work with more than 64 jobs -lo_jobs="%{?jobs:%jobs}" -%ifarch %arm -%if ! 0%{?qemu_user_space_build:1} -# native hardware is not that powerful -lo_jobs="" -%endif -%endif -if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then - echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs" - lo_jobs="64" -fi -# do not eat all memory -lo_jobs_reduced= -if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then - if test `uname -i` = "x86_64" ; then - mem_per_process=300 - else - mem_per_process=200 - fi -%if 0%{?qemu_user_space_build:1} - mem_per_process=400 -%endif - max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"` - max_jobs="$(($max_mem / $mem_per_process))" - test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits" - test "$lo_jobs" -le 0 && lo_jobs= && echo "Warning: Do not use the parallel build at all becuse of memory limits" -fi -# finally set jobs -PARALLEL_BUILD= -if test -n "$lo_jobs" ; then - PARALLEL_BUILD="--with-max-jobs=$lo_jobs" - BUILD_SCRIPT_FLAGS="-- -P$lo_jobs" -fi -# parallel build of modules -# it makes sense on machines with more CPUs -num_cpus=`grep ^processor /proc/cpuinfo | wc -l` -# again reduce to 64 CPUs because of dmake -test "$num_cpus" -gt "64" && num_cpus="64" && echo "Warning: dmake does not support more than 64 processes => reducing number of used cpus" -# allow only 2 modules if there more jobs allowed in one module -test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" -PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" -BUILD_SCRIPT_FLAGS="-P$num_cpus $BUILD_SCRIPT_FLAGS" -# using icecream -if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then - PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream" -fi -%endif -# make sure that JAVA_HOME is set correctly -%if 0%{?suse_version} -source /etc/profile.d/alljava.sh -%endif -%if 0%{?meego_version} -export JAVA_HOME=%{java_home} -%endif -# use RPM_OPT_FLAGS, ... -export ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-O[0-9s]//g' -e 's/\-fexceptions//g'` -fno-strict-aliasing" -# FIXME: genccode from the system icu is in /usr/sbin -# FIXME: we need make-3.82 for parallel build -export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/make-%gnu_make_version-gbuild:$PATH:/usr/sbin" -# use the extra built zip-3.0 on older distributions -%if %suse_version < 1140 -export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin" -%endif +%{expand:%(cat %_sourcedir/build_prepare.inc)} %if %prepare_build != 0 ./autogen.sh $PARALLEL_BUILD \ --libdir=%{_libdir} \ @@ -442,9 +365,7 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin" --disable-fetch-external \ --with-external-tar="$RPM_SOURCE_DIR" \ --with-alloc=system \ - --disable-strip-solver \ --with-jdk-home=$JAVA_HOME \ - --with-java-target-version=1.5 \ --with-ant-home=/usr/share/ant \ --without-fonts \ --without-myspell-dicts \ @@ -456,26 +377,26 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin" --disable-evolution2 \ --disable-gstreamer \ --disable-opengl \ + --disable-dbus \ + --disable-gstreamer-0-10 \ + --disable-python \ --disable-mono \ --disable-odk \ --without-junit \ %if %debug_build == 0 --disable-ccache \ %endif - --without-stlport \ - --disable-mozilla \ --without-system-mozilla \ +%if %suse_version < 1210 + --without-system-icu \ +%endif --disable-postgresql-sdbc \ - --disable-ldap \ --disable-cups \ - --disable-fontconfig \ --with-system-dicts \ --with-system-libxml \ --with-system-openssl \ - --with-system-icu \ --with-system-cppunit \ --with-system-expat \ - --with-system-db \ --with-system-boost \ --without-system-jpeg %endif @@ -483,7 +404,10 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin" make helpcontent2.all %install -. ./config_host.mk.source +sed '/SOLARVER/!d' config_host.mk > "${RPM_BUILD_ROOT}/config_host.mk.parsed" +sed '/INPATH/!d' config_host.mk >> "${RPM_BUILD_ROOT}/config_host.mk.parsed" +. "${RPM_BUILD_ROOT}/config_host.mk.parsed" +rm -rf "${RPM_BUILD_ROOT}/config_host.mk.parsed" test -z %lo_langs && langs="en-US" || langs=%lo_langs mkdir -p file-lists for lang in $langs ; do @@ -599,7 +523,6 @@ rm -f %_datadir/%lo_home/help_en_GB_list.txt.postun 2>/dev/null %endif %if %test_build_langs >= 2 - %files -f file-lists/help_ast_list.txt -n libreoffice-help-ast %defattr(-,root,root) diff --git a/libreoffice-help-group2.changes b/libreoffice-help-group2.changes index 9156f9c..abb2845 100644 --- a/libreoffice-help-group2.changes +++ b/libreoffice-help-group2.changes @@ -1,3 +1,78 @@ +------------------------------------------------------------------- +Wed Apr 17 10:10:05 UTC 2013 - pmladek@suse.com + +- update to 4.0.2.2.1 (SUSE 4.0-rc1, tag suse-4.0-1, based on upstream 4.0.2.2) +- split-help-buildhack-no-vcl.diff: avoid build dependency on vcl + +------------------------------------------------------------------- +Wed Apr 3 13:17:12 UTC 2013 - pmladek@suse.com + +- update to 4.0.2.2 + +------------------------------------------------------------------- +Tue Mar 19 18:04:38 UTC 2013 - pmladek@suse.com + +- update to 4.0.2.1 +- build-max-64-jobs.diff: dmake does not work with more than 64 jobs + +------------------------------------------------------------------- +Thu Feb 28 10:27:15 UTC 2013 - pmladek@suse.com + +- update to 4.0.1.2 + +------------------------------------------------------------------- +Thu Feb 21 10:27:15 UTC 2013 - tchvatal@suse.com + +- update to 4.0.1.1 +- bin obsolete configure-detect-icerun.diff + +------------------------------------------------------------------- +Mon Feb 4 16:38:05 UTC 2013 - pmladek@suse.com + +- configure-detect-icerun.diff: icerun wrapper is not provided by the old + icecream-0.9.2 on SLED11 + +------------------------------------------------------------------- +Tue Jan 22 12:28:43 UTC 2013 - tchvatal@suse.com + +- update to 4.0.0.3 +- build_prepare.inc: share the common build preparation steps between spec files + +* Jan 10 2013 by tchvatal@suse.com in LibreOffice:Unstable + +- bridges-missing-cxxflags.diff: lost RPM optflags when compiling bridges + +* Jan 9 2013 by tchvatal@suse.com in LibreOffice:Unstable + +- update to 4.0.0.1 + +* Dec 19 2012 by tchvatal@suse.com in LibreOffice:Unstable + +- update to 4.0.0.0.beta2 + +* Dec 19 2012 by tchvatal@suse.com in LibreOffice:Unstable + +- update to 4.0.0.0.beta1 +- remove unused build_module_in_parallel define +- use xz tarballs instead of bz ones +- remove unused python-devel from BuildRequires +- add "xz" to BuildRequires; explicitly needed on older SUSE versions +- remove obsolete patches: + * build-helpcontent-do-not-check-cups.diff +- remove obsolete configure switches: + * --disable-ldap + * --disable-mozilla + * --disable-fontconfig + * --disable-strip-solver + * --without-stlport + * --with-system-db + * --with-java-target-version=1.5 +- use configure switches: + * --disable-dbus: dbus is not need for help + * --disable-gstreamer-0-10: gstreamer is not needed for help + * --disable-python: python is not longer needed for localizing sources + * --without-system-icu: system ICU is too old on openSUSE < 12.1 + ------------------------------------------------------------------- Sat Jan 19 14:31:31 UTC 2013 - dmueller@suse.com diff --git a/libreoffice-help-group2.spec b/libreoffice-help-group2.spec index a0b7b79..9d78a0f 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.4 +Version: 4.0.2.2.1 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 @@ -31,10 +31,6 @@ Release: 0 # test_build_langs: 1 = de and cs # 2 = all supported languages %define test_build_langs 2 -# build_module_in_parallel 0 = no -# 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 # debug_build: 0 = no # 1 = yes (enable depency tracking, ccache) %define debug_build 0 @@ -53,6 +49,7 @@ Release: 0 %endif #!BuildIgnore: libreoffice # both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22 +BuildRequires: xz BuildRequires: ant BuildRequires: ant-apache-regexp BuildRequires: automake @@ -76,7 +73,6 @@ BuildRequires: perl-Archive-Zip BuildRequires: perl-Compress-Zlib BuildRequires: pkg-config BuildRequires: procps -BuildRequires: python-devel BuildRequires: unzip BuildRequires: xorg-x11-devel BuildRequires: zip @@ -91,9 +87,10 @@ Summary: LibreOffice Help Development License: LGPL-3.0 Group: Productivity/Office/Suite Url: http://www.documentfoundation.org/ -Source0: libreoffice-core-%version.tar.bz2 -Source1: libreoffice-help-%version.tar.bz2 -Source2: libreoffice-translations-%version.tar.bz2 +Source0: libreoffice-%version.tar.xz +Source1: libreoffice-help-%version.tar.xz +Source2: libreoffice-translations-%version.tar.xz +Source10: build_prepare.inc # make-3.82 is needed for parallel build # this version extends plain make-3.82 with --warn-undefined-functions option # URL: http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/make-3.82-gbuild, snapshot 2011-08-17 @@ -104,8 +101,13 @@ Source31: zip-%zip_version.tar.bz2 Source200: libreoffice-help-groupX.spec.in Source201: lo-help-gen-spec Source202: lo-help-groupX -# cups is not needed for helpcontent build -Patch0: build-helpcontent-do-not-check-cups.diff +# lost RPM optflags when compiling bridges +Patch1: bridges-missing-cxxflags.diff +# dmake does not work with more than 64 jobs +# FIXME: this patch won't be necessary in LO-4.1 where dmake has finally been removed +Patch2: build-max-64-jobs.diff +# try to avoid build depency on vcl +Patch3: split-help-buildhack-no-vcl.diff # # Patches against zip-3.0 Patch2000: zip-3.0-iso8859_2.patch @@ -123,7 +125,6 @@ This package provides files related to the LibreOffice help development. %if %test_build_langs >= 2 - %package -n libreoffice-help-el Summary: Greek Help Localization for LibreOffice Group: Productivity/Office/Suite @@ -317,11 +318,12 @@ is in libreoffice-l10n-fr. %prep %if %prepare_build == 0 -%setup -D -T -q -n libreoffice-core-%version +%setup -D -T -q -n libreoffice-%version %else -%setup -q -a30 -a31 -n libreoffice-core-%version -%patch0 -bin/unpack-sources `pwd` %{S:1} %{S:2} +%setup -q -a30 -a31 -b1 -b2 -n libreoffice-%version +%patch1 +%patch2 +%patch3 # # patch zip-3.0 %if %suse_version < 1140 @@ -338,86 +340,7 @@ cd - %endif %build -%if %prepare_build != 0 -# first build make-3.82 -cd make-* -CFLAGS=$RPM_OPT_FLAGS ./configure -make %{?_smp_mflags} -cd - -# -# second build zip-3.0 on older distributions -%if %suse_version < 1140 -cd zip30 -make %{?jobs:-j%jobs} -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc -cd - -%endif -# -# Parallel build settings ... -BUILD_SCRIPT_FLAGS= -# dmake does not work with more than 64 jobs -lo_jobs="%{?jobs:%jobs}" -%ifarch %arm -%if ! 0%{?qemu_user_space_build:1} -# native hardware is not that powerful -lo_jobs="" -%endif -%endif -if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then - echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs" - lo_jobs="64" -fi -# do not eat all memory -lo_jobs_reduced= -if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then - if test `uname -i` = "x86_64" ; then - mem_per_process=300 - else - mem_per_process=200 - fi -%if 0%{?qemu_user_space_build:1} - mem_per_process=400 -%endif - max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"` - max_jobs="$(($max_mem / $mem_per_process))" - test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits" - test "$lo_jobs" -le 0 && lo_jobs= && echo "Warning: Do not use the parallel build at all becuse of memory limits" -fi -# finally set jobs -PARALLEL_BUILD= -if test -n "$lo_jobs" ; then - PARALLEL_BUILD="--with-max-jobs=$lo_jobs" - BUILD_SCRIPT_FLAGS="-- -P$lo_jobs" -fi -# parallel build of modules -# it makes sense on machines with more CPUs -num_cpus=`grep ^processor /proc/cpuinfo | wc -l` -# again reduce to 64 CPUs because of dmake -test "$num_cpus" -gt "64" && num_cpus="64" && echo "Warning: dmake does not support more than 64 processes => reducing number of used cpus" -# allow only 2 modules if there more jobs allowed in one module -test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" -PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" -BUILD_SCRIPT_FLAGS="-P$num_cpus $BUILD_SCRIPT_FLAGS" -# using icecream -if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then - PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream" -fi -%endif -# make sure that JAVA_HOME is set correctly -%if 0%{?suse_version} -source /etc/profile.d/alljava.sh -%endif -%if 0%{?meego_version} -export JAVA_HOME=%{java_home} -%endif -# use RPM_OPT_FLAGS, ... -export ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-O[0-9s]//g' -e 's/\-fexceptions//g'` -fno-strict-aliasing" -# FIXME: genccode from the system icu is in /usr/sbin -# FIXME: we need make-3.82 for parallel build -export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/make-%gnu_make_version-gbuild:$PATH:/usr/sbin" -# use the extra built zip-3.0 on older distributions -%if %suse_version < 1140 -export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin" -%endif +%{expand:%(cat %_sourcedir/build_prepare.inc)} %if %prepare_build != 0 ./autogen.sh $PARALLEL_BUILD \ --libdir=%{_libdir} \ @@ -430,9 +353,7 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin" --disable-fetch-external \ --with-external-tar="$RPM_SOURCE_DIR" \ --with-alloc=system \ - --disable-strip-solver \ --with-jdk-home=$JAVA_HOME \ - --with-java-target-version=1.5 \ --with-ant-home=/usr/share/ant \ --without-fonts \ --without-myspell-dicts \ @@ -444,26 +365,26 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin" --disable-evolution2 \ --disable-gstreamer \ --disable-opengl \ + --disable-dbus \ + --disable-gstreamer-0-10 \ + --disable-python \ --disable-mono \ --disable-odk \ --without-junit \ %if %debug_build == 0 --disable-ccache \ %endif - --without-stlport \ - --disable-mozilla \ --without-system-mozilla \ +%if %suse_version < 1210 + --without-system-icu \ +%endif --disable-postgresql-sdbc \ - --disable-ldap \ --disable-cups \ - --disable-fontconfig \ --with-system-dicts \ --with-system-libxml \ --with-system-openssl \ - --with-system-icu \ --with-system-cppunit \ --with-system-expat \ - --with-system-db \ --with-system-boost \ --without-system-jpeg %endif @@ -471,7 +392,10 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin" make helpcontent2.all %install -. ./config_host.mk.source +sed '/SOLARVER/!d' config_host.mk > "${RPM_BUILD_ROOT}/config_host.mk.parsed" +sed '/INPATH/!d' config_host.mk >> "${RPM_BUILD_ROOT}/config_host.mk.parsed" +. "${RPM_BUILD_ROOT}/config_host.mk.parsed" +rm -rf "${RPM_BUILD_ROOT}/config_host.mk.parsed" test -z %lo_langs && langs="en-US" || langs=%lo_langs mkdir -p file-lists for lang in $langs ; do @@ -575,7 +499,6 @@ rm -f %_datadir/%lo_home/help_fr_list.txt.postun 2>/dev/null %endif %if %test_build_langs >= 2 - %files -f file-lists/help_el_list.txt -n libreoffice-help-el %defattr(-,root,root) diff --git a/libreoffice-help-group3.changes b/libreoffice-help-group3.changes index dd6f779..ae84568 100644 --- a/libreoffice-help-group3.changes +++ b/libreoffice-help-group3.changes @@ -1,3 +1,78 @@ +------------------------------------------------------------------- +Wed Apr 17 10:10:05 UTC 2013 - pmladek@suse.com + +- update to 4.0.2.2.1 (SUSE 4.0-rc1, tag suse-4.0-1, based on upstream 4.0.2.2) +- split-help-buildhack-no-vcl.diff: avoid build dependency on vcl + +------------------------------------------------------------------- +Wed Apr 3 13:17:12 UTC 2013 - pmladek@suse.com + +- update to 4.0.2.2 + +------------------------------------------------------------------- +Tue Mar 19 18:04:38 UTC 2013 - pmladek@suse.com + +- update to 4.0.2.1 +- build-max-64-jobs.diff: dmake does not work with more than 64 jobs + +------------------------------------------------------------------- +Thu Feb 28 10:27:15 UTC 2013 - pmladek@suse.com + +- update to 4.0.1.2 + +------------------------------------------------------------------- +Thu Feb 21 10:27:15 UTC 2013 - tchvatal@suse.com + +- update to 4.0.1.1 +- bin obsolete configure-detect-icerun.diff + +------------------------------------------------------------------- +Mon Feb 4 16:38:05 UTC 2013 - pmladek@suse.com + +- configure-detect-icerun.diff: icerun wrapper is not provided by the old + icecream-0.9.2 on SLED11 + +------------------------------------------------------------------- +Tue Jan 22 12:28:43 UTC 2013 - tchvatal@suse.com + +- update to 4.0.0.3 +- build_prepare.inc: share the common build preparation steps between spec files + +* Jan 10 2013 by tchvatal@suse.com in LibreOffice:Unstable + +- bridges-missing-cxxflags.diff: lost RPM optflags when compiling bridges + +* Jan 9 2013 by tchvatal@suse.com in LibreOffice:Unstable + +- update to 4.0.0.1 + +* Dec 19 2012 by tchvatal@suse.com in LibreOffice:Unstable + +- update to 4.0.0.0.beta2 + +* Dec 19 2012 by tchvatal@suse.com in LibreOffice:Unstable + +- update to 4.0.0.0.beta1 +- remove unused build_module_in_parallel define +- use xz tarballs instead of bz ones +- remove unused python-devel from BuildRequires +- add "xz" to BuildRequires; explicitly needed on older SUSE versions +- remove obsolete patches: + * build-helpcontent-do-not-check-cups.diff +- remove obsolete configure switches: + * --disable-ldap + * --disable-mozilla + * --disable-fontconfig + * --disable-strip-solver + * --without-stlport + * --with-system-db + * --with-java-target-version=1.5 +- use configure switches: + * --disable-dbus: dbus is not need for help + * --disable-gstreamer-0-10: gstreamer is not needed for help + * --disable-python: python is not longer needed for localizing sources + * --without-system-icu: system ICU is too old on openSUSE < 12.1 + ------------------------------------------------------------------- Sat Jan 19 14:31:31 UTC 2013 - dmueller@suse.com diff --git a/libreoffice-help-group3.spec b/libreoffice-help-group3.spec index fef29a7..7b5f7e3 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.4 +Version: 4.0.2.2.1 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 @@ -31,10 +31,6 @@ Release: 0 # test_build_langs: 1 = de and cs # 2 = all supported languages %define test_build_langs 2 -# build_module_in_parallel 0 = no -# 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 # debug_build: 0 = no # 1 = yes (enable depency tracking, ccache) %define debug_build 0 @@ -53,6 +49,7 @@ Release: 0 %endif #!BuildIgnore: libreoffice # both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22 +BuildRequires: xz BuildRequires: ant BuildRequires: ant-apache-regexp BuildRequires: automake @@ -76,7 +73,6 @@ BuildRequires: perl-Archive-Zip BuildRequires: perl-Compress-Zlib BuildRequires: pkg-config BuildRequires: procps -BuildRequires: python-devel BuildRequires: unzip BuildRequires: xorg-x11-devel BuildRequires: zip @@ -91,9 +87,10 @@ Summary: LibreOffice Help Development License: LGPL-3.0 Group: Productivity/Office/Suite Url: http://www.documentfoundation.org/ -Source0: libreoffice-core-%version.tar.bz2 -Source1: libreoffice-help-%version.tar.bz2 -Source2: libreoffice-translations-%version.tar.bz2 +Source0: libreoffice-%version.tar.xz +Source1: libreoffice-help-%version.tar.xz +Source2: libreoffice-translations-%version.tar.xz +Source10: build_prepare.inc # make-3.82 is needed for parallel build # this version extends plain make-3.82 with --warn-undefined-functions option # URL: http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/make-3.82-gbuild, snapshot 2011-08-17 @@ -104,8 +101,13 @@ Source31: zip-%zip_version.tar.bz2 Source200: libreoffice-help-groupX.spec.in Source201: lo-help-gen-spec Source202: lo-help-groupX -# cups is not needed for helpcontent build -Patch0: build-helpcontent-do-not-check-cups.diff +# lost RPM optflags when compiling bridges +Patch1: bridges-missing-cxxflags.diff +# dmake does not work with more than 64 jobs +# FIXME: this patch won't be necessary in LO-4.1 where dmake has finally been removed +Patch2: build-max-64-jobs.diff +# try to avoid build depency on vcl +Patch3: split-help-buildhack-no-vcl.diff # # Patches against zip-3.0 Patch2000: zip-3.0-iso8859_2.patch @@ -123,7 +125,6 @@ This package provides files related to the LibreOffice help development. %if %test_build_langs >= 2 - %package -n libreoffice-help-gl Summary: Galician Help Localization for LibreOffice Group: Productivity/Office/Suite @@ -329,11 +330,12 @@ is in libreoffice-l10n-km. %prep %if %prepare_build == 0 -%setup -D -T -q -n libreoffice-core-%version +%setup -D -T -q -n libreoffice-%version %else -%setup -q -a30 -a31 -n libreoffice-core-%version -%patch0 -bin/unpack-sources `pwd` %{S:1} %{S:2} +%setup -q -a30 -a31 -b1 -b2 -n libreoffice-%version +%patch1 +%patch2 +%patch3 # # patch zip-3.0 %if %suse_version < 1140 @@ -350,86 +352,7 @@ cd - %endif %build -%if %prepare_build != 0 -# first build make-3.82 -cd make-* -CFLAGS=$RPM_OPT_FLAGS ./configure -make %{?_smp_mflags} -cd - -# -# second build zip-3.0 on older distributions -%if %suse_version < 1140 -cd zip30 -make %{?jobs:-j%jobs} -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc -cd - -%endif -# -# Parallel build settings ... -BUILD_SCRIPT_FLAGS= -# dmake does not work with more than 64 jobs -lo_jobs="%{?jobs:%jobs}" -%ifarch %arm -%if ! 0%{?qemu_user_space_build:1} -# native hardware is not that powerful -lo_jobs="" -%endif -%endif -if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then - echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs" - lo_jobs="64" -fi -# do not eat all memory -lo_jobs_reduced= -if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then - if test `uname -i` = "x86_64" ; then - mem_per_process=300 - else - mem_per_process=200 - fi -%if 0%{?qemu_user_space_build:1} - mem_per_process=400 -%endif - max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"` - max_jobs="$(($max_mem / $mem_per_process))" - test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits" - test "$lo_jobs" -le 0 && lo_jobs= && echo "Warning: Do not use the parallel build at all becuse of memory limits" -fi -# finally set jobs -PARALLEL_BUILD= -if test -n "$lo_jobs" ; then - PARALLEL_BUILD="--with-max-jobs=$lo_jobs" - BUILD_SCRIPT_FLAGS="-- -P$lo_jobs" -fi -# parallel build of modules -# it makes sense on machines with more CPUs -num_cpus=`grep ^processor /proc/cpuinfo | wc -l` -# again reduce to 64 CPUs because of dmake -test "$num_cpus" -gt "64" && num_cpus="64" && echo "Warning: dmake does not support more than 64 processes => reducing number of used cpus" -# allow only 2 modules if there more jobs allowed in one module -test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" -PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" -BUILD_SCRIPT_FLAGS="-P$num_cpus $BUILD_SCRIPT_FLAGS" -# using icecream -if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then - PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream" -fi -%endif -# make sure that JAVA_HOME is set correctly -%if 0%{?suse_version} -source /etc/profile.d/alljava.sh -%endif -%if 0%{?meego_version} -export JAVA_HOME=%{java_home} -%endif -# use RPM_OPT_FLAGS, ... -export ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-O[0-9s]//g' -e 's/\-fexceptions//g'` -fno-strict-aliasing" -# FIXME: genccode from the system icu is in /usr/sbin -# FIXME: we need make-3.82 for parallel build -export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/make-%gnu_make_version-gbuild:$PATH:/usr/sbin" -# use the extra built zip-3.0 on older distributions -%if %suse_version < 1140 -export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin" -%endif +%{expand:%(cat %_sourcedir/build_prepare.inc)} %if %prepare_build != 0 ./autogen.sh $PARALLEL_BUILD \ --libdir=%{_libdir} \ @@ -442,9 +365,7 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin" --disable-fetch-external \ --with-external-tar="$RPM_SOURCE_DIR" \ --with-alloc=system \ - --disable-strip-solver \ --with-jdk-home=$JAVA_HOME \ - --with-java-target-version=1.5 \ --with-ant-home=/usr/share/ant \ --without-fonts \ --without-myspell-dicts \ @@ -456,26 +377,26 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin" --disable-evolution2 \ --disable-gstreamer \ --disable-opengl \ + --disable-dbus \ + --disable-gstreamer-0-10 \ + --disable-python \ --disable-mono \ --disable-odk \ --without-junit \ %if %debug_build == 0 --disable-ccache \ %endif - --without-stlport \ - --disable-mozilla \ --without-system-mozilla \ +%if %suse_version < 1210 + --without-system-icu \ +%endif --disable-postgresql-sdbc \ - --disable-ldap \ --disable-cups \ - --disable-fontconfig \ --with-system-dicts \ --with-system-libxml \ --with-system-openssl \ - --with-system-icu \ --with-system-cppunit \ --with-system-expat \ - --with-system-db \ --with-system-boost \ --without-system-jpeg %endif @@ -483,7 +404,10 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin" make helpcontent2.all %install -. ./config_host.mk.source +sed '/SOLARVER/!d' config_host.mk > "${RPM_BUILD_ROOT}/config_host.mk.parsed" +sed '/INPATH/!d' config_host.mk >> "${RPM_BUILD_ROOT}/config_host.mk.parsed" +. "${RPM_BUILD_ROOT}/config_host.mk.parsed" +rm -rf "${RPM_BUILD_ROOT}/config_host.mk.parsed" test -z %lo_langs && langs="en-US" || langs=%lo_langs mkdir -p file-lists for lang in $langs ; do @@ -599,7 +523,6 @@ rm -f %_datadir/%lo_home/help_km_list.txt.postun 2>/dev/null %endif %if %test_build_langs >= 2 - %files -f file-lists/help_gl_list.txt -n libreoffice-help-gl %defattr(-,root,root) diff --git a/libreoffice-help-group4.changes b/libreoffice-help-group4.changes index c9aea4d..c709723 100644 --- a/libreoffice-help-group4.changes +++ b/libreoffice-help-group4.changes @@ -1,3 +1,78 @@ +------------------------------------------------------------------- +Wed Apr 17 10:10:05 UTC 2013 - pmladek@suse.com + +- update to 4.0.2.2.1 (SUSE 4.0-rc1, tag suse-4.0-1, based on upstream 4.0.2.2) +- split-help-buildhack-no-vcl.diff: avoid build dependency on vcl + +------------------------------------------------------------------- +Wed Apr 3 13:17:12 UTC 2013 - pmladek@suse.com + +- update to 4.0.2.2 + +------------------------------------------------------------------- +Tue Mar 19 18:04:38 UTC 2013 - pmladek@suse.com + +- update to 4.0.2.1 +- build-max-64-jobs.diff: dmake does not work with more than 64 jobs + +------------------------------------------------------------------- +Thu Feb 28 10:27:15 UTC 2013 - pmladek@suse.com + +- update to 4.0.1.2 + +------------------------------------------------------------------- +Thu Feb 21 10:27:15 UTC 2013 - tchvatal@suse.com + +- update to 4.0.1.1 +- bin obsolete configure-detect-icerun.diff + +------------------------------------------------------------------- +Mon Feb 4 16:38:05 UTC 2013 - pmladek@suse.com + +- configure-detect-icerun.diff: icerun wrapper is not provided by the old + icecream-0.9.2 on SLED11 + +------------------------------------------------------------------- +Tue Jan 22 12:28:43 UTC 2013 - tchvatal@suse.com + +- update to 4.0.0.3 +- build_prepare.inc: share the common build preparation steps between spec files + +* Jan 10 2013 by tchvatal@suse.com in LibreOffice:Unstable + +- bridges-missing-cxxflags.diff: lost RPM optflags when compiling bridges + +* Jan 9 2013 by tchvatal@suse.com in LibreOffice:Unstable + +- update to 4.0.0.1 + +* Dec 19 2012 by tchvatal@suse.com in LibreOffice:Unstable + +- update to 4.0.0.0.beta2 + +* Dec 19 2012 by tchvatal@suse.com in LibreOffice:Unstable + +- update to 4.0.0.0.beta1 +- remove unused build_module_in_parallel define +- use xz tarballs instead of bz ones +- remove unused python-devel from BuildRequires +- add "xz" to BuildRequires; explicitly needed on older SUSE versions +- remove obsolete patches: + * build-helpcontent-do-not-check-cups.diff +- remove obsolete configure switches: + * --disable-ldap + * --disable-mozilla + * --disable-fontconfig + * --disable-strip-solver + * --without-stlport + * --with-system-db + * --with-java-target-version=1.5 +- use configure switches: + * --disable-dbus: dbus is not need for help + * --disable-gstreamer-0-10: gstreamer is not needed for help + * --disable-python: python is not longer needed for localizing sources + * --without-system-icu: system ICU is too old on openSUSE < 12.1 + ------------------------------------------------------------------- Sat Jan 19 14:31:31 UTC 2013 - dmueller@suse.com diff --git a/libreoffice-help-group4.spec b/libreoffice-help-group4.spec index 00af5a2..63bcc4e 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.4 +Version: 4.0.2.2.1 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 @@ -31,10 +31,6 @@ Release: 0 # test_build_langs: 1 = de and cs # 2 = all supported languages %define test_build_langs 2 -# build_module_in_parallel 0 = no -# 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 # debug_build: 0 = no # 1 = yes (enable depency tracking, ccache) %define debug_build 0 @@ -53,6 +49,7 @@ Release: 0 %endif #!BuildIgnore: libreoffice # both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22 +BuildRequires: xz BuildRequires: ant BuildRequires: ant-apache-regexp BuildRequires: automake @@ -76,7 +73,6 @@ BuildRequires: perl-Archive-Zip BuildRequires: perl-Compress-Zlib BuildRequires: pkg-config BuildRequires: procps -BuildRequires: python-devel BuildRequires: unzip BuildRequires: xorg-x11-devel BuildRequires: zip @@ -91,9 +87,10 @@ Summary: LibreOffice Help Development License: LGPL-3.0 Group: Productivity/Office/Suite Url: http://www.documentfoundation.org/ -Source0: libreoffice-core-%version.tar.bz2 -Source1: libreoffice-help-%version.tar.bz2 -Source2: libreoffice-translations-%version.tar.bz2 +Source0: libreoffice-%version.tar.xz +Source1: libreoffice-help-%version.tar.xz +Source2: libreoffice-translations-%version.tar.xz +Source10: build_prepare.inc # make-3.82 is needed for parallel build # this version extends plain make-3.82 with --warn-undefined-functions option # URL: http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/make-3.82-gbuild, snapshot 2011-08-17 @@ -104,8 +101,13 @@ Source31: zip-%zip_version.tar.bz2 Source200: libreoffice-help-groupX.spec.in Source201: lo-help-gen-spec Source202: lo-help-groupX -# cups is not needed for helpcontent build -Patch0: build-helpcontent-do-not-check-cups.diff +# lost RPM optflags when compiling bridges +Patch1: bridges-missing-cxxflags.diff +# dmake does not work with more than 64 jobs +# FIXME: this patch won't be necessary in LO-4.1 where dmake has finally been removed +Patch2: build-max-64-jobs.diff +# try to avoid build depency on vcl +Patch3: split-help-buildhack-no-vcl.diff # # Patches against zip-3.0 Patch2000: zip-3.0-iso8859_2.patch @@ -123,7 +125,6 @@ This package provides files related to the LibreOffice help development. %if %test_build_langs >= 2 - %package -n libreoffice-help-ko Summary: Korean Help Localization for LibreOffice Group: Productivity/Office/Suite @@ -317,11 +318,12 @@ is in libreoffice-l10n-pt-BR. %prep %if %prepare_build == 0 -%setup -D -T -q -n libreoffice-core-%version +%setup -D -T -q -n libreoffice-%version %else -%setup -q -a30 -a31 -n libreoffice-core-%version -%patch0 -bin/unpack-sources `pwd` %{S:1} %{S:2} +%setup -q -a30 -a31 -b1 -b2 -n libreoffice-%version +%patch1 +%patch2 +%patch3 # # patch zip-3.0 %if %suse_version < 1140 @@ -338,86 +340,7 @@ cd - %endif %build -%if %prepare_build != 0 -# first build make-3.82 -cd make-* -CFLAGS=$RPM_OPT_FLAGS ./configure -make %{?_smp_mflags} -cd - -# -# second build zip-3.0 on older distributions -%if %suse_version < 1140 -cd zip30 -make %{?jobs:-j%jobs} -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc -cd - -%endif -# -# Parallel build settings ... -BUILD_SCRIPT_FLAGS= -# dmake does not work with more than 64 jobs -lo_jobs="%{?jobs:%jobs}" -%ifarch %arm -%if ! 0%{?qemu_user_space_build:1} -# native hardware is not that powerful -lo_jobs="" -%endif -%endif -if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then - echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs" - lo_jobs="64" -fi -# do not eat all memory -lo_jobs_reduced= -if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then - if test `uname -i` = "x86_64" ; then - mem_per_process=300 - else - mem_per_process=200 - fi -%if 0%{?qemu_user_space_build:1} - mem_per_process=400 -%endif - max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"` - max_jobs="$(($max_mem / $mem_per_process))" - test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits" - test "$lo_jobs" -le 0 && lo_jobs= && echo "Warning: Do not use the parallel build at all becuse of memory limits" -fi -# finally set jobs -PARALLEL_BUILD= -if test -n "$lo_jobs" ; then - PARALLEL_BUILD="--with-max-jobs=$lo_jobs" - BUILD_SCRIPT_FLAGS="-- -P$lo_jobs" -fi -# parallel build of modules -# it makes sense on machines with more CPUs -num_cpus=`grep ^processor /proc/cpuinfo | wc -l` -# again reduce to 64 CPUs because of dmake -test "$num_cpus" -gt "64" && num_cpus="64" && echo "Warning: dmake does not support more than 64 processes => reducing number of used cpus" -# allow only 2 modules if there more jobs allowed in one module -test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" -PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" -BUILD_SCRIPT_FLAGS="-P$num_cpus $BUILD_SCRIPT_FLAGS" -# using icecream -if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then - PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream" -fi -%endif -# make sure that JAVA_HOME is set correctly -%if 0%{?suse_version} -source /etc/profile.d/alljava.sh -%endif -%if 0%{?meego_version} -export JAVA_HOME=%{java_home} -%endif -# use RPM_OPT_FLAGS, ... -export ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-O[0-9s]//g' -e 's/\-fexceptions//g'` -fno-strict-aliasing" -# FIXME: genccode from the system icu is in /usr/sbin -# FIXME: we need make-3.82 for parallel build -export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/make-%gnu_make_version-gbuild:$PATH:/usr/sbin" -# use the extra built zip-3.0 on older distributions -%if %suse_version < 1140 -export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin" -%endif +%{expand:%(cat %_sourcedir/build_prepare.inc)} %if %prepare_build != 0 ./autogen.sh $PARALLEL_BUILD \ --libdir=%{_libdir} \ @@ -430,9 +353,7 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin" --disable-fetch-external \ --with-external-tar="$RPM_SOURCE_DIR" \ --with-alloc=system \ - --disable-strip-solver \ --with-jdk-home=$JAVA_HOME \ - --with-java-target-version=1.5 \ --with-ant-home=/usr/share/ant \ --without-fonts \ --without-myspell-dicts \ @@ -444,26 +365,26 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin" --disable-evolution2 \ --disable-gstreamer \ --disable-opengl \ + --disable-dbus \ + --disable-gstreamer-0-10 \ + --disable-python \ --disable-mono \ --disable-odk \ --without-junit \ %if %debug_build == 0 --disable-ccache \ %endif - --without-stlport \ - --disable-mozilla \ --without-system-mozilla \ +%if %suse_version < 1210 + --without-system-icu \ +%endif --disable-postgresql-sdbc \ - --disable-ldap \ --disable-cups \ - --disable-fontconfig \ --with-system-dicts \ --with-system-libxml \ --with-system-openssl \ - --with-system-icu \ --with-system-cppunit \ --with-system-expat \ - --with-system-db \ --with-system-boost \ --without-system-jpeg %endif @@ -471,7 +392,10 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin" make helpcontent2.all %install -. ./config_host.mk.source +sed '/SOLARVER/!d' config_host.mk > "${RPM_BUILD_ROOT}/config_host.mk.parsed" +sed '/INPATH/!d' config_host.mk >> "${RPM_BUILD_ROOT}/config_host.mk.parsed" +. "${RPM_BUILD_ROOT}/config_host.mk.parsed" +rm -rf "${RPM_BUILD_ROOT}/config_host.mk.parsed" test -z %lo_langs && langs="en-US" || langs=%lo_langs mkdir -p file-lists for lang in $langs ; do @@ -575,7 +499,6 @@ rm -f %_datadir/%lo_home/help_pt_BR_list.txt.postun 2>/dev/null %endif %if %test_build_langs >= 2 - %files -f file-lists/help_ko_list.txt -n libreoffice-help-ko %defattr(-,root,root) diff --git a/libreoffice-help-group5.changes b/libreoffice-help-group5.changes index a7389e4..2dbf715 100644 --- a/libreoffice-help-group5.changes +++ b/libreoffice-help-group5.changes @@ -1,3 +1,78 @@ +------------------------------------------------------------------- +Wed Apr 17 10:10:05 UTC 2013 - pmladek@suse.com + +- update to 4.0.2.2.1 (SUSE 4.0-rc1, tag suse-4.0-1, based on upstream 4.0.2.2) +- split-help-buildhack-no-vcl.diff: avoid build dependency on vcl + +------------------------------------------------------------------- +Wed Apr 3 13:17:12 UTC 2013 - pmladek@suse.com + +- update to 4.0.2.2 + +------------------------------------------------------------------- +Tue Mar 19 18:04:38 UTC 2013 - pmladek@suse.com + +- update to 4.0.2.1 +- build-max-64-jobs.diff: dmake does not work with more than 64 jobs + +------------------------------------------------------------------- +Thu Feb 28 10:27:15 UTC 2013 - pmladek@suse.com + +- update to 4.0.1.2 + +------------------------------------------------------------------- +Thu Feb 21 10:27:15 UTC 2013 - tchvatal@suse.com + +- update to 4.0.1.1 +- bin obsolete configure-detect-icerun.diff + +------------------------------------------------------------------- +Mon Feb 4 16:38:05 UTC 2013 - pmladek@suse.com + +- configure-detect-icerun.diff: icerun wrapper is not provided by the old + icecream-0.9.2 on SLED11 + +------------------------------------------------------------------- +Tue Jan 22 12:28:43 UTC 2013 - tchvatal@suse.com + +- update to 4.0.0.3 +- build_prepare.inc: share the common build preparation steps between spec files + +* Jan 10 2013 by tchvatal@suse.com in LibreOffice:Unstable + +- bridges-missing-cxxflags.diff: lost RPM optflags when compiling bridges + +* Jan 9 2013 by tchvatal@suse.com in LibreOffice:Unstable + +- update to 4.0.0.1 + +* Dec 19 2012 by tchvatal@suse.com in LibreOffice:Unstable + +- update to 4.0.0.0.beta2 + +* Dec 19 2012 by tchvatal@suse.com in LibreOffice:Unstable + +- update to 4.0.0.0.beta1 +- remove unused build_module_in_parallel define +- use xz tarballs instead of bz ones +- remove unused python-devel from BuildRequires +- add "xz" to BuildRequires; explicitly needed on older SUSE versions +- remove obsolete patches: + * build-helpcontent-do-not-check-cups.diff +- remove obsolete configure switches: + * --disable-ldap + * --disable-mozilla + * --disable-fontconfig + * --disable-strip-solver + * --without-stlport + * --with-system-db + * --with-java-target-version=1.5 +- use configure switches: + * --disable-dbus: dbus is not need for help + * --disable-gstreamer-0-10: gstreamer is not needed for help + * --disable-python: python is not longer needed for localizing sources + * --without-system-icu: system ICU is too old on openSUSE < 12.1 + ------------------------------------------------------------------- Sat Jan 19 14:31:31 UTC 2013 - dmueller@suse.com diff --git a/libreoffice-help-group5.spec b/libreoffice-help-group5.spec index 5031d33..7495066 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.4 +Version: 4.0.2.2.1 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 @@ -31,10 +31,6 @@ Release: 0 # test_build_langs: 1 = de and cs # 2 = all supported languages %define test_build_langs 2 -# build_module_in_parallel 0 = no -# 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 # debug_build: 0 = no # 1 = yes (enable depency tracking, ccache) %define debug_build 0 @@ -53,6 +49,7 @@ Release: 0 %endif #!BuildIgnore: libreoffice # both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22 +BuildRequires: xz BuildRequires: ant BuildRequires: ant-apache-regexp BuildRequires: automake @@ -76,7 +73,6 @@ BuildRequires: perl-Archive-Zip BuildRequires: perl-Compress-Zlib BuildRequires: pkg-config BuildRequires: procps -BuildRequires: python-devel BuildRequires: unzip BuildRequires: xorg-x11-devel BuildRequires: zip @@ -91,9 +87,10 @@ Summary: LibreOffice Help Development License: LGPL-3.0 Group: Productivity/Office/Suite Url: http://www.documentfoundation.org/ -Source0: libreoffice-core-%version.tar.bz2 -Source1: libreoffice-help-%version.tar.bz2 -Source2: libreoffice-translations-%version.tar.bz2 +Source0: libreoffice-%version.tar.xz +Source1: libreoffice-help-%version.tar.xz +Source2: libreoffice-translations-%version.tar.xz +Source10: build_prepare.inc # make-3.82 is needed for parallel build # this version extends plain make-3.82 with --warn-undefined-functions option # URL: http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/make-3.82-gbuild, snapshot 2011-08-17 @@ -104,8 +101,13 @@ Source31: zip-%zip_version.tar.bz2 Source200: libreoffice-help-groupX.spec.in Source201: lo-help-gen-spec Source202: lo-help-groupX -# cups is not needed for helpcontent build -Patch0: build-helpcontent-do-not-check-cups.diff +# lost RPM optflags when compiling bridges +Patch1: bridges-missing-cxxflags.diff +# dmake does not work with more than 64 jobs +# FIXME: this patch won't be necessary in LO-4.1 where dmake has finally been removed +Patch2: build-max-64-jobs.diff +# try to avoid build depency on vcl +Patch3: split-help-buildhack-no-vcl.diff # # Patches against zip-3.0 Patch2000: zip-3.0-iso8859_2.patch @@ -123,7 +125,6 @@ This package provides files related to the LibreOffice help development. %if %test_build_langs >= 2 - %package -n libreoffice-help-ru Summary: Russian Help Localization for LibreOffice Group: Productivity/Office/Suite @@ -344,11 +345,12 @@ is in libreoffice-l10n-zh-TW. %prep %if %prepare_build == 0 -%setup -D -T -q -n libreoffice-core-%version +%setup -D -T -q -n libreoffice-%version %else -%setup -q -a30 -a31 -n libreoffice-core-%version -%patch0 -bin/unpack-sources `pwd` %{S:1} %{S:2} +%setup -q -a30 -a31 -b1 -b2 -n libreoffice-%version +%patch1 +%patch2 +%patch3 # # patch zip-3.0 %if %suse_version < 1140 @@ -365,86 +367,7 @@ cd - %endif %build -%if %prepare_build != 0 -# first build make-3.82 -cd make-* -CFLAGS=$RPM_OPT_FLAGS ./configure -make %{?_smp_mflags} -cd - -# -# second build zip-3.0 on older distributions -%if %suse_version < 1140 -cd zip30 -make %{?jobs:-j%jobs} -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc -cd - -%endif -# -# Parallel build settings ... -BUILD_SCRIPT_FLAGS= -# dmake does not work with more than 64 jobs -lo_jobs="%{?jobs:%jobs}" -%ifarch %arm -%if ! 0%{?qemu_user_space_build:1} -# native hardware is not that powerful -lo_jobs="" -%endif -%endif -if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then - echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs" - lo_jobs="64" -fi -# do not eat all memory -lo_jobs_reduced= -if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then - if test `uname -i` = "x86_64" ; then - mem_per_process=300 - else - mem_per_process=200 - fi -%if 0%{?qemu_user_space_build:1} - mem_per_process=400 -%endif - max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"` - max_jobs="$(($max_mem / $mem_per_process))" - test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits" - test "$lo_jobs" -le 0 && lo_jobs= && echo "Warning: Do not use the parallel build at all becuse of memory limits" -fi -# finally set jobs -PARALLEL_BUILD= -if test -n "$lo_jobs" ; then - PARALLEL_BUILD="--with-max-jobs=$lo_jobs" - BUILD_SCRIPT_FLAGS="-- -P$lo_jobs" -fi -# parallel build of modules -# it makes sense on machines with more CPUs -num_cpus=`grep ^processor /proc/cpuinfo | wc -l` -# again reduce to 64 CPUs because of dmake -test "$num_cpus" -gt "64" && num_cpus="64" && echo "Warning: dmake does not support more than 64 processes => reducing number of used cpus" -# allow only 2 modules if there more jobs allowed in one module -test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" -PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" -BUILD_SCRIPT_FLAGS="-P$num_cpus $BUILD_SCRIPT_FLAGS" -# using icecream -if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then - PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream" -fi -%endif -# make sure that JAVA_HOME is set correctly -%if 0%{?suse_version} -source /etc/profile.d/alljava.sh -%endif -%if 0%{?meego_version} -export JAVA_HOME=%{java_home} -%endif -# use RPM_OPT_FLAGS, ... -export ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-O[0-9s]//g' -e 's/\-fexceptions//g'` -fno-strict-aliasing" -# FIXME: genccode from the system icu is in /usr/sbin -# FIXME: we need make-3.82 for parallel build -export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/make-%gnu_make_version-gbuild:$PATH:/usr/sbin" -# use the extra built zip-3.0 on older distributions -%if %suse_version < 1140 -export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin" -%endif +%{expand:%(cat %_sourcedir/build_prepare.inc)} %if %prepare_build != 0 ./autogen.sh $PARALLEL_BUILD \ --libdir=%{_libdir} \ @@ -457,9 +380,7 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin" --disable-fetch-external \ --with-external-tar="$RPM_SOURCE_DIR" \ --with-alloc=system \ - --disable-strip-solver \ --with-jdk-home=$JAVA_HOME \ - --with-java-target-version=1.5 \ --with-ant-home=/usr/share/ant \ --without-fonts \ --without-myspell-dicts \ @@ -471,26 +392,26 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin" --disable-evolution2 \ --disable-gstreamer \ --disable-opengl \ + --disable-dbus \ + --disable-gstreamer-0-10 \ + --disable-python \ --disable-mono \ --disable-odk \ --without-junit \ %if %debug_build == 0 --disable-ccache \ %endif - --without-stlport \ - --disable-mozilla \ --without-system-mozilla \ +%if %suse_version < 1210 + --without-system-icu \ +%endif --disable-postgresql-sdbc \ - --disable-ldap \ --disable-cups \ - --disable-fontconfig \ --with-system-dicts \ --with-system-libxml \ --with-system-openssl \ - --with-system-icu \ --with-system-cppunit \ --with-system-expat \ - --with-system-db \ --with-system-boost \ --without-system-jpeg %endif @@ -498,7 +419,10 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin" make helpcontent2.all %install -. ./config_host.mk.source +sed '/SOLARVER/!d' config_host.mk > "${RPM_BUILD_ROOT}/config_host.mk.parsed" +sed '/INPATH/!d' config_host.mk >> "${RPM_BUILD_ROOT}/config_host.mk.parsed" +. "${RPM_BUILD_ROOT}/config_host.mk.parsed" +rm -rf "${RPM_BUILD_ROOT}/config_host.mk.parsed" test -z %lo_langs && langs="en-US" || langs=%lo_langs mkdir -p file-lists for lang in $langs ; do @@ -613,7 +537,6 @@ rm -f %_datadir/%lo_home/help_zh_TW_list.txt.postun 2>/dev/null %endif %if %test_build_langs >= 2 - %files -f file-lists/help_ru_list.txt -n libreoffice-help-ru %defattr(-,root,root) diff --git a/libreoffice-help-groupX.spec.in b/libreoffice-help-groupX.spec.in index 0fc01d9..bee9268 100644 --- a/libreoffice-help-groupX.spec.in +++ b/libreoffice-help-groupX.spec.in @@ -1,7 +1,7 @@ # # spec file for package libreoffice-help-group@GROUP_NUMBER@ # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ Name: libreoffice-help-group@GROUP_NUMBER@ @DO_NOT_EDIT_COMMENT@ -Version: 3.6.3.2.4 +Version: 4.0.2.2.1 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 @@ -27,10 +27,6 @@ Release: 0 # test_build_langs: 1 = de and cs # 2 = all supported languages %define test_build_langs 2 -# build_module_in_parallel 0 = no -# 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 # debug_build: 0 = no # 1 = yes (enable depency tracking, ccache) %define debug_build 0 @@ -49,6 +45,7 @@ Release: 0 %endif #!BuildIgnore: libreoffice # both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22 +BuildRequires: xz BuildRequires: ant BuildRequires: ant-apache-regexp BuildRequires: automake @@ -72,7 +69,6 @@ BuildRequires: perl-Archive-Zip BuildRequires: perl-Compress-Zlib BuildRequires: pkg-config BuildRequires: procps -BuildRequires: python-devel BuildRequires: unzip BuildRequires: xorg-x11-devel BuildRequires: zip @@ -87,9 +83,10 @@ Summary: LibreOffice Help Development License: LGPL-3.0 Group: Productivity/Office/Suite Url: http://www.documentfoundation.org/ -Source0: libreoffice-core-%version.tar.bz2 -Source1: libreoffice-help-%version.tar.bz2 -Source2: libreoffice-translations-%version.tar.bz2 +Source0: libreoffice-%version.tar.xz +Source1: libreoffice-help-%version.tar.xz +Source2: libreoffice-translations-%version.tar.xz +Source10: build_prepare.inc # make-3.82 is needed for parallel build # this version extends plain make-3.82 with --warn-undefined-functions option # URL: http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/make-3.82-gbuild, snapshot 2011-08-17 @@ -100,8 +97,13 @@ Source31: zip-%zip_version.tar.bz2 Source200: libreoffice-help-groupX.spec.in Source201: lo-help-gen-spec Source202: lo-help-groupX -# cups is not needed for helpcontent build -Patch0: build-helpcontent-do-not-check-cups.diff +# lost RPM optflags when compiling bridges +Patch1: bridges-missing-cxxflags.diff +# dmake does not work with more than 64 jobs +# FIXME: this patch won't be necessary in LO-4.1 where dmake has finally been removed +Patch2: build-max-64-jobs.diff +# try to avoid build depency on vcl +Patch3: split-help-buildhack-no-vcl.diff # # Patches against zip-3.0 Patch2000: zip-3.0-iso8859_2.patch @@ -121,11 +123,12 @@ development. @SUBPACKAGES_METAINFO@ %prep %if %prepare_build == 0 -%setup -D -T -q -n libreoffice-core-%version +%setup -D -T -q -n libreoffice-%version %else -%setup -q -a30 -a31 -n libreoffice-core-%version -%patch0 -bin/unpack-sources `pwd` %{S:1} %{S:2} +%setup -q -a30 -a31 -b1 -b2 -n libreoffice-%version +%patch1 +%patch2 +%patch3 # # patch zip-3.0 %if %suse_version < 1140 @@ -142,86 +145,7 @@ cd - %endif %build -%if %prepare_build != 0 -# first build make-3.82 -cd make-* -CFLAGS=$RPM_OPT_FLAGS ./configure -make %{?_smp_mflags} -cd - -# -# second build zip-3.0 on older distributions -%if %suse_version < 1140 -cd zip30 -make %{?jobs:-j%jobs} -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc -cd - -%endif -# -# Parallel build settings ... -BUILD_SCRIPT_FLAGS= -# dmake does not work with more than 64 jobs -lo_jobs="%{?jobs:%jobs}" -%ifarch %arm -%if ! 0%{?qemu_user_space_build:1} -# native hardware is not that powerful -lo_jobs="" -%endif -%endif -if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then - echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs" - lo_jobs="64" -fi -# do not eat all memory -lo_jobs_reduced= -if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then - if test `uname -i` = "x86_64" ; then - mem_per_process=300 - else - mem_per_process=200 - fi -%if 0%{?qemu_user_space_build:1} - mem_per_process=400 -%endif - max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"` - max_jobs="$(($max_mem / $mem_per_process))" - test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits" - test "$lo_jobs" -le 0 && lo_jobs= && echo "Warning: Do not use the parallel build at all becuse of memory limits" -fi -# finally set jobs -PARALLEL_BUILD= -if test -n "$lo_jobs" ; then - PARALLEL_BUILD="--with-max-jobs=$lo_jobs" - BUILD_SCRIPT_FLAGS="-- -P$lo_jobs" -fi -# parallel build of modules -# it makes sense on machines with more CPUs -num_cpus=`grep ^processor /proc/cpuinfo | wc -l` -# again reduce to 64 CPUs because of dmake -test "$num_cpus" -gt "64" && num_cpus="64" && echo "Warning: dmake does not support more than 64 processes => reducing number of used cpus" -# allow only 2 modules if there more jobs allowed in one module -test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" -PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" -BUILD_SCRIPT_FLAGS="-P$num_cpus $BUILD_SCRIPT_FLAGS" -# using icecream -if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then - PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream" -fi -%endif -# make sure that JAVA_HOME is set correctly -%if 0%{?suse_version} -source /etc/profile.d/alljava.sh -%endif -%if 0%{?meego_version} -export JAVA_HOME=%{java_home} -%endif -# use RPM_OPT_FLAGS, ... -export ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-O[0-9s]//g' -e 's/\-fexceptions//g'` -fno-strict-aliasing" -# FIXME: genccode from the system icu is in /usr/sbin -# FIXME: we need make-3.82 for parallel build -export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/make-%gnu_make_version-gbuild:$PATH:/usr/sbin" -# use the extra built zip-3.0 on older distributions -%if %suse_version < 1140 -export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin" -%endif +%{expand:%(cat %_sourcedir/build_prepare.inc)} %if %prepare_build != 0 ./autogen.sh $PARALLEL_BUILD \ --libdir=%{_libdir} \ @@ -234,9 +158,7 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin" --disable-fetch-external \ --with-external-tar="$RPM_SOURCE_DIR" \ --with-alloc=system \ - --disable-strip-solver \ --with-jdk-home=$JAVA_HOME \ - --with-java-target-version=1.5 \ --with-ant-home=/usr/share/ant \ --without-fonts \ --without-myspell-dicts \ @@ -248,26 +170,26 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin" --disable-evolution2 \ --disable-gstreamer \ --disable-opengl \ + --disable-dbus \ + --disable-gstreamer-0-10 \ + --disable-python \ --disable-mono \ --disable-odk \ --without-junit \ %if %debug_build == 0 --disable-ccache \ %endif - --without-stlport \ - --disable-mozilla \ --without-system-mozilla \ +%if %suse_version < 1210 + --without-system-icu \ +%endif --disable-postgresql-sdbc \ - --disable-ldap \ --disable-cups \ - --disable-fontconfig \ --with-system-dicts \ --with-system-libxml \ --with-system-openssl \ - --with-system-icu \ --with-system-cppunit \ --with-system-expat \ - --with-system-db \ --with-system-boost \ --without-system-jpeg %endif @@ -275,7 +197,10 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin" make helpcontent2.all %install -. ./config_host.mk.source +sed '/SOLARVER/!d' config_host.mk > "${RPM_BUILD_ROOT}/config_host.mk.parsed" +sed '/INPATH/!d' config_host.mk >> "${RPM_BUILD_ROOT}/config_host.mk.parsed" +. "${RPM_BUILD_ROOT}/config_host.mk.parsed" +rm -rf "${RPM_BUILD_ROOT}/config_host.mk.parsed" test -z %lo_langs && langs="en-US" || langs=%lo_langs mkdir -p file-lists for lang in $langs ; do diff --git a/libreoffice-icon-themes.changes b/libreoffice-icon-themes.changes index 387256d..f203abe 100644 --- a/libreoffice-icon-themes.changes +++ b/libreoffice-icon-themes.changes @@ -1,3 +1,48 @@ +------------------------------------------------------------------- +Wed Apr 17 10:10:05 UTC 2013 - pmladek@suse.com + +- update to 4.0.2.2.1 (SUSE 4.0-rc1, tag suse-4.0-1, based on upstream 4.0.2.2) + +------------------------------------------------------------------- +Wed Apr 3 13:17:12 UTC 2013 - pmladek@suse.com + +- update to 4.0.2.2 + +------------------------------------------------------------------- +Tue Mar 19 18:04:38 UTC 2013 - pmladek@suse.com + +- update to 4.0.2.1 + +------------------------------------------------------------------- +Thu Feb 28 10:27:15 UTC 2013 - pmladek@suse.com + +- update to 4.0.1.2 + +------------------------------------------------------------------- +Thu Feb 21 10:27:15 UTC 2013 - tchvatal@suse.com + +- update to 4.0.1.1 + +------------------------------------------------------------------- +Tue Jan 22 12:28:43 UTC 2013 - tchvatal@suse.com + +- update to 4.0.0.3 + +------------------------------------------------------------------- +Wed Jan 9 15:31:16 UTC 2013 - tchvatal@suse.com + +- update to 4.0.0.1 + +------------------------------------------------------------------- +Wed Dec 19 13:14:12 UTC 2012 - tchvatal@suse.com + +- update to 4.0.0.0.beta2 + +------------------------------------------------------------------- +Wed Dec 19 09:01:42 UTC 2012 - tchvatal@suse.com + +- update to 4.0.0.0.beta1 + ------------------------------------------------------------------- Fri Dec 14 16:08:15 UTC 2012 - pmladek@suse.com diff --git a/libreoffice-icon-themes.spec b/libreoffice-icon-themes.spec index abba577..3cc3811 100644 --- a/libreoffice-icon-themes.spec +++ b/libreoffice-icon-themes.spec @@ -1,7 +1,7 @@ # # spec file for package libreoffice-icon-themes # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,8 +16,9 @@ # + Name: libreoffice-icon-themes -Version: 3.6.3.2.4 +Version: 4.0.2.2.1 Release: 0 %define ooo_home libreoffice BuildRequires: libreoffice-icon-themes-prebuilt = %version diff --git a/libreoffice-l10n.changes b/libreoffice-l10n.changes index 9f8d362..2e8944d 100644 --- a/libreoffice-l10n.changes +++ b/libreoffice-l10n.changes @@ -1,3 +1,48 @@ +------------------------------------------------------------------- +Wed Apr 17 10:10:05 UTC 2013 - pmladek@suse.com + +- update to 4.0.2.2.1 (SUSE 4.0-rc1, tag suse-4.0-1, based on upstream 4.0.2.2) + +------------------------------------------------------------------- +Wed Apr 3 13:17:12 UTC 2013 - pmladek@suse.com + +- update to 4.0.2.2 + +------------------------------------------------------------------- +Tue Mar 19 18:04:38 UTC 2013 - pmladek@suse.com + +- update to 4.0.2.1 + +------------------------------------------------------------------- +Thu Feb 28 10:27:15 UTC 2013 - pmladek@suse.com + +- update to 4.0.1.2 + +------------------------------------------------------------------- +Thu Feb 21 10:27:15 UTC 2013 - tchvatal@suse.com + +- update to 4.0.1.1 + +------------------------------------------------------------------- +Tue Jan 22 12:28:43 UTC 2013 - tchvatal@suse.com + +- update to 4.0.0.3 + +------------------------------------------------------------------- +Wed Jan 9 15:31:16 UTC 2013 - tchvatal@suse.com + +- update to 4.0.0.1 + +------------------------------------------------------------------- +Wed Dec 19 13:14:12 UTC 2012 - tchvatal@suse.com + +- update to 4.0.0.0.beta2 + +------------------------------------------------------------------- +Wed Dec 19 09:01:42 UTC 2012 - tchvatal@suse.com + +- update to 4.0.0.0.beta1 + ------------------------------------------------------------------- Fri Dec 14 16:08:15 UTC 2012 - pmladek@suse.com diff --git a/libreoffice-l10n.spec b/libreoffice-l10n.spec index 9219235..77abdf7 100644 --- a/libreoffice-l10n.spec +++ b/libreoffice-l10n.spec @@ -16,8 +16,13 @@ # +################################################################### +## DO NOT EDIT THIS SPEC FILE +## Generated by: +## perl lo-l10n-gen-spec libreoffice-l10n.spec.in lo-l10n-data +################################################################### Name: libreoffice-l10n -Version: 3.6.3.2.4 +Version: 4.0.2.2.1 Release: 0 %define piece l10n %define ooo_home libreoffice @@ -65,7 +70,6 @@ This source package is used to build the LibreOffice artwork development package. %if %test_build_langs >= 2 - %package -n libreoffice-l10n-af Summary: African Localization Files for LibreOffice Group: Productivity/Office/Suite @@ -1660,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} @@ -1748,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} @@ -2255,7 +2259,6 @@ rm -rf %{buildroot} %if %test_build_langs >= 2 # af - %posttrans -n libreoffice-l10n-af %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_af_list.txt || true @@ -2266,7 +2269,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_af_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_af_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_af_list.txt.postun 2>/dev/null # am - %posttrans -n libreoffice-l10n-am %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_am_list.txt || true @@ -2277,7 +2279,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_am_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_am_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_am_list.txt.postun 2>/dev/null # ar - %posttrans -n libreoffice-l10n-ar %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ar_list.txt || true @@ -2288,7 +2289,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_ar_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_ar_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_ar_list.txt.postun 2>/dev/null # as - %posttrans -n libreoffice-l10n-as %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_as_list.txt || true @@ -2299,7 +2299,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_as_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_as_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_as_list.txt.postun 2>/dev/null # ast - %posttrans -n libreoffice-l10n-ast %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ast_list.txt || true @@ -2310,7 +2309,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_ast_list.txt %{_datadir}/%ooo_h test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_ast_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_ast_list.txt.postun 2>/dev/null # be-BY - %posttrans -n libreoffice-l10n-be-BY %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_be_list.txt || true @@ -2321,7 +2319,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_be_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_be_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_be_list.txt.postun 2>/dev/null # bg - %posttrans -n libreoffice-l10n-bg %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_bg_list.txt || true @@ -2332,7 +2329,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_bg_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_bg_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_bg_list.txt.postun 2>/dev/null # br - %posttrans -n libreoffice-l10n-br %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_br_list.txt || true @@ -2343,7 +2339,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_br_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_br_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_br_list.txt.postun 2>/dev/null # ca - %posttrans -n libreoffice-l10n-ca %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ca_list.txt || true @@ -2357,7 +2352,6 @@ rm -f %{_datadir}/%ooo_home/lang_ca_list.txt.postun 2>/dev/null %if %test_build_langs >= 1 # cs - %posttrans -n libreoffice-l10n-cs %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_cs_list.txt || true @@ -2371,7 +2365,6 @@ rm -f %{_datadir}/%ooo_home/lang_cs_list.txt.postun 2>/dev/null %if %test_build_langs >= 2 # cy - %posttrans -n libreoffice-l10n-cy %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_cy_list.txt || true @@ -2382,7 +2375,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_cy_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_cy_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_cy_list.txt.postun 2>/dev/null # da - %posttrans -n libreoffice-l10n-da %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_da_list.txt || true @@ -2396,7 +2388,6 @@ rm -f %{_datadir}/%ooo_home/lang_da_list.txt.postun 2>/dev/null %if %test_build_langs >= 1 # de - %posttrans -n libreoffice-l10n-de %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_de_list.txt || true @@ -2410,7 +2401,6 @@ rm -f %{_datadir}/%ooo_home/lang_de_list.txt.postun 2>/dev/null %if %test_build_langs >= 2 # el - %posttrans -n libreoffice-l10n-el %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_el_list.txt || true @@ -2421,7 +2411,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_el_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_el_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_el_list.txt.postun 2>/dev/null # en-GB - %posttrans -n libreoffice-l10n-en-GB %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_en_GB_list.txt || true @@ -2432,7 +2421,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_en_GB_list.txt %{_datadir}/%ooo test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_en_GB_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_en_GB_list.txt.postun 2>/dev/null # en-ZA - %posttrans -n libreoffice-l10n-en-ZA %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_en_ZA_list.txt || true @@ -2443,7 +2431,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_en_ZA_list.txt %{_datadir}/%ooo test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_en_ZA_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_en_ZA_list.txt.postun 2>/dev/null # eo - %posttrans -n libreoffice-l10n-eo %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_eo_list.txt || true @@ -2454,7 +2441,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_eo_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_eo_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_eo_list.txt.postun 2>/dev/null # es - %posttrans -n libreoffice-l10n-es %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_es_list.txt || true @@ -2465,7 +2451,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_es_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_es_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_es_list.txt.postun 2>/dev/null # et - %posttrans -n libreoffice-l10n-et %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_et_list.txt || true @@ -2476,7 +2461,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_et_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_et_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_et_list.txt.postun 2>/dev/null # eu - %posttrans -n libreoffice-l10n-eu %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_eu_list.txt || true @@ -2487,7 +2471,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_eu_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_eu_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_eu_list.txt.postun 2>/dev/null # fi - %posttrans -n libreoffice-l10n-fi %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_fi_list.txt || true @@ -2498,7 +2481,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_fi_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_fi_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_fi_list.txt.postun 2>/dev/null # fr - %posttrans -n libreoffice-l10n-fr %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_fr_list.txt || true @@ -2509,7 +2491,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_fr_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_fr_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_fr_list.txt.postun 2>/dev/null # ga - %posttrans -n libreoffice-l10n-ga %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ga_list.txt || true @@ -2520,7 +2501,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_ga_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_ga_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_ga_list.txt.postun 2>/dev/null # gd - %posttrans -n libreoffice-l10n-gd %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_gd_list.txt || true @@ -2531,7 +2511,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_gd_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_gd_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_gd_list.txt.postun 2>/dev/null # gl - %posttrans -n libreoffice-l10n-gl %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_gl_list.txt || true @@ -2542,7 +2521,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_gl_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_gl_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_gl_list.txt.postun 2>/dev/null # gu-IN - %posttrans -n libreoffice-l10n-gu-IN %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_gu_list.txt || true @@ -2553,7 +2531,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_gu_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_gu_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_gu_list.txt.postun 2>/dev/null # he - %posttrans -n libreoffice-l10n-he %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_he_list.txt || true @@ -2564,7 +2541,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_he_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_he_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_he_list.txt.postun 2>/dev/null # hi-IN - %posttrans -n libreoffice-l10n-hi-IN %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_hi_list.txt || true @@ -2575,7 +2551,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_hi_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_hi_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_hi_list.txt.postun 2>/dev/null # hr - %posttrans -n libreoffice-l10n-hr %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_hr_list.txt || true @@ -2589,7 +2564,6 @@ rm -f %{_datadir}/%ooo_home/lang_hr_list.txt.postun 2>/dev/null %if %test_build_langs >= 1 # hu - %posttrans -n libreoffice-l10n-hu %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_hu_list.txt || true @@ -2603,7 +2577,6 @@ rm -f %{_datadir}/%ooo_home/lang_hu_list.txt.postun 2>/dev/null %if %test_build_langs >= 2 # id - %posttrans -n libreoffice-l10n-id %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_id_list.txt || true @@ -2614,7 +2587,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_id_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_id_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_id_list.txt.postun 2>/dev/null # is - %posttrans -n libreoffice-l10n-is %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_is_list.txt || true @@ -2625,7 +2597,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_is_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_is_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_is_list.txt.postun 2>/dev/null # it - %posttrans -n libreoffice-l10n-it %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_it_list.txt || true @@ -2639,7 +2610,6 @@ rm -f %{_datadir}/%ooo_home/lang_it_list.txt.postun 2>/dev/null %if %test_build_langs >= 1 # ja - %posttrans -n libreoffice-l10n-ja %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ja_list.txt || true @@ -2653,7 +2623,6 @@ rm -f %{_datadir}/%ooo_home/lang_ja_list.txt.postun 2>/dev/null %if %test_build_langs >= 2 # ka - %posttrans -n libreoffice-l10n-ka %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ka_list.txt || true @@ -2664,7 +2633,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_ka_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_ka_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_ka_list.txt.postun 2>/dev/null # km - %posttrans -n libreoffice-l10n-km %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_km_list.txt || true @@ -2675,7 +2643,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_km_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_km_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_km_list.txt.postun 2>/dev/null # kn - %posttrans -n libreoffice-l10n-kn %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_kn_list.txt || true @@ -2686,7 +2653,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_kn_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_kn_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_kn_list.txt.postun 2>/dev/null # ko - %posttrans -n libreoffice-l10n-ko %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ko_list.txt || true @@ -2697,7 +2663,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_ko_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_ko_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_ko_list.txt.postun 2>/dev/null # lt - %posttrans -n libreoffice-l10n-lt %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_lt_list.txt || true @@ -2708,7 +2673,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_lt_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_lt_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_lt_list.txt.postun 2>/dev/null # mk - %posttrans -n libreoffice-l10n-mk %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_mk_list.txt || true @@ -2719,7 +2683,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_mk_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_mk_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_mk_list.txt.postun 2>/dev/null # ml - %posttrans -n libreoffice-l10n-ml %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ml_list.txt || true @@ -2730,7 +2693,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_ml_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_ml_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_ml_list.txt.postun 2>/dev/null # mr - %posttrans -n libreoffice-l10n-mr %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_mr_list.txt || true @@ -2741,7 +2703,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_mr_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_mr_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_mr_list.txt.postun 2>/dev/null # nb - %posttrans -n libreoffice-l10n-nb %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_nb_list.txt || true @@ -2752,7 +2713,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_nb_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_nb_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_nb_list.txt.postun 2>/dev/null # nl - %posttrans -n libreoffice-l10n-nl %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_nl_list.txt || true @@ -2763,7 +2723,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_nl_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_nl_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_nl_list.txt.postun 2>/dev/null # nn - %posttrans -n libreoffice-l10n-nn %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_nn_list.txt || true @@ -2774,7 +2733,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_nn_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_nn_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_nn_list.txt.postun 2>/dev/null # nr - %posttrans -n libreoffice-l10n-nr %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_nr_list.txt || true @@ -2785,7 +2743,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_nr_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_nr_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_nr_list.txt.postun 2>/dev/null # om - %posttrans -n libreoffice-l10n-om %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_om_list.txt || true @@ -2796,7 +2753,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_om_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_om_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_om_list.txt.postun 2>/dev/null # or - %posttrans -n libreoffice-l10n-or %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_or_list.txt || true @@ -2807,7 +2763,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_or_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_or_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_or_list.txt.postun 2>/dev/null # pa-IN - %posttrans -n libreoffice-l10n-pa-IN %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_pa_IN_list.txt || true @@ -2818,7 +2773,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_pa_IN_list.txt %{_datadir}/%ooo test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_pa_IN_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_pa_IN_list.txt.postun 2>/dev/null # pl - %posttrans -n libreoffice-l10n-pl %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_pl_list.txt || true @@ -2829,7 +2783,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_pl_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_pl_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_pl_list.txt.postun 2>/dev/null # pt - %posttrans -n libreoffice-l10n-pt %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_pt_list.txt || true @@ -2840,7 +2793,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_pt_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_pt_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_pt_list.txt.postun 2>/dev/null # pt-BR - %posttrans -n libreoffice-l10n-pt-BR %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_pt_BR_list.txt || true @@ -2851,7 +2803,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_pt_BR_list.txt %{_datadir}/%ooo test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_pt_BR_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_pt_BR_list.txt.postun 2>/dev/null # ro - %posttrans -n libreoffice-l10n-ro %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ro_list.txt || true @@ -2862,7 +2813,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_ro_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_ro_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_ro_list.txt.postun 2>/dev/null # ru - %posttrans -n libreoffice-l10n-ru %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ru_list.txt || true @@ -2873,7 +2823,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_ru_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_ru_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_ru_list.txt.postun 2>/dev/null # rw - %posttrans -n libreoffice-l10n-rw %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_rw_list.txt || true @@ -2884,7 +2833,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_rw_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_rw_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_rw_list.txt.postun 2>/dev/null # sh - %posttrans -n libreoffice-l10n-sh %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_sh_list.txt || true @@ -2895,7 +2843,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_sh_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_sh_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_sh_list.txt.postun 2>/dev/null # sk - %posttrans -n libreoffice-l10n-sk %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_sk_list.txt || true @@ -2906,7 +2853,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_sk_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_sk_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_sk_list.txt.postun 2>/dev/null # sl - %posttrans -n libreoffice-l10n-sl %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_sl_list.txt || true @@ -2917,7 +2863,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_sl_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_sl_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_sl_list.txt.postun 2>/dev/null # sr - %posttrans -n libreoffice-l10n-sr %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_sr_list.txt || true @@ -2928,7 +2873,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_sr_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_sr_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_sr_list.txt.postun 2>/dev/null # ss - %posttrans -n libreoffice-l10n-ss %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ss_list.txt || true @@ -2939,7 +2883,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_ss_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_ss_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_ss_list.txt.postun 2>/dev/null # st - %posttrans -n libreoffice-l10n-st %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_st_list.txt || true @@ -2950,7 +2893,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_st_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_st_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_st_list.txt.postun 2>/dev/null # sv - %posttrans -n libreoffice-l10n-sv %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_sv_list.txt || true @@ -2961,7 +2903,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_sv_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_sv_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_sv_list.txt.postun 2>/dev/null # ta - %posttrans -n libreoffice-l10n-ta %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ta_list.txt || true @@ -2972,7 +2913,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_ta_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_ta_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_ta_list.txt.postun 2>/dev/null # te - %posttrans -n libreoffice-l10n-te %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_te_list.txt || true @@ -2983,7 +2923,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_te_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_te_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_te_list.txt.postun 2>/dev/null # tg - %posttrans -n libreoffice-l10n-tg %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_tg_list.txt || true @@ -2994,7 +2933,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_tg_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_tg_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_tg_list.txt.postun 2>/dev/null # th - %posttrans -n libreoffice-l10n-th %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_th_list.txt || true @@ -3005,7 +2943,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_th_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_th_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_th_list.txt.postun 2>/dev/null # tr - %posttrans -n libreoffice-l10n-tr %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_tr_list.txt || true @@ -3016,7 +2953,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_tr_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_tr_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_tr_list.txt.postun 2>/dev/null # ts - %posttrans -n libreoffice-l10n-ts %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ts_list.txt || true @@ -3027,7 +2963,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_ts_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_ts_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_ts_list.txt.postun 2>/dev/null # ug - %posttrans -n libreoffice-l10n-ug %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ug_list.txt || true @@ -3038,7 +2973,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_ug_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_ug_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_ug_list.txt.postun 2>/dev/null # uk - %posttrans -n libreoffice-l10n-uk %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_uk_list.txt || true @@ -3049,7 +2983,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_uk_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_uk_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_uk_list.txt.postun 2>/dev/null # ve - %posttrans -n libreoffice-l10n-ve %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ve_list.txt || true @@ -3060,7 +2993,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_ve_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_ve_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_ve_list.txt.postun 2>/dev/null # vi - %posttrans -n libreoffice-l10n-vi %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_vi_list.txt || true @@ -3071,7 +3003,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_vi_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_vi_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_vi_list.txt.postun 2>/dev/null # xh - %posttrans -n libreoffice-l10n-xh %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_xh_list.txt || true @@ -3082,7 +3013,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_xh_list.txt %{_datadir}/%ooo_ho test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_xh_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_xh_list.txt.postun 2>/dev/null # zh-CN - %posttrans -n libreoffice-l10n-zh-CN %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_zh_CN_list.txt || true @@ -3093,7 +3023,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_zh_CN_list.txt %{_datadir}/%ooo test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_zh_CN_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_zh_CN_list.txt.postun 2>/dev/null # zh-TW - %posttrans -n libreoffice-l10n-zh-TW %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_zh_TW_list.txt || true @@ -3104,7 +3033,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_zh_TW_list.txt %{_datadir}/%ooo test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_zh_TW_list.txt.postun || true rm -f %{_datadir}/%ooo_home/lang_zh_TW_list.txt.postun 2>/dev/null # zu - %posttrans -n libreoffice-l10n-zu %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_zu_list.txt || true @@ -3117,7 +3045,6 @@ rm -f %{_datadir}/%ooo_home/lang_zu_list.txt.postun 2>/dev/null %endif %if %test_build_langs >= 2 - %files -f lang_af_list.txt -n libreoffice-l10n-af %defattr(-,root,root) diff --git a/libreoffice-l10n.spec.in b/libreoffice-l10n.spec.in index b8415eb..e13994f 100644 --- a/libreoffice-l10n.spec.in +++ b/libreoffice-l10n.spec.in @@ -1,7 +1,7 @@ # # spec file for package libreoffice-l10n # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ @DO_NOT_EDIT_COMMENT@ Name: libreoffice-l10n -Version: 3.6.3.2.4 +Version: 4.0.2.2.1 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 760bfc4..6785804 100644 --- a/libreoffice-poppler-0.17.0-reject-fix.diff +++ b/libreoffice-poppler-0.17.0-reject-fix.diff @@ -1,8 +1,7 @@ -Index: configure.in -=================================================================== ---- configure.in.orig -+++ configure.in -@@ -9157,16 +9157,6 @@ if test "x$enable_ext_pdfimport" != "xno +diff -urN libreoffice-4.0.0.0.beta2.old/configure.ac libreoffice-4.0.0.0.beta2/configure.ac +--- libreoffice-4.0.0.0.beta2.old/configure.ac 2012-12-19 19:09:46.671989527 +0100 ++++ libreoffice-4.0.0.0.beta2/configure.ac 2012-12-21 11:55:05.917387357 +0100 +@@ -9532,16 +9532,6 @@ AC_MSG_RESULT([external]) SYSTEM_POPPLER=YES PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 ) @@ -16,14 +15,13 @@ Index: configure.in - CXXFLAGS=$save_CXXFLAGS - CPPFLAGS=$save_CPPFLAGS - AC_LANG_POP([C++]) + libo_MINGW_CHECK_DLL([POPPLER], [libpoppler]) else AC_MSG_RESULT([internal]) - SYSTEM_POPPLER=NO -Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -=================================================================== ---- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig -+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -@@ -46,16 +46,7 @@ +diff -urN libreoffice-4.0.0.0.beta2.old/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx libreoffice-4.0.0.0.beta2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +--- libreoffice-4.0.0.0.beta2.old/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2012-12-19 19:09:46.770989517 +0100 ++++ libreoffice-4.0.0.0.beta2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2012-12-21 11:53:57.775393673 +0100 +@@ -34,16 +34,7 @@ #pragma warning(push, 1) #endif @@ -40,7 +38,7 @@ Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx #if defined __SUNPRO_CC #pragma enable_warn -@@ -163,11 +154,7 @@ void writeBinaryBuffer( const OutputBuff +@@ -151,11 +142,7 @@ void writeJpeg_( OutputBuffer& o_rOutputBuf, Stream* str, bool bWithLinefeed ) { // dump JPEG file as-is @@ -52,7 +50,7 @@ Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx str->reset(); int c; -@@ -506,13 +493,7 @@ void PDFOutDev::endPage() +@@ -494,13 +481,7 @@ printf("endPage\n"); } @@ -66,11 +64,956 @@ Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx { assert(link); -Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -=================================================================== ---- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig -+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -@@ -65,14 +65,7 @@ class GfxPath; +diff -urN libreoffice-4.0.0.0.beta2.old/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig libreoffice-4.0.0.0.beta2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig +--- libreoffice-4.0.0.0.beta2.old/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig 1970-01-01 01:00:00.000000000 +0100 ++++ libreoffice-4.0.0.0.beta2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig 2012-12-20 23:38:18.843485743 +0100 +@@ -0,0 +1,942 @@ ++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ ++/* ++ * This file is part of the LibreOffice project. ++ * ++ * This Source Code Form is subject to the terms of the Mozilla Public ++ * License, v. 2.0. If a copy of the MPL was not distributed with this ++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. ++ * ++ * This file incorporates work covered by the following license notice: ++ * ++ * Licensed to the Apache Software Foundation (ASF) under one or more ++ * contributor license agreements. See the NOTICE file distributed ++ * with this work for additional information regarding copyright ++ * ownership. The ASF licenses this file to you under the Apache ++ * License, Version 2.0 (the "License"); you may not use this file ++ * except in compliance with the License. You may obtain a copy of ++ * the License at http://www.apache.org/licenses/LICENSE-2.0 . ++ */ ++ ++#include "pdfioutdev_gpl.hxx" ++#include "pnghelper.hxx" ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include ++ ++#if defined __SUNPRO_CC ++#pragma disable_warn ++#elif defined _MSC_VER ++#pragma warning(push, 1) ++#endif ++ ++// 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" ++#endif ++ ++#if defined __SUNPRO_CC ++#pragma enable_warn ++#elif defined _MSC_VER ++#pragma warning(pop) ++#endif ++ ++#ifdef WNT ++# define snprintf _snprintf ++ ++#if defined GCC ++#pragma GCC diagnostic warning "-Wformat" ++#pragma GCC diagnostic warning "-Wformat-extra-args" ++#endif ++#endif ++ ++/* SYNC STREAMS ++ ============ ++ ++ We stream human-readble tokens to stdout, and binary data (fonts, ++ bitmaps) to g_binary_out. Another process reads from those pipes, and ++ there lies the rub: things can deadlock, if the two involved ++ processes access the pipes in different order. At any point in ++ time, both processes must access the same pipe. To ensure this, ++ data must be flushed to the OS before writing to a different pipe, ++ otherwise not-yet-written data will leave the reading process ++ waiting on the wrong pipe. ++ */ ++ ++namespace pdfi ++{ ++ ++/// cut off very small numbers & clamp value to zero ++inline double normalize( double val ) ++{ ++ return fabs(val) < 0.0000001 ? 0.0 : val; ++} ++ ++namespace ++{ ++ ++/** Escapes line-ending characters (\n and \r) in input string. ++ */ ++boost::shared_array lcl_escapeLineFeeds(const char* const i_pStr) ++{ ++ size_t nLength(strlen(i_pStr)); ++ char* pBuffer = new char[2*nLength+1]; ++ ++ const char* pRead = i_pStr; ++ char* pWrite = pBuffer; ++ while( nLength-- ) ++ { ++ if( *pRead == '\r' ) ++ { ++ *pWrite++ = '\\'; ++ *pWrite++ = 'r'; ++ } ++ else if( *pRead == '\n' ) ++ { ++ *pWrite++ = '\\'; ++ *pWrite++ = 'n'; ++ } ++ else if( *pRead == '\\' ) ++ { ++ *pWrite++ = '\\'; ++ *pWrite++ = '\\'; ++ } ++ else ++ *pWrite++ = *pRead; ++ pRead++; ++ } ++ *pWrite++ = 0; ++ ++ return boost::shared_array(pBuffer); ++} ++ ++} ++ ++/// for the temp char buffer the header gets snprintfed in ++#define WRITE_BUFFER_SIZE 1024 ++ ++/// for the initial std::vector capacity when copying stream from xpdf ++#define WRITE_BUFFER_INITIAL_CAPACITY (1024*100) ++ ++void initBuf(OutputBuffer& io_rBuffer) ++{ ++ io_rBuffer.reserve(WRITE_BUFFER_INITIAL_CAPACITY); ++} ++ ++void writeBinaryBuffer( const OutputBuffer& rBuffer ) ++{ ++ // ---sync point--- see SYNC STREAMS above ++ fflush(stdout); ++ ++ // put buffer to stderr ++ if( !rBuffer.empty() ) ++ if( fwrite(&rBuffer[0], sizeof(char), ++ rBuffer.size(), g_binary_out) != (size_t)rBuffer.size() ) ++ exit(1); // error ++ ++ // ---sync point--- see SYNC STREAMS above ++ fflush(g_binary_out); ++} ++ ++void writeJpeg_( OutputBuffer& o_rOutputBuf, Stream* str, bool bWithLinefeed ) ++{ ++ // dump JPEG file as-is ++#if POPPLER_CHECK_VERSION(0, 17, 3) ++ str = str->getBaseStream(); ++#else ++ str = ((DCTStream *)str)->getRawStream(); ++#endif ++ str->reset(); ++ ++ int c; ++ o_rOutputBuf.clear(); ++ while((c=str->getChar()) != EOF) ++ o_rOutputBuf.push_back(static_cast(c)); ++ ++ printf( " JPEG %d", (int)o_rOutputBuf.size() ); ++ if( bWithLinefeed ) ++ printf("\n"); ++ ++ str->close(); ++} ++ ++void writePbm_(OutputBuffer& o_rOutputBuf, Stream* str, int width, int height, bool bWithLinefeed, bool bInvert ) ++{ ++ // write as PBM (char by char, to avoid stdlib lineend messing) ++ o_rOutputBuf.clear(); ++ o_rOutputBuf.resize(WRITE_BUFFER_SIZE); ++ o_rOutputBuf[0] = 'P'; ++ o_rOutputBuf[1] = '4'; ++ o_rOutputBuf[2] = 0x0A; ++ char *pAsCharPtr = reinterpret_cast(&o_rOutputBuf[3]); ++ int nOutLen = snprintf(pAsCharPtr, WRITE_BUFFER_SIZE-10, "%d %d", width, height); ++ if( nOutLen < 0 ) ++ nOutLen = WRITE_BUFFER_SIZE-10; ++ o_rOutputBuf[3+nOutLen] =0x0A; ++ o_rOutputBuf[3+nOutLen+1]=0; ++ ++ const int header_size = 3+nOutLen+1; ++ const int size = height * ((width + 7) / 8); ++ ++ printf( " PBM %d", size + header_size ); ++ if( bWithLinefeed ) ++ printf("\n"); ++ ++ // trim buffer to exact header length ++ o_rOutputBuf.resize(header_size); ++ ++ // initialize stream ++ str->reset(); ++ ++ // copy the raw stream ++ if( bInvert ) ++ { ++ for( int i=0; i(str->getChar() ^ 0xff)); ++ } ++ else ++ { ++ for( int i=0; i(str->getChar())); ++ } ++ ++ str->close(); ++} ++ ++void writePpm_( OutputBuffer& o_rOutputBuf, ++ Stream* str, ++ int width, ++ int height, ++ GfxImageColorMap* colorMap, ++ bool bWithLinefeed ) ++{ ++ // write as PPM (char by char, to avoid stdlib lineend messing) ++ o_rOutputBuf.clear(); ++ o_rOutputBuf.resize(WRITE_BUFFER_SIZE); ++ o_rOutputBuf[0] = 'P'; ++ o_rOutputBuf[1] = '6'; ++ o_rOutputBuf[2] = '\n'; ++ char *pAsCharPtr = reinterpret_cast(&o_rOutputBuf[3]); ++ int nOutLen = snprintf(pAsCharPtr, WRITE_BUFFER_SIZE-10, "%d %d", width, height); ++ if( nOutLen < 0 ) ++ nOutLen = WRITE_BUFFER_SIZE-10; ++ o_rOutputBuf[3+nOutLen] ='\n'; ++ o_rOutputBuf[3+nOutLen+1]='2'; ++ o_rOutputBuf[3+nOutLen+2]='5'; ++ o_rOutputBuf[3+nOutLen+3]='5'; ++ o_rOutputBuf[3+nOutLen+4]='\n'; ++ o_rOutputBuf[3+nOutLen+5]=0; ++ ++ const int header_size = 3+nOutLen+5; ++ const int size = width*height*3 + header_size; ++ ++ printf( " PPM %d", size ); ++ if( bWithLinefeed ) ++ printf("\n"); ++ ++ // trim buffer to exact header size ++ o_rOutputBuf.resize(header_size); ++ ++ // initialize stream ++ Guchar *p; ++ GfxRGB rgb; ++ ImageStream* imgStr = ++ new ImageStream(str, ++ width, ++ colorMap->getNumPixelComps(), ++ colorMap->getBits()); ++ imgStr->reset(); ++ ++ for( int y=0; ygetLine(); ++ for( int x=0; xgetRGB(p, &rgb); ++ o_rOutputBuf.push_back(colToByte(rgb.r)); ++ o_rOutputBuf.push_back(colToByte(rgb.g)); ++ o_rOutputBuf.push_back(colToByte(rgb.b)); ++ ++ p +=colorMap->getNumPixelComps(); ++ } ++ } ++ ++ delete imgStr; ++ ++} ++ ++// call this only for 1 bit image streams ! ++void writePng_( OutputBuffer& o_rOutputBuf, ++ Stream* str, ++ int width, ++ int height, ++ GfxRGB& zeroColor, ++ GfxRGB& oneColor, ++ bool bIsMask, ++ bool bWithLinefeed ) ++{ ++ o_rOutputBuf.clear(); ++ ++ // get png image ++ PngHelper::createPng( o_rOutputBuf, str, width, height, zeroColor, oneColor, bIsMask ); ++ ++ printf( " PNG %d", (int)o_rOutputBuf.size() ); ++ if( bWithLinefeed ) ++ printf("\n"); ++} ++ ++void writePng_( OutputBuffer& o_rOutputBuf, ++ Stream* str, ++ int width, int height, GfxImageColorMap* colorMap, ++ Stream* maskStr, ++ int maskWidth, int maskHeight, GfxImageColorMap* maskColorMap, ++ bool bWithLinefeed ) ++{ ++ o_rOutputBuf.clear(); ++ ++ // get png image ++ PngHelper::createPng( o_rOutputBuf, str, width, height, colorMap, maskStr, maskWidth, maskHeight, maskColorMap ); ++ ++ printf( " PNG %d", (int)o_rOutputBuf.size() ); ++ if( bWithLinefeed ) ++ printf("\n"); ++} ++ ++void writePng_( OutputBuffer& o_rOutputBuf, ++ Stream* str, ++ int width, int height, GfxImageColorMap* colorMap, ++ Stream* maskStr, ++ int maskWidth, int maskHeight, bool maskInvert, ++ bool bWithLinefeed ) ++{ ++ o_rOutputBuf.clear(); ++ ++ // get png image ++ PngHelper::createPng( o_rOutputBuf, str, width, height, colorMap, maskStr, maskWidth, maskHeight, maskInvert ); ++ ++ printf( " PNG %d", (int)o_rOutputBuf.size() ); ++ if( bWithLinefeed ) ++ printf("\n"); ++} ++ ++// stolen from ImageOutputDev.cc ++void writeMask_( OutputBuffer& o_rOutputBuf, Stream* str, int width, int height, bool bWithLinefeed, bool bInvert ) ++{ ++ if( str->getKind() == strDCT ) ++ writeJpeg_(o_rOutputBuf, str, bWithLinefeed); ++ else ++ writePbm_(o_rOutputBuf, str, width, height, bWithLinefeed, bInvert ); ++} ++ ++void writeImage_( OutputBuffer& o_rOutputBuf, ++ Stream* str, ++ int width, ++ int height, ++ GfxImageColorMap* colorMap, ++ bool bWithLinefeed ) ++{ ++ // dump JPEG file ++ if( str->getKind() == strDCT && ++ (colorMap->getNumPixelComps() == 1 || ++ colorMap->getNumPixelComps() == 3) ) ++ { ++ writeJpeg_(o_rOutputBuf, str, bWithLinefeed); ++ } ++ else if (colorMap->getNumPixelComps() == 1 && ++ colorMap->getBits() == 1) ++ { ++ // this is a two color bitmap, write a png ++ // provide default colors ++ GfxRGB zeroColor = { 0, 0, 0 }, ++ oneColor = { byteToCol( 0xff ), byteToCol( 0xff ), byteToCol( 0xff ) }; ++ if( colorMap->getColorSpace()->getMode() == csIndexed || colorMap->getColorSpace()->getMode() == csDeviceGray ) ++ { ++ Guchar nIndex = 0; ++ colorMap->getRGB( &nIndex, &zeroColor ); ++ nIndex = 1; ++ colorMap->getRGB( &nIndex, &oneColor ); ++ } ++ writePng_( o_rOutputBuf, str, width, height, zeroColor, oneColor, false, bWithLinefeed ); ++ } ++ else ++ writePpm_( o_rOutputBuf, str, width, height, colorMap, bWithLinefeed ); ++} ++ ++// forwarders ++// ------------------------------------------------------------------ ++ ++inline void writeImage( OutputBuffer& o_rOutputBuf, ++ Stream* str, ++ int width, ++ int height, ++ GfxImageColorMap* colorMap ) { writeImage_(o_rOutputBuf,str,width,height,colorMap,false); } ++inline void writeImageLF( OutputBuffer& o_rOutputBuf, ++ Stream* str, ++ int width, ++ int height, ++ GfxImageColorMap* colorMap ) { writeImage_(o_rOutputBuf,str,width,height,colorMap,true); } ++inline void writeMask( OutputBuffer& o_rOutputBuf, ++ Stream* str, ++ int width, ++ int height, ++ bool bInvert ) { writeMask_(o_rOutputBuf,str,width,height,false,bInvert); } ++inline void writeMaskLF( OutputBuffer& o_rOutputBuf, ++ Stream* str, ++ int width, ++ int height, ++ bool bInvert ) { writeMask_(o_rOutputBuf,str,width,height,true,bInvert); } ++ ++// ------------------------------------------------------------------ ++ ++ ++int PDFOutDev::parseFont( long long nNewId, GfxFont* gfxFont, GfxState* state ) const ++{ ++ FontAttributes aNewFont; ++ int nSize = 0; ++ ++ GooString* pFamily = gfxFont->getName(); ++ if( pFamily ) ++ { ++ aNewFont.familyName.clear(); ++ aNewFont.familyName.append( gfxFont->getName() ); ++ } ++ else ++ { ++ aNewFont.familyName.clear(); ++ aNewFont.familyName.append( "Arial" ); ++ } ++ ++ aNewFont.isBold = gfxFont->isBold(); ++ aNewFont.isItalic = gfxFont->isItalic(); ++ aNewFont.size = state->getTransformedFontSize(); ++ aNewFont.isUnderline = false; ++ ++ if( gfxFont->getType() == fontTrueType || gfxFont->getType() == fontType1 ) ++ { ++ // TODO(P3): Unfortunately, need to read stream twice, since ++ // we must write byte count to stdout before ++ char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize ); ++ if( pBuf ) ++ aNewFont.isEmbedded = true; ++ } ++ ++ m_aFontMap[ nNewId ] = aNewFont; ++ return nSize; ++} ++ ++void PDFOutDev::writeFontFile( GfxFont* gfxFont ) const ++{ ++ if( gfxFont->getType() != fontTrueType && gfxFont->getType() != fontType1 ) ++ return; ++ ++ int nSize = 0; ++ char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize ); ++ if( !pBuf ) ++ return; ++ ++ // ---sync point--- see SYNC STREAMS above ++ fflush(stdout); ++ ++ if( fwrite(pBuf, sizeof(char), nSize, g_binary_out) != (size_t)nSize ) ++ exit(1); // error ++ ++ // ---sync point--- see SYNC STREAMS above ++ fflush(g_binary_out); ++} ++ ++void PDFOutDev::printPath( GfxPath* pPath ) const ++{ ++ int nSubPaths = pPath ? pPath->getNumSubpaths() : 0; ++ for( int i=0; igetSubpath( i ); ++ const int nPoints = pSub->getNumPoints(); ++ ++ printf( " subpath %d", pSub->isClosed() ); ++ ++ for( int n=0; ngetX(n)), ++ normalize(pSub->getY(n)), ++ pSub->getCurve(n) ); ++ } ++ } ++} ++ ++PDFOutDev::PDFOutDev( PDFDoc* pDoc ) : ++ m_pDoc( pDoc ), ++ m_aFontMap(), ++ m_pUtf8Map( new UnicodeMap((char*)"UTF-8", gTrue, &mapUTF8) ) ++{ ++} ++ ++void PDFOutDev::startPage(int /*pageNum*/, GfxState* state) ++{ ++ assert(state); ++ printf("startPage %f %f\n", ++ normalize(state->getPageWidth()), ++ normalize(state->getPageHeight())); ++} ++ ++void PDFOutDev::endPage() ++{ ++ printf("endPage\n"); ++} ++ ++#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*) ++#endif ++{ ++ assert(link); ++ ++ double x1,x2,y1,y2; ++ link->getRect( &x1, &y1, &x2, &y2 ); ++ ++ LinkAction* pAction = link->getAction(); ++ if( pAction->getKind() == actionURI ) ++ { ++ const char* pURI = static_cast(pAction)->getURI()->getCString(); ++ ++ boost::shared_array pEsc( lcl_escapeLineFeeds(pURI) ); ++ ++ printf( "drawLink %f %f %f %f %s\n", ++ normalize(x1), ++ normalize(y1), ++ normalize(x2), ++ normalize(y2), ++ pEsc.get() ); ++ } ++} ++ ++void PDFOutDev::saveState(GfxState*) ++{ ++ printf( "saveState\n" ); ++} ++ ++void PDFOutDev::restoreState(GfxState*) ++{ ++ printf( "restoreState\n" ); ++} ++ ++void PDFOutDev::setDefaultCTM(double *pMat) ++{ ++ assert(pMat); ++ ++ OutputDev::setDefaultCTM(pMat); ++ ++ printf( "updateCtm %f %f %f %f %f %f\n", ++ normalize(pMat[0]), ++ normalize(pMat[2]), ++ normalize(pMat[1]), ++ normalize(pMat[3]), ++ normalize(pMat[4]), ++ normalize(pMat[5]) ); ++} ++ ++void PDFOutDev::updateCTM(GfxState* state, ++ double, double, ++ double, double, ++ double, double) ++{ ++ assert(state); ++ ++ const double* const pMat = state->getCTM(); ++ assert(pMat); ++ ++ printf( "updateCtm %f %f %f %f %f %f\n", ++ normalize(pMat[0]), ++ normalize(pMat[2]), ++ normalize(pMat[1]), ++ normalize(pMat[3]), ++ normalize(pMat[4]), ++ normalize(pMat[5]) ); ++} ++ ++void PDFOutDev::updateLineDash(GfxState *state) ++{ ++ assert(state); ++ ++ double* dashArray; int arrayLen; double startOffset; ++ state->getLineDash(&dashArray, &arrayLen, &startOffset); ++ ++ printf( "updateLineDash" ); ++ if( arrayLen && dashArray ) ++ { ++ printf( " %f %d", normalize(startOffset), arrayLen ); ++ for( int i=0; igetFlatness() ); ++} ++ ++void PDFOutDev::updateLineJoin(GfxState *state) ++{ ++ assert(state); ++ printf( "updateLineJoin %d\n", state->getLineJoin() ); ++} ++ ++void PDFOutDev::updateLineCap(GfxState *state) ++{ ++ assert(state); ++ printf( "updateLineCap %d\n", state->getLineCap() ); ++} ++ ++void PDFOutDev::updateMiterLimit(GfxState *state) ++{ ++ assert(state); ++ printf( "updateMiterLimit %f\n", normalize(state->getMiterLimit()) ); ++} ++ ++void PDFOutDev::updateLineWidth(GfxState *state) ++{ ++ assert(state); ++ printf( "updateLineWidth %f\n", normalize(state->getLineWidth()) ); ++} ++ ++void PDFOutDev::updateFillColor(GfxState *state) ++{ ++ assert(state); ++ ++ GfxRGB aRGB; ++ state->getFillRGB( &aRGB ); ++ ++ printf( "updateFillColor %f %f %f %f\n", ++ normalize(colToDbl(aRGB.r)), ++ normalize(colToDbl(aRGB.g)), ++ normalize(colToDbl(aRGB.b)), ++ normalize(state->getFillOpacity()) ); ++} ++ ++void PDFOutDev::updateStrokeColor(GfxState *state) ++{ ++ assert(state); ++ ++ GfxRGB aRGB; ++ state->getStrokeRGB( &aRGB ); ++ ++ printf( "updateStrokeColor %f %f %f %f\n", ++ normalize(colToDbl(aRGB.r)), ++ normalize(colToDbl(aRGB.g)), ++ normalize(colToDbl(aRGB.b)), ++ normalize(state->getFillOpacity()) ); ++} ++ ++void PDFOutDev::updateFillOpacity(GfxState *state) ++{ ++ updateFillColor(state); ++} ++ ++void PDFOutDev::updateStrokeOpacity(GfxState *state) ++{ ++ updateStrokeColor(state); ++} ++ ++void PDFOutDev::updateBlendMode(GfxState*) ++{ ++} ++ ++void PDFOutDev::updateFont(GfxState *state) ++{ ++ assert(state); ++ ++ GfxFont *gfxFont = state->getFont(); ++ if( gfxFont ) ++ { ++ FontAttributes aFont; ++ int nEmbedSize=0; ++ ++ Ref* pID = gfxFont->getID(); ++ // TODO(Q3): Portability problem ++ long long fontID = (long long)pID->gen << 32 | (long long)pID->num; ++ boost::unordered_map< long long, FontAttributes >::const_iterator it = ++ m_aFontMap.find( fontID ); ++ if( it == m_aFontMap.end() ) ++ { ++ nEmbedSize = parseFont( fontID, gfxFont, state ); ++ it = m_aFontMap.find( fontID ); ++ } ++ ++ printf( "updateFont" ); ++ if( it != m_aFontMap.end() ) ++ { ++ // conflating this with printf below crashes under Windoze ++ printf( " %lld", fontID ); ++ ++ aFont = it->second; ++ ++ boost::shared_array pEsc( lcl_escapeLineFeeds(aFont.familyName.getCString()) ); ++ printf( " %d %d %d %d %f %d %s", ++ aFont.isEmbedded, ++ aFont.isBold, ++ aFont.isItalic, ++ aFont.isUnderline, ++ normalize(state->getTransformedFontSize()), ++ nEmbedSize, ++ pEsc.get() ); ++ } ++ printf( "\n" ); ++ ++ if( nEmbedSize ) ++ writeFontFile(gfxFont); ++ } ++} ++ ++void PDFOutDev::updateRender(GfxState *state) ++{ ++ assert(state); ++ ++ printf( "setTextRenderMode %d\n", state->getRender() ); ++} ++ ++void PDFOutDev::stroke(GfxState *state) ++{ ++ assert(state); ++ ++ printf( "strokePath" ); ++ printPath( state->getPath() ); ++ printf( "\n" ); ++} ++ ++void PDFOutDev::fill(GfxState *state) ++{ ++ assert(state); ++ ++ printf( "fillPath" ); ++ printPath( state->getPath() ); ++ printf( "\n" ); ++} ++ ++void PDFOutDev::eoFill(GfxState *state) ++{ ++ assert(state); ++ ++ printf( "eoFillPath" ); ++ printPath( state->getPath() ); ++ printf( "\n" ); ++} ++ ++void PDFOutDev::clip(GfxState *state) ++{ ++ assert(state); ++ ++ printf( "clipPath" ); ++ printPath( state->getPath() ); ++ printf( "\n" ); ++} ++ ++void PDFOutDev::eoClip(GfxState *state) ++{ ++ assert(state); ++ ++ printf( "eoClipPath" ); ++ printPath( state->getPath() ); ++ printf( "\n" ); ++} ++ ++/** Output one glyph ++ ++ ++ @param dx ++ horizontal skip for character (already scaled with font size) + ++ inter-char space: cursor is shifted by this amount for next char ++ ++ @param dy ++ vertical skip for character (zero for horizontal writing mode): ++ cursor is shifted by this amount for next char ++ ++ @param originX ++ local offset of character (zero for horizontal writing mode). not ++ taken into account for output pos updates. Used for vertical writing. ++ ++ @param originY ++ local offset of character (zero for horizontal writing mode). not ++ taken into account for output pos updates. Used for vertical writing. ++ */ ++void PDFOutDev::drawChar(GfxState *state, double x, double y, ++ double dx, double dy, ++ double originX, double originY, ++ CharCode, int /*nBytes*/, Unicode *u, int uLen) ++{ ++ assert(state); ++ ++ if( u == NULL ) ++ return; ++ ++ // normalize coordinates: correct from baseline-relative to upper ++ // left corner of glyphs ++ double x2(0.0), y2(0.0); ++ state->textTransformDelta( 0.0, ++ state->getFont()->getAscent(), ++ &x2, &y2 ); ++ const double fFontSize(state->getFontSize()); ++ x += x2*fFontSize; ++ y += y2*fFontSize; ++ ++ const double aPositionX(x-originX); ++ const double aPositionY(y-originY); ++ // TODO(F2): use leading here, when set ++ const double nWidth(dx != 0.0 ? dx : fFontSize); ++ const double nHeight(dy != 0.0 ? dy : fFontSize); ++ ++ const double* pTextMat=state->getTextMat(); ++ printf( "drawChar %f %f %f %f %f %f %f %f ", ++ normalize(aPositionX), ++ normalize(aPositionY), ++ normalize(aPositionX+nWidth), ++ normalize(aPositionY-nHeight), ++ normalize(pTextMat[0]), ++ normalize(pTextMat[2]), ++ normalize(pTextMat[1]), ++ normalize(pTextMat[3]) ); ++ ++ // silence spurious warning ++ (void)&mapUCS2; ++ ++ char buf[9]; ++ for( int i=0; imapUnicode(u[i], buf, sizeof(buf)-1) ] = 0; ++ boost::shared_array pEsc( lcl_escapeLineFeeds(buf) ); ++ printf( "%s", pEsc.get() ); ++ } ++ ++ printf( "\n" ); ++} ++ ++void PDFOutDev::drawString(GfxState*, GooString* /*s*/) ++{ ++ // TODO(F3): NYI ++} ++ ++void PDFOutDev::endTextObject(GfxState*) ++{ ++ printf( "endTextObject\n" ); ++} ++ ++void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str, ++ int width, int height, GBool invert, ++ GBool /*inlineImg*/ ) ++{ ++ OutputBuffer aBuf; initBuf(aBuf); ++ ++ printf( "drawMask %d %d %d", width, height, invert ); ++ ++ int bitsPerComponent = 1; ++ StreamColorSpaceMode csMode = streamCSNone; ++ str->getImageParams( &bitsPerComponent, &csMode ); ++ if( bitsPerComponent == 1 && (csMode == streamCSNone || csMode == streamCSDeviceGray) ) ++ { ++ GfxRGB oneColor = { dblToCol( 1.0 ), dblToCol( 1.0 ), dblToCol( 1.0 ) }; ++ GfxRGB zeroColor = { dblToCol( 0.0 ), dblToCol( 0.0 ), dblToCol( 0.0 ) }; ++ pState->getFillColorSpace()->getRGB( pState->getFillColor(), &zeroColor ); ++ if( invert ) ++ writePng_( aBuf, str, width, height, oneColor, zeroColor, true, true ); ++ else ++ writePng_( aBuf, str, width, height, zeroColor, oneColor, true, true ); ++ } ++ else ++ writeMaskLF(aBuf, str, width, height, invert != 0); ++ writeBinaryBuffer(aBuf); ++} ++ ++void PDFOutDev::drawImage(GfxState*, Object*, Stream* str, ++ int width, int height, GfxImageColorMap* colorMap, ++ int* maskColors, GBool /*inlineImg*/ ) ++{ ++ OutputBuffer aBuf; initBuf(aBuf); ++ OutputBuffer aMaskBuf; ++ ++ printf( "drawImage %d %d", width, height ); ++ ++ if( maskColors ) ++ { ++ // write mask colors. nBytes must be even - first half is ++ // lower bound values, second half upper bound values ++ if( colorMap->getColorSpace()->getMode() == csIndexed ) ++ { ++ aMaskBuf.push_back( (char)maskColors[0] ); ++ aMaskBuf.push_back( (char)maskColors[gfxColorMaxComps] ); ++ } ++ else ++ { ++ GfxRGB aMinRGB; ++ colorMap->getColorSpace()->getRGB( ++ (GfxColor*)maskColors, ++ &aMinRGB ); ++ ++ GfxRGB aMaxRGB; ++ colorMap->getColorSpace()->getRGB( ++ (GfxColor*)maskColors+gfxColorMaxComps, ++ &aMaxRGB ); ++ ++ aMaskBuf.push_back( colToByte(aMinRGB.r) ); ++ aMaskBuf.push_back( colToByte(aMinRGB.g) ); ++ aMaskBuf.push_back( colToByte(aMinRGB.b) ); ++ aMaskBuf.push_back( colToByte(aMaxRGB.r) ); ++ aMaskBuf.push_back( colToByte(aMaxRGB.g) ); ++ aMaskBuf.push_back( colToByte(aMaxRGB.b) ); ++ } ++ } ++ ++ printf( " %d", (int)aMaskBuf.size() ); ++ writeImageLF( aBuf, str, width, height, colorMap ); ++ writeBinaryBuffer(aBuf); ++ writeBinaryBuffer(aMaskBuf); ++} ++ ++void PDFOutDev::drawMaskedImage(GfxState*, Object*, Stream* str, ++ int width, int height, ++ GfxImageColorMap* colorMap, ++ Stream* maskStr, ++ int maskWidth, int maskHeight, ++ GBool maskInvert) ++{ ++ OutputBuffer aBuf; initBuf(aBuf); ++ printf( "drawImage %d %d 0", width, height ); ++ writePng_( aBuf, str, width, height, colorMap, maskStr, maskWidth, maskHeight, maskInvert, true ); ++ writeBinaryBuffer( aBuf ); ++} ++ ++void PDFOutDev::drawSoftMaskedImage(GfxState*, Object*, Stream* str, ++ int width, int height, ++ GfxImageColorMap* colorMap, ++ Stream* maskStr, ++ int maskWidth, int maskHeight, ++ GfxImageColorMap* maskColorMap ) ++{ ++ OutputBuffer aBuf; initBuf(aBuf); ++ printf( "drawImage %d %d 0", width, height ); ++ writePng_( aBuf, str, width, height, colorMap, maskStr, maskWidth, maskHeight, maskColorMap, true ); ++ writeBinaryBuffer( aBuf ); ++} ++ ++void PDFOutDev::setPageNum( int nNumPages ) ++{ ++ // TODO(F3): printf might format int locale-dependent! ++ printf("setPageNum %d\n", nNumPages); ++} ++ ++} ++ ++/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +diff -urN libreoffice-4.0.0.0.beta2.old/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx libreoffice-4.0.0.0.beta2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +--- libreoffice-4.0.0.0.beta2.old/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2012-12-19 19:09:46.770989517 +0100 ++++ libreoffice-4.0.0.0.beta2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2012-12-21 11:53:57.775393673 +0100 +@@ -53,14 +53,7 @@ class GfxFont; class PDFDoc; #ifndef SYSTEM_POPPLER @@ -85,7 +1028,7 @@ Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx #endif namespace pdfi -@@ -202,13 +195,7 @@ namespace pdfi +@@ -190,13 +183,7 @@ // virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy); //----- link borders @@ -99,3 +1042,300 @@ Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx //----- save/restore graphics state virtual void saveState(GfxState *state); +diff -urN libreoffice-4.0.0.0.beta2.old/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig libreoffice-4.0.0.0.beta2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig +--- libreoffice-4.0.0.0.beta2.old/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig 1970-01-01 01:00:00.000000000 +0100 ++++ libreoffice-4.0.0.0.beta2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig 2012-12-20 23:38:18.843485743 +0100 +@@ -0,0 +1,293 @@ ++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ ++/* ++ * This file is part of the LibreOffice project. ++ * ++ * This Source Code Form is subject to the terms of the Mozilla Public ++ * License, v. 2.0. If a copy of the MPL was not distributed with this ++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. ++ * ++ * This file incorporates work covered by the following license notice: ++ * ++ * Licensed to the Apache Software Foundation (ASF) under one or more ++ * contributor license agreements. See the NOTICE file distributed ++ * with this work for additional information regarding copyright ++ * ownership. The ASF licenses this file to you under the Apache ++ * License, Version 2.0 (the "License"); you may not use this file ++ * except in compliance with the License. You may obtain a copy of ++ * the License at http://www.apache.org/licenses/LICENSE-2.0 . ++ */ ++ ++#ifndef INCLUDED_PDFI_OUTDEV_HXX ++#define INCLUDED_PDFI_OUTDEV_HXX ++ ++#if defined __GNUC__ ++#pragma GCC system_header ++#elif defined __SUNPRO_CC ++#pragma disable_warn ++#elif defined _MSC_VER ++#pragma warning(push, 1) ++#endif ++ ++#include "GfxState.h" ++#include "GfxFont.h" ++#include "UnicodeMap.h" ++#include "Link.h" ++#include "Object.h" ++#include "OutputDev.h" ++#ifndef SYSTEM_POPPLER ++# include "parseargs.h" ++#endif ++#include "GlobalParams.h" ++#include "PDFDoc.h" ++ ++#if defined __SUNPRO_CC ++#pragma enable_warn ++#elif defined _MSC_VER ++#pragma warning(pop) ++#endif ++ ++#include ++#include ++ ++class GfxPath; ++class GfxFont; ++class PDFDoc; ++#ifndef SYSTEM_POPPLER ++#define POPPLER_CHECK_VERSION(major,minor,micro) (0) ++typedef GString GooString; ++#else ++#include ++#define POPPLER_CHECK_VERSION(major,minor,micro) \ ++ (POPPLER_VERSION_MAJOR > (major) || \ ++ (POPPLER_VERSION_MAJOR == (major) && POPPLER_VERSION_MINOR > (minor)) || \ ++ (POPPLER_VERSION_MAJOR == (major) && POPPLER_VERSION_MINOR == (minor) && POPPLER_VERSION_MICRO >= (micro))) ++#endif ++ ++namespace pdfi ++{ ++ struct FontAttributes ++ { ++ FontAttributes( const GooString& familyName_, ++ bool isEmbedded_, ++ bool isBold_, ++ bool isItalic_, ++ bool isUnderline_, ++ double size_ ) : ++ familyName(), ++ isEmbedded(isEmbedded_), ++ isBold(isBold_), ++ isItalic(isItalic_), ++ isUnderline(isUnderline_), ++ size(size_) ++ { ++ familyName.append(const_cast(&familyName_)); ++ } ++ ++ FontAttributes() : ++ familyName(), ++ isEmbedded(false), ++ isBold(false), ++ isItalic(false), ++ isUnderline(false), ++ size(0.0) ++ {} ++ ++ // xdpf goo stuff is so totally borked... ++ // ...need to hand-code assignment ++ FontAttributes( const FontAttributes& rSrc ) : ++ familyName(), ++ isEmbedded(rSrc.isEmbedded), ++ isBold(rSrc.isBold), ++ isItalic(rSrc.isItalic), ++ isUnderline(rSrc.isUnderline), ++ size(rSrc.size) ++ { ++ familyName.append(const_cast(&rSrc.familyName)); ++ } ++ ++ FontAttributes& operator=( const FontAttributes& rSrc ) ++ { ++ familyName.clear(); ++ familyName.append(const_cast(&rSrc.familyName)); ++ ++ isEmbedded = rSrc.isEmbedded; ++ isBold = rSrc.isBold; ++ isItalic = rSrc.isItalic; ++ isUnderline = rSrc.isUnderline; ++ size = rSrc.size; ++ ++ return *this; ++ } ++ ++ bool operator==(const FontAttributes& rFont) const ++ { ++ return const_cast(&familyName)->cmp( ++ const_cast(&rFont.familyName))==0 && ++ isEmbedded == rFont.isEmbedded && ++ isBold == rFont.isBold && ++ isItalic == rFont.isItalic && ++ isUnderline == rFont.isUnderline && ++ size == rFont.size; ++ } ++ ++ GooString familyName; ++ bool isEmbedded; ++ bool isBold; ++ bool isItalic; ++ bool isUnderline; ++ double size; ++ }; ++ ++ class PDFOutDev : public OutputDev ++ { ++ // not owned by this class ++ PDFDoc* m_pDoc; ++ mutable boost::unordered_map< long long, ++ FontAttributes > m_aFontMap; ++ UnicodeMap* m_pUtf8Map; ++ ++ int parseFont( long long nNewId, GfxFont* pFont, GfxState* state ) const; ++ void writeFontFile( GfxFont* gfxFont ) const; ++ void printPath( GfxPath* pPath ) const; ++ ++ public: ++ explicit PDFOutDev( PDFDoc* pDoc ); ++ ++ //----- get info about output device ++ ++ // Does this device use upside-down coordinates? ++ // (Upside-down means (0,0) is the top left corner of the page.) ++ virtual GBool upsideDown() { return gTrue; } ++ ++ // Does this device use drawChar() or drawString()? ++ virtual GBool useDrawChar() { return gTrue; } ++ ++ // Does this device use beginType3Char/endType3Char? Otherwise, ++ // text in Type 3 fonts will be drawn with drawChar/drawString. ++ virtual GBool interpretType3Chars() { return gFalse; } ++ ++ // Does this device need non-text content? ++ virtual GBool needNonText() { return gTrue; } ++ ++ //----- initialization and control ++ ++ // Set default transform matrix. ++ virtual void setDefaultCTM(double *ctm); ++ ++ // Start a page. ++ virtual void startPage(int pageNum, GfxState *state); ++ ++ // End a page. ++ virtual void endPage(); ++ ++ // Dump page contents to display. ++ // virtual void dump() {} ++ ++ //----- coordinate conversion ++ ++ // Convert between device and user coordinates. ++ // virtual void cvtDevToUser(double dx, double dy, double *ux, double *uy); ++ // virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy); ++ ++ //----- 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 ++ ++ //----- save/restore graphics state ++ virtual void saveState(GfxState *state); ++ virtual void restoreState(GfxState *state); ++ ++ //----- update graphics state ++ // virtual void updateAll(GfxState *state); ++ virtual void updateCTM(GfxState *state, double m11, double m12, ++ double m21, double m22, double m31, double m32); ++ virtual void updateLineDash(GfxState *state); ++ virtual void updateFlatness(GfxState *state); ++ virtual void updateLineJoin(GfxState *state); ++ virtual void updateLineCap(GfxState *state); ++ virtual void updateMiterLimit(GfxState *state); ++ virtual void updateLineWidth(GfxState *state); ++ virtual void updateFillColor(GfxState *state); ++ virtual void updateStrokeColor(GfxState *state); ++ virtual void updateFillOpacity(GfxState *state); ++ virtual void updateStrokeOpacity(GfxState *state); ++ virtual void updateBlendMode(GfxState *state); ++ ++ //----- update text state ++ virtual void updateFont(GfxState *state); ++ // virtual void updateTextMat(GfxState *state); ++ // virtual void updateCharSpace(GfxState *state) {} ++ virtual void updateRender(GfxState *state); ++ // virtual void updateRise(GfxState *state) {} ++ // virtual void updateWordSpace(GfxState *state) {} ++ // virtual void updateHorizScaling(GfxState *state) {} ++ // virtual void updateTextPos(GfxState *state) {} ++ // virtual void updateTextShift(GfxState *state, double shift) {} ++ ++ //----- path painting ++ virtual void stroke(GfxState *state); ++ virtual void fill(GfxState *state); ++ virtual void eoFill(GfxState *state); ++ ++ //----- path clipping ++ virtual void clip(GfxState *state); ++ virtual void eoClip(GfxState *state); ++ ++ //----- text drawing ++ virtual void drawChar(GfxState *state, double x, double y, ++ double dx, double dy, ++ double originX, double originY, ++ CharCode code, int nBytes, Unicode *u, int uLen); ++ virtual void drawString(GfxState *state, GooString *s); ++ virtual void endTextObject(GfxState *state); ++ ++ //----- image drawing ++ virtual void drawImageMask(GfxState *state, Object *ref, Stream *str, ++ int width, int height, GBool invert, ++ GBool inlineImg); ++ virtual void drawImage(GfxState *state, Object *ref, Stream *str, ++ int width, int height, GfxImageColorMap *colorMap, ++ int *maskColors, GBool inlineImg); ++ virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str, ++ int width, int height, ++ GfxImageColorMap *colorMap, ++ Stream *maskStr, int maskWidth, int maskHeight, ++ GBool maskInvert); ++ virtual void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str, ++ int width, int height, ++ GfxImageColorMap *colorMap, ++ Stream *maskStr, ++ int maskWidth, int maskHeight, ++ GfxImageColorMap *maskColorMap); ++ ++ //----- OPI functions ++ // virtual void opiBegin(GfxState *state, Dict *opiDict); ++ // virtual void opiEnd(GfxState *state, Dict *opiDict); ++ ++ //----- Type 3 font operators ++ // virtual void type3D0(GfxState *state, double wx, double wy) {} ++ // virtual void type3D1(GfxState *state, double wx, double wy, ++ // double llx, double lly, double urx, double ury) {} ++ ++ //----- PostScript XObjects ++ // virtual void psXObject(Stream *psStream, Stream *level1Stream) {} ++ ++ void setPageNum( int nNumPages ); ++ }; ++} ++ ++extern FILE* g_binary_out; ++ ++// note: if you ever hcange Output_t, please keep in mind that the current code ++// relies on it being of 8 bit size ++typedef Guchar Output_t; ++typedef std::vector< Output_t > OutputBuffer; ++ ++#endif /* INCLUDED_PDFI_OUTDEV_HXX */ ++ ++/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/libreoffice-translations-3.6.3.2.4.tar.bz2 b/libreoffice-translations-3.6.3.2.4.tar.bz2 deleted file mode 100644 index 75dfceb..0000000 --- a/libreoffice-translations-3.6.3.2.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bed6f380ecd2d31a9c3c2be2bb62889f434d88b4e12b0a9e6fef24d4f4ea011c -size 144684756 diff --git a/libreoffice-translations-4.0.2.2.1.tar.xz b/libreoffice-translations-4.0.2.2.1.tar.xz new file mode 100644 index 0000000..d1615c8 --- /dev/null +++ b/libreoffice-translations-4.0.2.2.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e29377260882a5a569941f93e49417eaaa68fe6b8fb9ce76949a0d300a5c839e +size 128353580 diff --git a/libreoffice.changes b/libreoffice.changes index f8c41cc..01440e4 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,407 @@ +------------------------------------------------------------------- +Wed Apr 17 10:10:05 UTC 2013 - pmladek@suse.com + +- update to 4.0.2.2.1 (SUSE 4.0-rc1, tag suse-4.0-1, based on upstream 4.0.2.2) + * icon style fixes in local help + * left margin of bullet (bnc#793414) + * color issue in PPTX import (bnc#780830) + * file corruption in XLSX export (fdo#49120) + * rehash basic unit test framework (bnc#805071) + * display the scaled font size in the toolbar (bnc#657905) + * use number format, if available, for charts (bnc#734735) + * only en-US help pack should contain en-US help (fdo#54278) + * shape with background are missed in XLSX import (bnc#798309) + * detect follow-on default member of default member object (bnc#809017) + * change the font combo tooltip to say font is not available (fate#308255) +- enable the MySQL connector extension on the older SUSE distros again + +------------------------------------------------------------------- +Wed Apr 3 13:17:12 UTC 2013 - pmladek@suse.com + +- update to 4.0.2.2: + * slide show mode inverts outputs (rhbz#906137) + * splitting a table options are mixed (fdo#62670) + * some historical dates were decremented (fdo#44286) + * Visio document cannot be opened by Draw (fdo#62299) + * Turkish Lira sign should precede numbers (fdo#62384) + * left/right-only page styles and first-page (fdo#61952) + * hangs when exporting a particular ODS to XLSX (fdo#62111) + * crash in Danish thesaurus/spell interaction (rhbz#918938) + * error bars values become Y-values when pasting (fdo#52159) + * saving particular ODG file resets font formatting (fdo#61256) + * displaying subobjects on different layers is broken (fdo#62617) + * wrong result because 'Property Let' fails to execute (fdo#60752) + * keep migrating more user extensions after one failed (deb#703486) + * implement ODF export of multi-paragraph comment ranges (fdo#60769) + * unable to save documents on Samba with Gnome VFS (fdo#54275, rhbz#895690) + +------------------------------------------------------------------- +Wed Apr 3 11:25:57 UTC 2013 - tchvatal@suse.com + +- Try once more and sort all the deps. + +------------------------------------------------------------------- +Wed Apr 3 11:19:15 UTC 2013 - tchvatal@suse.com + +- Use mysql-connector-cpp not mysql-connector-c++. + +------------------------------------------------------------------- +Wed Mar 20 08:21:28 UTC 2013 - pmladek@suse.com + +- use -fno-omit-frame-pointer globally again until LibreOffice-4.1 where + the ordering of compilation flags is reworked; the current situation + causes build (bridge test) failure on i586 systems +- fix filtering of provides and requires (bnc#809449) + - disable it on openSUSE >= 12.3 because we use system libraries there + - system cairo and pixman are used on all systems + - the internal librdf, libraptor, and librasqal has used -lo suffix, so + the names do not longer cause confusion with the system libraries + +------------------------------------------------------------------- +Tue Mar 19 18:04:38 UTC 2013 - pmladek@suse.com + +- update to 4.0.2.1: + * faster image scaling + * XLSX import speedup (fdo#61721) + * several EMF+ import filter fixes + * lost data in CSV import (fdo#57841) + * wrong Chinese conversion (fdo#57536) + * lost picture in PPT import (i#119513) + * ask when removing templates (fdo#61466) + * send document as email fails (fdo#60701) + * autocorrect data for Catalan (fdo#61138) + * pie chart height in XLS import (i#119989) + * Calc crash when using Validity (fdo#58630) + * floating tables in DOCX import (bnc#779642) + * lost time-format in pivot table (fdo#54651) + * more on configuration migration (fdo#57061) + * corrupted conditional formatting (fdo#57661) + * drawings are shown at wrong position (fdo#56272) + * handle note export correctly in Calc (fdo#61165) + * insert->hyperlink in Impress freeze (rhbz#915743) + * lost content in DOCX import (fdo#53985, fdo#60789) + * not updating accessible text interface (fdo#56031) + * missing default Turkish currency symbol (fdo#61602) + * broken functionality on page layout tab (fdo#61656) + * field shows no content in page header/footer (fdo#60886) + * several Calc error bars fixes (fdo#60253, fdo#60083, fdo#61781) + * can't copy text from a read-only document in Calc (rhbz#916936) + * various fixes in RTF import (fdo#53594, fdo#59638, fdo#60722, fdo#61507) +- update libcdr to version 0.0.11: + * various fixes in Corel Draw import (fdo#53278, fdo#54586, fdo#55366, + fdo#59528) +- build-max-64-jobs.diff: dmake does not work with more than 64 jobs +- touch-no-dereference.diff: avoid race condition when delivering symlinks and + target files into solver +- do not longer use -fno-omit-frame-pointer globally; the problem + is better fixed in the plain sources and the build does not fail + any longer + +------------------------------------------------------------------- +Thu Feb 28 10:27:15 UTC 2013 - pmladek@suse.com + +- update to 4.0.1.2: + * mouse selection of fields (fdo#59928) + * basic EMF+ implementation (bnc#780748) + * selected gluepoint rendering (fdo#45879) + * Paste special of Visio object (fdo#59405) + * corrected SVG gradient primitive (i#120616) + * charts not plotted automatically (fdo#60488) + * get error bar import working again (fdo#60083) + * autofit and stretched width (fdo#55931, fdo#57956) + * migrate even more configuration setting (fdo#57061) + * decimal numbers in conditional formatting (fdo#60574) + * cut&paste of conditional format (fdo#60306, fdo#60311) + * do not extend conditional formatting automatically (fdo#60828) + * empty paragraphs in EditEngine layouting (i#119756, fdo#59629) + * ocMacro and ocExternal need to be recalculated on load (fdo#60977) +- temporary use the internal libcmis on openSUSE-12.3 until + the system one is updated to version 0.3.1 +- update libvisio to version 0.0.25: + * better embedded binary dumping + * initial support of page names (fdo#60433) + +------------------------------------------------------------------- +Thu Feb 21 10:27:15 UTC 2013 - tchvatal@suse.com + +- update to 4.0.1.1: + * asynchronous word-count + * several CMIS support fixes + * sort data points (bnc#590020) + * spread button layout (fdo#59767) + * copy chart leads to crash (fdo#60420) + * several fixes of the template manager + * faster about box rendering (fdo#59970) + * several fixes for Impress remote control + * several RTL fixes (fdo#42387, fdo#39370) + * copy margins for mirrored pages (fdo#60250) + * corrected XLSX export of functions (fdo#60087) + * more on the configuration migration (fdo#57061) + * copy custom styles on copy & paste (rhbz#760765) + * horizontal scroll bar in sub windows (fdo#44582) + * correctly calculate IMCSCH and IMSECH (fdo#60078) + * protection and conditional formatting (fdo#58826) + * sort autofilter popup items correctly (bnc#492440) + * cell validation is not a special content (bnc#802350) + * don't crash on undoing text frame removal (fdo#34548) + * error reading file after inserting comment (fdo#60132) + * produce all translations for desktop files (fdo#58283) + * make MATCH() accept a single cell reference (fdo#60366) + * enable internal entity declarations for SVG (fdo#60471) + * repeated row heights for empty rows (fdo#59973, fdo#55621) + * default paths for exporting documents and PDFs (bnc#777788) + * drawing text with font size 0 causes artifacts (bnc#753462) + * scan all columns to determine the first data row (bnc#801152) + * cannot select directory with GNOME folder picker (rhbz#910176) + * hide minimum password info in the password dialog (bnc#437516) + * make it possible to update DDE links after loading (fdo#59032) + * cell needs to be recalculated during import as well (fdo#60645) + * crash when pasting text under outline view (fdo#51232, i#119987) + * fontconfig support for multiple in (lp#1034928) + * export/import anchoring for XLS(X) drawing & ole objects (fdo#58360) + * read-only position after fieldmark and before annotation (fdo#59573) + * show style when dialog is created with existing cond. format (fdo#59778) + * text rotation in shapes in PPTX export (fdo#34897, bnc#404221, fdo#58204) + * recompile cells with #NAME! for English function name option (bnc#615357) + * several RTF import fixes (fdo#48440, fdo#58646, fdo#59419, fdo#58076, + fdo#59953) +- update libcdr to version 0.0.10 + * use ICU to guess encoding + * some bug fixes +- update libmspub to version 0.0.5 + * autodetect character set for pre-unicode MSPUB versions + * missing non-cropped images + * default to first default character style + * other fixes and build fixes +- update sofficerc-upstream according to the new branding +- bin obsolete configure-detect-icerun.diff + +* Feb 12 2013 by tchvatal@suse.com in LibreOffice:Unstable + +- Try to enable build on ppc64. + +* Feb 6 2013 by pmladek@suse.com in LibreOffice:Unstable + +- enable startup notification (bnc#796875) +- remove obsolete unopkg calls from post install scripts; the cache + is removed by the main package and not longer used (bnc#769448) +- temporary add libzip-devel into BuildRequires; it can be removed + once the fixes liborcus package is available in Factory + +* Feb 4 2013 by pmladek@suse.com in LibreOffice:Unstable + +- use libreoffice-branding >= 4.0 build requires; we need the optimized + one (bnc#798268) +- configure-detect-icerun.diff: icerun wrapper is not provided by the old + icecream-0.9.2 on SLED11 + +* Jan 22 2013 by tchvatal@suse.com in LibreOffice:Unstable + +- update to 4.0.0.3 + * lots fixes +- build_prepare.inc: share the common build preparation steps between + spec files +- use a fake build time instead of __TIME__ and __DATE__ macros to avoid + unnecessary recompilations in the build service + +* Jan 9 2013 by pmladek@suse.com in LibreOffice:Unstable + +- libreoffice-branding >= 3.6 is compatible; use in Requires +- bridges-missing-cxxflags.diff: lost RPM optflags when compiling bridges + +* Jan 9 2013 by tchvatal@suse.com in LibreOffice:Unstable + +- update to 4.0.0.1 + * lots fixes + +* Dec 19 2012 by tchvatal@suse.com in LibreOffice:Unstable + +- update to 4.0.0.0.beta2 + * lots fixes + +* Dec 19 2012 by tchvatal@suse.com in LibreOffice:Unstable + +- update to 4.0.0.0.beta1: +- General + * experimental Gnumeric import + * Visio and MS Publisher document import + * experimental send documents via Bluetooth + * Java options merged with advanced options + * integration Content Management Systems via CMIS standard + * import Calc data from arbitrarily structured XML content + * lots improvements in OOXML and RTF import and export filters +- Writer + * easier fields selection + * different header and footer on the first page + * extra word boundary characters and word count options + * attaching comments to document text ranges (fdo#38244) +- Calc + * enhanced chart visualisation + * automatically rotate chart axis to better fit + * lots conditional formatting improvements and fixes + * support "type-ahead" search in the autofilter popup + * increase size limit of ODF documents from 2GB to 4GB + * export single charts as PNG or JPEG pictures (fdo#30944) + * support multiple selections in page field of pivot table + * better random number generation algorithm in function RAND + * option pricing in particular barrier: OPT_BARRIER, OPT_TOUCH + * option to toggle handling of empty strings in arithmetic expressions + * show saved values instead of recalculating formulas in ODS and XLSX import + * new functions as defined in ODF OpenFormula: XOR, AVERAGEIF, SUMIFS, + AVERAGEIFS, COUNTIFS, IFERROR, and IFNA +- Impress + * presenter console RTL support + * much accelerated multimedia previews + * remote control application for Android, Linux only now +- Draw + * shear transformations + * rounded caps (ends) of lines + * better quality of page previews + * multi-image support in ODF, for example, bitmap + SVG representation +- Base + * AutoFilter does not anymore treat values as patterns in forms + * new driver to access Thunderbird address book, Linux and MAC only +- UI + * new templates manager + * support Firefox Personas + * several resizable dialogs + * dialog for smooth image filter + * better quality of displayed pictures + * allow to cut&paste text from message boxes + * style preview in the "Apply Style" combo box + * allow to resize and recompress pictures from popup menu + * hide and show styles in the “Styles & Formatting” dialog + * allow to edit data with external tool in to Calc, Impress, and Draw +- Performance + * faster ODS, XLSX, and RTF import + * faster and better ICU regular expression engine + * faster saving of a new entry to a large autocorrect replacement table + * faster import/export of slides and drawings with large numbers of shapes +- Feature Removal / Deprecation + * new style services + * deprecated and removed several UNO APIs + * convert all existing oneway API methods to plain methods + * drop support for defining oneway methods using UNO IDL compiler + * drop support for legacy binary StarOffice (version 1.x → 5.x) files + * drop support for export to legacy Word and Excel (version 6.0/95) files +- see https://wiki.documentfoundation.org/ReleaseNotes/4.0 for more details +- remove unused MeeGo build modifications +- remove KDE4 hack for obsolete openSUSE-11.1-Evergreen +- use xz tarballs instead of bz ones +- add xz into BuildRequires; explicitly needed on older SUSE versions +- add fdupes into BuildRequies +- add into Build Requires: + * xz to unpack source tarballs even on older SUSE distros + * fdups to reduce duplicities in the installed files + * bluez-devel to support remore control using BlueTooth +- add more system libraries into BuildRequires on openSUSE => 12.3: + * clucene-core-devel + * graphite2-devel + * hyphen-devel + * libcdr-devel + * libcmis-devel + * libexttextcat-devel + * liblangtag-devel + * libmspub-devel + * liborcus-devel + * libredland-devel + * libvisio-devel + * mdds-devel + * mysql-connector-c++-devel + * mythes-devel + * ucpp +- remove unused build_module_in_parallel and + remove obsolete test_build_binfilters defines +- update extensions: + * numbertext to version 0.9.5 + * gdocs to version 3.0.1 +- update 3rd-party source tarballs: + * postgresql to version 9.2.1 + * libcmis to version 0.3.0 + * lcms2 to version 2.4 + * graphite2 to version 1.2.0 + * libexttextcat to version 3.4.0 + * hyphen to version 2.8.4 + * libvisio to version 0.0.24 + * libwpd to version 0.9.6 + * mythes to version 1.2.3 +- removed md5sum from the 3rd-party source tarball name: + * libcdr +- removed obsolete libreoffice-binfilter source tarball +- removed obsolete 3rd-party source tarballs: + * bj + * lucene + * librsvg + * SampleICC +- add new 3rd-party tarballs: + * ucpp, version 1.3.2: + * C preprocessor compliant to ISO-C99 + * liblangtag, version 0.4.0: + * access tags for identifying languages + * icu, version 4c-49.1.1: + * icu data subset, version 49l: + * International Components for Unicode + * liborcus version 0.3.0: + * library for processing spreadsheet documents + * libmspub-0.0.3: + * MS Publisher format import +- bin obsolete patches: + * pack-addressbook.diff + * sdext-poppler-0.21.0.diff + * sdext-poppler-0.21.1.diff + * install-with-vendor-SUSE.diff + * solenv-java-source-version.diff + * split-icons-search-usr-share.diff + * scripting-prefer-internal-rhino.diff + * sdext-disable-failing-xpdf-test.diff + * libreoffice-poppler-0.17.0-reject-fix.diff + * do-not-delete-PropertyMapEntry-instance.diff + * officecfg-defaul-export-ms-file-formats.diff + * pack-desktop-files-for-optional-filters.diff +- system-python-ure-bootstrap.diff and pyuno-path.diff merged into + system-pyuno.diff +- remove obsolete configure switches: + * --disable-ldap \ + * --disable-mozilla \ + * --enable-xmlsec \ + * --enable-binfilter + * --disable-strip-solver + * --without-stlport \ + * --without-system-mozilla \ + * --with-openldap \ + * --with-java-target-version=1.5 +- use configure switches: + * --enable-release-build: use the "LibreOffice" name for the final product + * --enable-merge-libs: linking of big merged libraries + * --enable-python=system: make sure that we use the system Python + * --without-system-icu: system ICU is too old on openSUSE < 12.1 + * --enable-scripting-beanshell: renamed from + --enable-ext-scripting-beanshell + * --enable-scripting-javascript: renamed from + --enable-ext-scripting-javascript + * --without-system-npapi-headers: renamed from + --without-system-mozilla-headers +- use more configure switches because some system libraries are not useful on + openSUSE < 12.3: + * --with-system-ucpp + * --without-system-altlinuxhyph + * --without-system-clucene + * --without-system-graphite + * --without-system-libcdr + * --without-system-libcmis + * --without-system-libexttextcat + * --without-system-liblangtag + * --without-system-libmspub + * --without-system-libvisio + * --without-system-mythes + * --without-system-mysql-cppconn + * --without-system-orcus + * --without-system-redland + * --without-system-servlet-api +- reduce duplicities by fdupes +- Python script provider, PDF Import, and Presenter Screen are not longer + extensions + ------------------------------------------------------------------- Wed Feb 20 11:35:25 UTC 2013 - pmladek@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index fe4d64d..7f2a544 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -16,6 +16,7 @@ # + Name: libreoffice BuildRequires: ImageMagick BuildRequires: ant @@ -26,6 +27,7 @@ BuildRequires: boost-devel BuildRequires: cups-devel BuildRequires: curl-devel BuildRequires: dbus-1-glib-devel +BuildRequires: fdupes BuildRequires: flac-devel BuildRequires: flex BuildRequires: gcc-c++ @@ -35,12 +37,16 @@ BuildRequires: gtk2-devel BuildRequires: hunspell-devel BuildRequires: icu BuildRequires: java-devel >= 1.6 +BuildRequires: kdelibs3-devel BuildRequires: krb5-devel +BuildRequires: libcppunit-devel BuildRequires: libexif BuildRequires: libicu-devel +BuildRequires: libkde4-devel +BuildRequires: libmysqlclient-devel BuildRequires: libxml2-devel +#BuildRequires: libzip-devel BuildRequires: lpsolve-devel -BuildRequires: mono-devel BuildRequires: neon-devel BuildRequires: pam-devel BuildRequires: patch @@ -54,61 +60,21 @@ BuildRequires: unixODBC-devel BuildRequires: unzip BuildRequires: xml-commons-apis BuildRequires: zip -############################ -# basic stuff -%if 0%{?suse_version} BuildRequires: db-devel BuildRequires: krb5 BuildRequires: openldap2-devel BuildRequires: python-xml BuildRequires: xorg-x11 BuildRequires: xorg-x11-fonts -# LO-3.3 fixed all most annoying KDE4-related bugs => time to enable KDE4 support for SLED11 -BuildRequires: libkde4-devel -%endif -%if 0%{?meego_version} -BuildRequires: db4-devel -BuildRequires: db4-devel -BuildRequires: imake -BuildRequires: krb5-devel -BuildRequires: krb5-devel -BuildRequires: libjpeg-devel -BuildRequires: libxslt-devel -BuildRequires: openldap-devel -BuildRequires: openldap-devel -BuildRequires: openssl-devel -BuildRequires: xorg-x11-proto-xproto -BuildRequires: xorg-x11-server-devel -BuildRequires: xorg-x11-utils -BuildRequires: pkgconfig(gl) -BuildRequires: pkgconfig(glu) -BuildRequires: pkgconfig(xau) -BuildRequires: pkgconfig(xaw7) -%endif +BuildRequires: xz ############################ # GTK3 stuff %if 0%{?suse_version} >= 01210 BuildRequires: gtk3-devel %endif ############################ -# KDE3 stuff -%if 0%{?suse_version} -BuildRequires: kdelibs3-devel -%endif -############################ -# cppunit stuff -%if 0%{?suse_version} -BuildRequires: libcppunit-devel -%endif -%if 0%{?meego_version} -BuildRequires: cppunit-devel -%endif -############################ # mysql stuff -%if 0%{?suse_version} -BuildRequires: libmysqlclient-devel -%endif -%if 0%{?suse_version} > 01230 +%if 0%{?suse_version} >= 01230 # mysqlcppconn >= 1.0.6 is needed BuildRequires: libmysqlcppconn-devel %endif @@ -122,25 +88,49 @@ BuildRequires: mozilla-nss-devel # libexpat-devel is explicitely needed since openSUSE-11.1 BuildRequires: libexpat-devel %endif -%if 0%{?meego_version} -BuildRequires: expat-devel -%endif ############################ -# poppler is needed to build the PDF import extension -%if 0%{?suse_version} +# Bluetooth stuff +BuildRequires: bluez-devel +############################ +# poppler is needed to build the PDF import BuildRequires: libpoppler-devel -%endif -%if 0%{?meego_version} -BuildRequires: poppler-devel -%endif ############################ # junit stuff %if %suse_version > 1110 BuildRequires: junit4 %endif ############################ +# mono stuff +%if 0%{?suse_version} <= 01130 +BuildRequires: mono-devel +%endif +############################ +# post openSUSE 12.3 features +############################ +%if 0%{?suse_version} > 01230 +# openSUSE 12.3 features +BuildRequires: libcmis-devel +%endif +%if 0%{?suse_version} >= 01230 +BuildRequires: clucene-core-devel +BuildRequires: graphite2-devel +BuildRequires: hyphen-devel +BuildRequires: libcdr-devel +BuildRequires: libexttextcat-devel +BuildRequires: liblangtag-devel +BuildRequires: libmspub-devel +BuildRequires: liborcus-devel +BuildRequires: libredland-devel +BuildRequires: libvisio-devel +BuildRequires: mdds-devel +BuildRequires: mythes-devel +BuildRequires: ucpp +# FIXME: should be removed once the lixed liborcus package is in Factory +BuildRequires: libzip-devel +%endif +############################ # openSUSE 11.4 features -%if 0%{?suse_version} >= 01140 || 0%{?meego_version} +%if 0%{?suse_version} >= 01140 BuildRequires: liblcms2-devel BuildRequires: librsvg-devel BuildRequires: libwpd-devel @@ -155,30 +145,23 @@ BuildRequires: vigra-devel BuildRequires: gstreamer010-plugins-base-devel BuildRequires: python-lxml %endif -%if 0%{?meego_version} -BuildRequires: gst-plugins-base-devel -%endif # FIXME: part of the language-dependant stuff is still built here and # put into the -devel package # test_build_langs: 0 = only en-US # 1 = en-US, de, and cs # 2 = all supported languages %define test_build_langs 2 -# test_build_binfilters: 0 = no -# 1 = yes -%define test_build_binfilters 1 # test_build_SDK: 0 = no # 1 = yes (if possible, see below the definition of lo_build_sdk) %define test_build_sdk 1 -# build_module_in_parallel 0 = no -# 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 +# build_mono: 1 = yes +# 0 = no (pack just a README file) +%define build_mono 0 # 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) +# 1 = yes (wether to use ccache or not) %define debug_build 0 # prepare_build: 0 = no # 1 = yes (just build, install and create packages; without %%prep section and configure) @@ -199,7 +182,7 @@ BuildRequires: gst-plugins-base-devel %if %test_build_sdk == 0 %define lo_build_sdk no %else -%if 0%{?suse_version} > 01010 || 0%{?sles_version} == 010 || 0%{?meego_version} +%if 0%{?suse_version} > 01010 || 0%{?sles_version} == 010 %define lo_build_sdk yes %else %define lo_build_sdk no @@ -210,26 +193,20 @@ BuildRequires: gst-plugins-base-devel %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib())") %endif # LO paths -%define lo_prefix %_libdir -%define lo_home libreoffice -%define gnu_make_version 3.82 -%define gnu_make_snapshot 20120301 -%define zip_version 3.0 +%define lo_prefix %_libdir +%define lo_home libreoffice +# helper tools +%define gnu_make_version 3.82 +%define gnu_make_snapshot 20120301 +%define zip_version 3.0 # extensions -%define ct2n_version 1.3.2 -%define gdocs_version 3.0.0 -%define numbertext_version 0.9.4 -%if 0%{?meego_version} -# 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.4 +%define ct2n_version 1.3.2 +%define gdocs_version 3.0.1 +%define numbertext_version 0.9.5 +Version: 4.0.2.2.1 Release: 0 -Requires: libreoffice-branding < 4 -Requires: libreoffice-branding > 3.2.99.3 +Requires: libreoffice-branding >= 4.0 Requires: libreoffice-icon-themes = %version -# librsvg allows to insert SVG pictures; it is dlopened, so there is not a direct dependency -Recommends: librsvg # we need a JRE for oobase and the other stuff %if 0%{?suse_version} # gij is enough on SL 10.1 and higher @@ -267,9 +244,6 @@ Requires: libgcj %endif %endif %endif -%if 0%{?meego_version} -Requires: jre >= 1.5 -%endif # --- # post install scripts %if 0%{?suse_version} > 01120 @@ -305,7 +279,7 @@ Provides: OpenOffice_org-hunspell Provides: OpenOffice_org2-hunspell Obsoletes: OpenOffice_org-hunspell Obsoletes: OpenOffice_org2-hunspell -# KDE quickstarter do not support LO; we want to get rid of it anyway +# KDE quickstarter does not support LO; we want to get rid of it anyway Provides: OpenOffice_org-Quickstarter = 3.3.1 Obsoletes: OpenOffice_org-Quickstarter < 3.3.1 # split build compat stuff obsoleted with LO-3.4 @@ -472,10 +446,10 @@ Summary: A Free Office Suite (Framework) License: Apache-2.0 and Artistic-1.0 and BSD-3-Clause and BSD-4-Clause and GPL-2.0+ and LPPL-1.3c and LGPL-2.1+ and LGPL-3.0 and MPL-1.1 and MIT and SUSE-Public-Domain and W3C Group: Productivity/Office/Suite Url: http://www.documentfoundation.org/ -Source0: libreoffice-core-%version.tar.bz2 -Source1: libreoffice-binfilter-%version.tar.bz2 -Source2: libreoffice-help-%version.tar.bz2 -Source3: libreoffice-translations-%version.tar.bz2 +Source0: libreoffice-%version.tar.xz +Source1: libreoffice-help-%version.tar.xz +Source2: libreoffice-translations-%version.tar.xz +Source10: build_prepare.inc # 256x256 desktop icons (bnc#722644) Source20: libreoffice-desktop-icons-256x256.tar.bz2 # make-3.82 is needed for parallel build @@ -495,14 +469,18 @@ Source201: sofficerc-upstream Source202: Draft.jpg # temporary disabled mono package Source203: README-mono.txt +# draw extension package is currently empty +# we want to leave it to make the maintenance easier +# also we might want to add there some extension later on again +Source204: README-draw-extensions.txt # helper scripts # create compat symlinks from /usr/share to /usr/lib(64); used by noarch packages Source300: link-to-ooo-home # extensions Source400: README-scsolver.txt # prebuilt extensions -Source401: cea0f63d5985ba4fcbd882031df44346-gdocs_%{gdocs_version}_modified.oxt -Source402: b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt +Source401: 27211596cf0ad97cab7321239406fde0-gdocs_%{gdocs_version}_modified.oxt +Source402: b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt # used extensions sources Source450: 451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt Source451: 451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.zip @@ -510,8 +488,8 @@ Source452: 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 # unused extensions sources # FIXME: this is just because of license; we do not build gdocs from sources now # gdocs sources -Source500: gdocs_%{gdocs_version}.tar.bz2 -Source501: gdocs_%{gdocs_version}.diff +Source500: gdocs_3.0.0.tar.bz2 +Source501: gdocs_3.0.0.diff # gdata-*.jar and google-*.jar are under Apache License, Version 2.0 # activation.jar is part of "JavaTM Web Services Developer Pack 1.5 Release # Notes" and is mentioned there between "Redistributable Components", see @@ -527,21 +505,23 @@ Source503: AbsoluteLayout.tar.bz2 Source504: swing-layout-1.0.4-doc.zip # taken from netbeans-6.8 installed from netbeans-6.8-ml-javase-linux.sh Source505: swing-layout-1.0.4-src.zip +%if 0%{?suse_version} < 01230 # FIXME: hack the provides and requires (bnc#411538) # make sure external scripts are used %define _use_internal_dependency_generator 0 %define __find_provides /bin/sh %_sourcedir/lo-provides %name %define __find_requires /bin/sh %_sourcedir/lo-requires %name +%endif Source900: lo-provides Source901: lo-requires # # offical external source Source1000: ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip -Source1001: ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip +Source1001: 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz Source1002: af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz Source1003: a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip Source1004: ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip -Source1005: 061a9f17323117c9358ed60f33ecff78-postgresql-9.1.1.tar.bz2 +Source1005: c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 Source1006: ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz Source1007: db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip Source1008: d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip @@ -549,12 +529,11 @@ Source1009: ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz Source1010: ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz Source1011: eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip Source1012: fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz -Source1013: fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz Source1014: f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip -Source1015: 3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz -Source1016: e1e255dc43dbcbb34cb19e8a0eba90ae-mythes-1.2.2.tar.gz +Source1015: f5ef3f7f10fa8c3542c6a085a233080b-graphite2-1.2.0.tgz +Source1016: 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz Source1017: 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz -Source1018: 6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2 +Source1018: dc3d21a3921931096d6e80f6701f6763-libexttextcat-3.4.0.tar.bz2 Source1019: 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip Source1020: 1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz Source1021: 185d60944ea767075d27247c3162b3bc-unowinreg.dll @@ -567,27 +546,30 @@ Source1027: 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.g Source1028: 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip Source1029: 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip Source1030: 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip -Source1031: 86261f06c097d3e425a2f6d0b0635380-hyphen-2.8.3.tar.gz -Source1032: 48d8169acc35f97e05d8dcdfd45be7f2-lucene-2.3.2.tar.gz +Source1031: a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz Source1033: 9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.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 +Source1037: e7f84e3199dfee9122949448cab3823f-libwpd-0.9.6.tar.bz2 Source1038: d197bd6211669a2fa4ca648faf04bcb1-libwps-0.2.7.tar.bz2 Source1039: 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip Source1040: 0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz -Source1041: 0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz -Source1042: 94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2 -Source1043: d7a242ca43e33e1b63d3073f9d46a6a8-librsvg-2.32.1.tar.gz +Source1041: b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz +Source1042: libvisio-0.0.25.tar.bz2 +Source1043: 54e578c91b1b68e69c72be22adcb2195-liblangtag-0.4.0.tar.bz2 # 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: 3c0037fb07dea2f0bbae8386fa7c6a9a-libcdr-0.0.9.tar.bz2 +Source1045: libcdr-0.0.11.tar.bz2 # this library is not available on older distributions -Source1046: 327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz +Source1046: 861ef15fa0bc018f9ddc932c4ad8b6dd-lcms2-2.4.tar.gz # internal boost headers are needed on openSUSE <= 11.3; the system one has broken dst_adjustment_offsets definition (bnc#767949) Source1047: f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 +Source1048: libmspub-0.0.5.tar.bz2 +Source1049: 8755aac23317494a9028569374dc87b2-liborcus_0.3.0.tar.bz2 +Source1050: 7c53f83e0327343f4060c0eb83842daf-icu4c-49_1_1-src.tgz +Source1051: fc188d2ed5c2cbcf7a021b34b9f88478-icudt49l-subset.zip # search application icons in /usr/share # FIXME: search both lib and lib64 and push into git Patch2: split-icons-search-usr-share.diff @@ -606,14 +588,11 @@ 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; 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 Patch9: office-cfg-linux-common-template-dir.diff -# correctly bootstrap python stuff with system python, (deb#501028, i#90701) -# is this solutions still used in other distributions? -Patch10: system-python-ure-bootstrap.diff +# correctly bootstrap python stuff with system python (deb#501028, i#90701) +Patch10: system-pyuno.diff # do not use the broken help; unopkg complained about it when registering extensions # FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files Patch11: nlpsolver-no-broken-help.diff @@ -623,29 +602,19 @@ 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 -# fix build with poppler-0.21.0 -# pushed upstream for LO-4.0 -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 -# FIXME: related to system-python-ure-bootstrap.diff -Patch18: pyuno-path.diff -# lost charts (bcn#798271) -Patch19: do-not-delete-PropertyMapEntry-instance.diff +# lost RPM optflags when compiling bridges +Patch15: bridges-missing-cxxflags.diff +# dmake does not work with more than 64 jobs +# FIXME: this patch won't be necessary in LO-4.1 where dmake has finally been removed +Patch16: build-max-64-jobs.diff +# avoid race condition when delivering symlinks and target files into solver +Patch17: touch-no-dereference.diff # -# default to MS Office 97/2000/XP file formats on MeeGo; asked by HP -Patch900: officecfg-defaul-export-ms-file-formats.diff # revert problematic build fix for poppler 0.17.0 on older distributions # FIXME: make it configurable to push upstream Patch910: libreoffice-poppler-0.17.0-reject-fix.diff # crazy hack to avoid /usr/lib64 in RPATH and pass brp-rpath check (bnc#717262) 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 # @@ -657,7 +626,7 @@ Patch2003: zip-3.0-optflags.patch Patch2004: zip-3.0-tempfile.patch Patch2005: zip-notimestamp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: %arm %ix86 x86_64 ppc +ExclusiveArch: %arm %ix86 x86_64 ppc ppc64 %description LibreOffice is a comprehensive office package featuring a word @@ -888,8 +857,6 @@ Obsoletes: OpenOffice_org-mailmerge < %version This module allows you to create form letters or send E-mail messages to many recipients using LibreOffice office suite. - - %if 0%{?suse_version} <= 01130 %package mono @@ -996,9 +963,7 @@ Requires: %name = %version Requires: gcc-c++ Requires: make Requires: zip -%if %suse_version > 1000 Recommends: java-devel -%endif # split build compat stuff obsoleted with LO-3.4 Provides: OpenOffice_org-ure-devel = %version Obsoletes: OpenOffice_org-ure-devel < %version @@ -1018,10 +983,8 @@ The documentation is in the package OpenOffice_org-sdk-doc Summary: LibreOffice SDK Documentation License: LGPL-3.0 Group: Development/Libraries/Other -%if %suse_version > 1000 Suggests: %name-sdk = %version Enhances: %name-sdk = %version -%endif # split build compat stuff obsoleted with LO-3.4 Provides: OpenOffice_org-ure-devel-doc = %version Obsoletes: OpenOffice_org-ure-devel-doc < %version @@ -1138,9 +1101,6 @@ Requires: jre-64 > 1.5 %endif %endif %endif -%if 0%{?meego_version} -Requires: jre >= 1.5 -%endif # compat stuff Provides: OpenOffice_org-calc-extensions = %version Obsoletes: OpenOffice_org-calc-extensions < %version @@ -1152,8 +1112,6 @@ This package provides extensions for LibreOffice Calc: - New Functions NUMBERTEXT and MONEYTEXT - Solver for Nonlinear Programming - - %package draw-extensions Summary: LibreOffice Draw Extensions License: LGPL-3.0 @@ -1165,10 +1123,7 @@ Provides: OpenOffice_org-draw-extensions = %version Obsoletes: OpenOffice_org-draw-extensions < %version %description draw-extensions -This package provides extensions for LibreOffice Draw: - -- PDF Import - +This package provides extensions for LibreOffice Draw %package impress-extensions @@ -1199,7 +1154,6 @@ Requires: libreoffice-writer = %version # the wiki extension is written in java %if 0%{?suse_version} # the gcj is required by the main package on 10.2 and lower -%if 0%{?suse_version} > 01020 %ifarch %ix86 ppc # the 32-bit build requires 32-bit JRE, bnc#222708 Recommends: jre-32 >= 1.6 @@ -1211,16 +1165,13 @@ Requires: jre-32 > 1.5 # --- %ifarch x86_64 Recommends: jre-64 >= 1.6 -%if %suse_version > 01110 # jre-64 is not provided by the preferred openjdk until openSUSE-11.2 +%if 0%{?suse_version} > 01110 +# jre-32 is not provided by the preferred openjdk until openSUSE-11.2 Requires: jre-64 > 1.5 %endif %endif %endif -%endif -%if 0%{?meego_version} -Requires: jre >= 1.5 -%endif # compat stuff Provides: OpenOffice_org-writer-extensions = %version Obsoletes: OpenOffice_org-writer-extensions < %version @@ -1328,54 +1279,39 @@ the LibreOffice localizations separately. %prep %if %prepare_build == 0 -%setup -D -T -q -n libreoffice-core-%version +%setup -D -T -q -n libreoffice-%version %else -%setup -q -a30 -n libreoffice-core-%version +%setup -q -b1 -b2 -a30 -n libreoffice-%version # apply patches before caling any other command to be able to patch with quilt easily -%patch2 +%patch2 -p1 %patch3 %patch4 %patch5 -%patch6 -%patch7 -%patch8 +%patch6 -p1 +%patch7 -p1 %patch9 -%patch10 +%patch10 -p1 %patch11 %patch12 %patch13 -p1 %patch14 %patch15 -%patch16 -p1 -%patch17 -%patch18 -%patch19 -p1 -# -%if 0%{?meego_version} -# default to MS Office 97/2000/XP file formats on MeeGo; asked by HP -%patch900 -%endif -# +%patch16 +%patch17 -p1 %if %suse_version <= 1130 # cpp/poppler-version.h is not included in older poppler packages -%patch910 +%patch910 -p1 %endif # -%if %suse_version > 1140 +%if %suse_version > 1140 && %suse_version < 1230 # crazy hack to avoid /usr/lib64 in RPATH and pass brp-rpath check (bnc#717262) %patch920 %endif # -%if %suse_version > 1210 -# 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 tar -xjf %{S:20} # READMEs @@ -1395,93 +1331,16 @@ cd - %endif %endif +# Remove build time references so build-compare can do its work +FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M') +FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') +sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" solenv/src/version.c +sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" solenv/src/version.c + + + %build -%if %prepare_build != 0 -# first build make-3.82 -cd make-* -CFLAGS=$RPM_OPT_FLAGS ./configure -make %{?_smp_mflags} -cd - -# -# second build zip-3.0 on older distributions -%if %suse_version < 1140 -cd zip30 -make %{?jobs:-j%jobs} -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc -cd - -%endif -# -# Parallel build settings ... -lo_jobs="%{?jobs:%jobs}" -%ifarch %arm -%if ! 0%{?qemu_user_space_build:1} -# native hardware is not that powerful -lo_jobs="" -%endif -%endif -# dmake does not work with more than 64 jobs -if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then - echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs" - lo_jobs="64" -fi -# do not eat all memory -lo_jobs_reduced= -if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then - if test `uname -i` = "x86_64" ; then - mem_per_process=300 - else - mem_per_process=200 - fi -%if 0%{?qemu_user_space_build:1} - mem_per_process=400 -%endif - max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"` - max_jobs="$(($max_mem / $mem_per_process))" - test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits" - test "$lo_jobs" -le 0 && lo_jobs= && echo "Warning: Do not use the parallel build at all becuse of memory limits" -fi -# finally set jobs -PARALLEL_BUILD= -if test -n "$lo_jobs" ; then - PARALLEL_BUILD="--with-max-jobs=$lo_jobs" -fi -# parallel build of modules -# it makes sense on machines with more CPUs -num_cpus=`grep ^processor /proc/cpuinfo | wc -l` -# again reduce to 64 CPUs because of dmake -test "$num_cpus" -gt "64" && num_cpus="64" && echo "Warning: dmake does not support more than 64 processes => reducing number of used cpus" -# allow only 2 modules if there more jobs allowed in one module -test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" -PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" -# using icecream -if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then - PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream" -fi -# -# disable KDE4 on openSUSE-11.1-Evergreen but not on SLED11 -%define libkde4_devel_ver %(rpm -q --queryformat '%{VERSION}' libkde4-devel) -DISABLE_KDE4= -test "%{libkde4_devel_ver}" = "4.1.3" && DISABLE_KDE4="--disable-kde4" -%endif -# make sure that JAVA_HOME is set correctly -%if 0%{?suse_version} -source /etc/profile.d/alljava.sh -%endif -%if 0%{?meego_version} -export JAVA_HOME=%{java_home} -%endif -# use RPM_OPT_FLAGS, ... -ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-fexceptions//g'` -fno-strict-aliasing" -CFLAGS="$ARCH_FLAGS" -CXXFLAGS="$ARCH_FLAGS" -export ARCH_FLAGS CFLAGS CXXFLAGS -# FIXME: genccode from the system icu is in /usr/sbin -# FIXME: we need make-3.82 for parallel build -export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/make-%gnu_make_version-gbuild:$PATH:/usr/sbin" -# use the extra built zip-3.0 on older distributions -%if %suse_version < 1140 -export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH" -%endif -# +%{expand:%(cat %_sourcedir/build_prepare.inc)} %if %prepare_build != 0 ./autogen.sh $PARALLEL_BUILD \ --libdir=%{_libdir} \ @@ -1494,14 +1353,14 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH" --disable-fetch-external \ --with-external-tar="$RPM_SOURCE_DIR" \ --with-alloc=system \ - --disable-strip-solver \ --with-compat-oowrappers \ + --enable-release-build \ --enable-split-app-modules \ --enable-split-opt-features \ + --enable-mergelibs \ + --enable-python=system \ --with-jdk-home=$JAVA_HOME \ - --with-java-target-version=1.5 \ --with-ant-home=/usr/share/ant \ - --with-mono-gac-root=%{_prefix}/lib \ --without-fonts \ --without-myspell-dicts \ --with-external-dict-dir=/usr/share/myspell \ @@ -1509,9 +1368,6 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH" --with-external-thes-dir=/usr/share/ooo/thesaurus \ --without-doxygen \ --without-help \ -%if %test_build_binfilters != 0 - --enable-binfilter \ -%endif %if %lo_build_sdk == yes --enable-odk \ %endif @@ -1522,81 +1378,84 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH" --enable-kde \ --enable-kde4 \ %endif - $DISABLE_KDE4 \ --enable-evolution2 \ --enable-lockdown \ --enable-dbus \ %if 0%{?suse_version} <= 01130 +%if %build_mono == 1 --enable-mono \ -%else - --disable-mono \ + --with-mono-gac-root=%{_prefix}/lib \ +%endif %endif %if %suse_version <= 1130 --without-junit \ %endif +%if %suse_version < 1210 + --without-system-icu \ +%endif %if %debug_build == 0 --disable-ccache \ %endif - --without-stlport \ - --disable-mozilla \ - --without-system-mozilla \ - --disable-ldap \ - --enable-xmlsec \ - --with-openldap \ --enable-ext-ct2n \ --enable-ext-nlpsolver \ --enable-ext-google-docs \ --enable-ext-numbertext \ --enable-ext-wiki-publisher \ -%if 0%{?suse_version} --enable-ext-mysql-connector \ -%endif - --enable-ext-scripting-beanshell \ - --enable-ext-scripting-javascript \ + --enable-scripting-beanshell \ + --enable-scripting-javascript \ --with-system-dicts \ --with-system-headers \ %if 0%{?suse_version} <= 01130 --without-system-boost \ --without-system-vigra \ %endif - --without-system-mdds \ - --without-system-mozilla-headers \ +%if 0%{?suse_version} < 01230 + --without-system-mdds \ +%endif + --without-system-npapi-headers \ --without-system-sane \ --with-system-libs \ %if 0%{?suse_version} <= 01110 --without-system-postgresql \ %endif -%if 0%{?meego_version} - --without-system-cairo \ -%endif %if 0%{?suse_version} <= 01130 --without-system-lcms2 \ --without-system-libwpd \ --without-system-libwpg \ --without-system-libwps \ - --enable-librsvg=internal \ +%endif +%if 0%{?suse_version} >= 01230 + --with-system-ucpp \ +%endif +%if 0%{?suse_version} <= 01230 + --without-system-libcmis \ +%endif +%if 0%{?suse_version} < 01230 + --without-system-clucene \ + --without-system-mysql-cppconn \ + --without-system-libcdr \ + --without-system-libvisio \ + --without-system-graphite \ + --without-system-libexttextcat \ + --without-system-liblangtag \ + --without-system-libmspub \ + --without-system-redland \ + --without-system-orcus \ + --without-system-altlinuxhyph \ + --without-system-mythes \ %endif --without-system-apache-commons \ --without-system-beanshell \ - --without-system-clucene \ --without-system-hsqldb \ --without-system-jfreereport \ - --without-system-mysql-cppconn \ - --without-system-libcdr \ - --without-system-libvisio \ - --without-system-libcmis \ - --without-system-graphite \ - --without-system-sampleicc \ - --without-system-saxon \ - --without-system-servlet-api \ - --without-system-redland \ - --without-system-altlinuxhyph \ - --without-system-mythes \ - --without-system-libexttextcat + --without-system-servlet-api %endif # prebuilt stuff ( - . ./config_host.mk.source + sed '/SOLARVER/!d' config_host.mk > "${RPM_BUILD_ROOT}/config_host.mk.parsed" + sed '/INPATH/!d' config_host.mk >> "${RPM_BUILD_ROOT}/config_host.mk.parsed" + . "${RPM_BUILD_ROOT}/config_host.mk.parsed" # hack to add icons for helpcontent that is build separately mkdir -p $SOLARVER/$INPATH/res/img perl helpcontent2/helpers/create_ilst.pl -dir=icon-themes/galaxy/res/helpimg >$SOLARVER/$INPATH/res/img/helpimg.ilst @@ -1606,10 +1465,10 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH" install -m 644 $RPM_SOURCE_DIR/*-numbertext_%{numbertext_version}.oxt $SOLARVER/$INPATH/bin/numbertext.oxt ) # hack to correctly bootstrap python stuff with system python, (deb#501028, i#90701) -sed -i -e "s|@INSTALLDIR@|%lo_prefix/%lo_home|" pyuno/source/module/uno.py +sed -i -e "s|@INSTALLDIR@|%lo_prefix/%lo_home|" pyuno/source/module/uno.py scripting/source/pyprov/officehelper.py # hard link binaries in the build tree; it might save several GBs on the disk and is faster export gb_Deliver_HARDLINK=1 -# FIXME: try to finish build even with the strange random build crash in officecfg +# FIXME: try to finish build even with potential random build crashes make || make || make %install @@ -1623,7 +1482,6 @@ export JAVA_HOME=/usr make DESTDIR=$RPM_BUILD_ROOT distro-pack-install ################ # update desktop files -%if 0%{?suse_version} builddir=`pwd` cd $RPM_BUILD_ROOT%_datadir/applications for desktop in * ; do @@ -1642,7 +1500,6 @@ for desktop in * ; do %suse_update_desktop_file $app done cd - -%endif ################ # save l10n files in l10n-prebuild package l10n_prebuilt_list=file-lists/l10n-prebuilt.txt @@ -1780,25 +1637,6 @@ EOF chmod 755 $RPM_BUILD_ROOT%_prefix/sbin/unopkg-sync-bundled echo "%_prefix/sbin/unopkg-sync-bundled" >>file-lists/common_list.txt -################ -# KDE4 needed to be disabled on openSUSE-11.1-Evergreen but not on SLED11-SP1 -%define libkde4_devel_ver %(rpm -q --queryformat '%{VERSION}' libkde4-devel) -if test "%{libkde4_devel_ver}" = "4.1.3" ; then - mkdir -p $RPM_BUILD_ROOT%{_docdir}/%name-kde4/ - cat << EOF > $RPM_BUILD_ROOT%{_docdir}/%name-kde4/README.txt -Dear user, - -LibreOffice KDE4 support requires newer KDE4 libraries and therefore -cannot be built for openSUSE-11.1. We suggest to switch to the last -stable openSUSE release. - - Have a fun, - Your LibreOffice team -EOF - chmod 644 $RPM_BUILD_ROOT%{_docdir}/%name-kde4/README.txt - echo "%doc %dir \"%{_docdir}/%name-kde4\"" >>file-lists/kde4_list.txt - echo "%doc \"%{_docdir}/%name-kde4/README.txt\"" >>file-lists/kde4_list.txt -fi ################ # Symlink uno.py and unohelper.py so that python can find them mkdir -p $RPM_BUILD_ROOT%python_sitelib @@ -1809,23 +1647,16 @@ ln -s %_libdir/libreoffice/program/unohelper.py $RPM_BUILD_ROOT%python_sitelib/u %if %save_space == 1 rm -rf translations/source %endif +%fdupes $RPM_BUILD_ROOT/usr %clean rm -rf $RPM_BUILD_ROOT %pre -# crazy hack for the ugly extensions -if test $1 -gt 1 ; then - if test -d %{_libdir}/%lo_home/share/uno_packages/cache -a \ - -n "`find %{_libdir}/%lo_home/share/uno_packages/cache -name LanguageTool-0.9.3.oxt`" ; then - # try to remove the LangTool extension by the older URE; it can't be - # removed with OOo-3.1 and higher - echo "Unregistering the LangTool extension from LibreOffice..." - unopkg remove --shared org.openoffice.languagetool.oxt || true; - # clear disk cache - unopkg list --shared > /dev/null 2>&1 || true; - fi -fi +# do not crate cache for bundled extensions because it is not secure +# rather remove it (fdo#53006, fdo#51252, bnc#769448) +bundled_cache="%lo_prefix/%lo_home/share/prereg/bundled" +test -d "$bundled_cache" && rm -rf "$bundled_cache"/* || true; %post /sbin/ldconfig @@ -2038,34 +1869,7 @@ 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 - echo "Unregistering the older LibreOffice optional filter extensions..." - # Writer2latex extensions has been completely removed in 3.0.99.6 (bnc#529914) - if unopkg list --shared | grep -q "org.openoffice.da.writer2latex.oxt" ; then - unopkg remove --shared org.openoffice.da.writer2latex.oxt || true; - # clear disk cache - unopkg list --shared > /dev/null 2>&1 || true - fi -fi - -##################### - -%pre base-drivers-postgresql -if test $1 = 2 ; then - # unregister all extensions that were registered by LibO <= 3.2.99.3 - # the version 0.7.5 has been replaced in OOo-3.0.99.1 - unopkg remove --shared org.openoffice.legacy.postgresql-sdbc-0.7.5.zip >/dev/null 2>&1 || true; - # the version 0.7.6 has been replaced in OOo-3.2.0.8 - unopkg remove --shared org.openoffice.legacy.postgresql-sdbc-0.7.6.zip >/dev/null 2>&1 || true; - unopkg remove --shared org.openoffice.legacy.postgresql-sdbc-0.7.6a.zip >/dev/null 2>&1 || true; - if unopkg list --shared | grep -q "org.openoffice.legacy.postgresql-sdbc-%postgresql_version.zip" ; then - unopkg remove --shared org.openoffice.legacy.postgresql-sdbc-%postgresql_version.zip || true; - fi -fi +# base-drivers-postgresql %post base-drivers-postgresql if test -f %lo_prefix/ooo3/share/extension/install/postgresql-sdbc-*.zip ; then @@ -2080,20 +1884,6 @@ fi # base -%pre base-extensions -if test $1 -gt 1 ; then - # unregister all extensions that were registered by LibO <= 3.2.99.3 - # note that mysql connector has been put into separate package since openSUSE 11.2 - if unopkg list --shared | grep -q "com.sun.star.mysql-connector-ooo" ; then - unopkg remove --shared "com.sun.star.mysql-connector-ooo" || true; - fi - if unopkg list --shared | grep -q "com.sun.reportdesigner" ; then - unopkg remove --shared "com.sun.reportdesigner" || true; - fi - # clear disk cache - unopkg list --shared > /dev/null 2>&1 || true -fi - %post base-extensions if test -f %ooo_prefix/ooo3/share/extension/install/report-builder.oxt ; then echo @@ -2118,16 +1908,6 @@ fi %if 0%{?suse_version} >= 01120 -%pre base-drivers-mysql -if test $1 -gt 1 ; then - # unregister all extensions that were registered by LibO <= 3.2.99.3 - if unopkg list --shared | grep -q "com.sun.star.mysql-connector-ooo" ; then - unopkg remove --shared "com.sun.star.mysql-connector-ooo" || true; - fi - # clear disk cache - unopkg list --shared > /dev/null 2>&1 || true -fi - %post base-drivers-mysql if test -f %ooo_prefix/ooo3/share/extension/install/mysql-connector-ooo.oxt ; then echo @@ -2143,29 +1923,6 @@ fi # calc -%pre calc-extensions -if test $1 -gt 1 ; then - # unregister all extensions that were registered by LibO <= 3.2.99.3 - # Calc solver has been completely removed in 3.0.99.6 (bnc#523588) - if unopkg list --shared | grep -q "org.go-oo.CalcSolver" ; then - unopkg remove --shared "org.go-oo.CalcSolver" || true; - fi - if unopkg list --shared | grep -q "nl.nouenoff.ct2n" ; then - unopkg remove --shared "nl.nouenoff.ct2n" || true; - fi - if unopkg list --shared | grep -q "com.sun.star.comp.Calc.NLPSolver" ; then - unopkg remove --shared "com.sun.star.comp.Calc.NLPSolver" || true; - fi - if unopkg list --shared | grep -q "org.numbertext-calc-addin" ; then - unopkg remove --shared "org.numbertext-calc-addin" || true; - fi - if unopkg list --shared | grep -q "org.openoffice.extensions.watchwindow.WatchWindow" ; then - unopkg remove --shared "org.openoffice.extensions.watchwindow.WatchWindow" || true; - fi - # clear disk cache - unopkg list --shared > /dev/null 2>&1 || true -fi - %post calc-extensions if test -f %ooo_prefix/ooo3/share/extension/install/ConvertTextToNumber-*.oxt ; then echo @@ -2197,16 +1954,6 @@ fi # draw -%pre draw-extensions -if test $1 -gt 1 ; then - # unregister all extensions that were registered by LibO <= 3.2.99.3 - if unopkg list --shared | grep -q "com.sun.star.PDFImport" ; then - unopkg remove --shared com.sun.star.PDFImport || true; - fi - # clear disk cache - unopkg list --shared > /dev/null 2>&1 || true -fi - %post draw-extensions if test -f %ooo_prefix/ooo3/share/extension/install/pdfimport.oxt ; then echo @@ -2220,19 +1967,6 @@ fi # impress -%pre impress-extensions -if test $1 -gt 1 ; then - # unregister all extensions that were registered by LibO <= 3.2.99.3 - if unopkg list --shared | grep -q "com.sun.star.PresentationMinimizer" ; then - unopkg remove --shared com.sun.star.PresentationMinimizer || true; - fi - if unopkg list --shared | grep -q "com.sun.PresenterScreen" ; then - unopkg remove --shared com.sun.PresenterScreen || true; - fi - # clear disk cache - unopkg list --shared > /dev/null 2>&1 || true -fi - %post impress-extensions if test -f %ooo_prefix/ooo3/share/extension/install/presentation-minimizer.oxt ; then echo @@ -2255,23 +1989,6 @@ fi # writer -%pre writer-extensions -if test $1 -gt 1 ; then - # unregister all extensions that were registered by LibO <= 3.2.99.3 - if unopkg list --shared | grep -q "org.openoffice.gdocs.oxt" ; then - unopkg remove --shared org.openoffice.gdocs.oxt || true; - fi - # the blogger extension existed only in few 3.2-beta versions - if unopkg list --shared | grep -q "org.openoffice.caolan.blogger" ; then - unopkg remove --shared org.openoffice.caolan.blogger >/dev/null 2>&1 || true; - fi - if unopkg list --shared | grep -q "com.sun.star.PDFImport" ; then - unopkg remove --shared com.sun.star.PDFImport || true; - fi - # clear disk cache - unopkg list --shared > /dev/null 2>&1 || true -fi - %post writer-extensions if test -f %ooo_prefix/ooo3/share/extension/install/gdocs*.oxt ; then echo @@ -2297,13 +2014,17 @@ fi %files -f file-lists/common_list.txt %defattr(-,root,root) -# 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 +# such a big icons are not provided by other packages +# FIXME: last time checked on openSUSE-12.2 +%dir %_datadir/icons/hicolor/512x512 +%dir %_datadir/icons/hicolor/512x512/apps +%dir %_datadir/icons/hicolor/512x512/mimetypes %files -f file-lists/base_list.txt base %defattr(-,root,root) @@ -2333,14 +2054,15 @@ fi %defattr(-,root,root) %if 0%{?suse_version} <= 01130 - %files -f file-lists/mono_list.txt mono %defattr(-,root,root) +%if %build_mono == 0 +%doc README-mono.txt +%endif %endif %files -f file-lists/pyuno_list.txt pyuno %defattr(-,root,root) -%lo_prefix/%lo_home/share/extensions/script-provider-for-python %python_sitelib/uno.py %python_sitelib/unohelper.py @@ -2388,12 +2110,11 @@ fi %files draw-extensions %defattr(-,root,root) -%lo_prefix/%lo_home/share/extensions/pdfimport +%doc README-draw-extensions.txt %files impress-extensions %defattr(-,root,root) %lo_prefix/%lo_home/share/extensions/presentation-minimizer -%lo_prefix/%lo_home/share/extensions/presenter-screen %files writer-extensions %defattr(-,root,root) diff --git a/libvisio-0.0.25.tar.bz2 b/libvisio-0.0.25.tar.bz2 new file mode 100644 index 0000000..bc0af8f --- /dev/null +++ b/libvisio-0.0.25.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fa57b8012778154ffc798eed4d33ae171f91dafc2f9b2efb092399b93a0725d6 +size 480885 diff --git a/lo-provides b/lo-provides index 3f34ef2..e809d6c 100644 --- a/lo-provides +++ b/lo-provides @@ -1,8 +1,3 @@ # hide some private libraries from provides -grep -v -e libraptor.so \ - -e librasqal.so \ - -e librdf.so \ - -e libmysqlcppconn.so \ - -e libcairo.so.2 \ - -e libpixman-1.so.0 \ +grep -v -e libmysqlcppconn.so \ | /usr/lib/rpm/find-provides “$@” diff --git a/lo-requires b/lo-requires index 1abc394..abc11a9 100644 --- a/lo-requires +++ b/lo-requires @@ -1,7 +1,3 @@ # do not require some internal libraries /usr/lib/rpm/find-requires “$@” | \ -grep -v -e libraptor.so \ - -e librasqal.so \ - -e librdf.so \ - -e libmysqlcppconn.so \ - -e libpixman-1.so.0 +grep -v -e libmysqlcppconn.so diff --git a/mediawiki-no-broken-help.diff b/mediawiki-no-broken-help.diff index 2d76b8a..1f431a5 100644 --- a/mediawiki-no-broken-help.diff +++ b/mediawiki-no-broken-help.diff @@ -1,5 +1,5 @@ ---- swext/mediawiki/src/manifest.xml.old 2012-03-27 18:22:01.000000000 +0200 -+++ swext/mediawiki/src/manifest.xml 2012-03-30 16:56:56.000000000 +0200 +--- swext/mediawiki/src/META-INF/manifest.xml.old 2012-03-27 18:22:01.000000000 +0200 ++++ swext/mediawiki/src/META-INF/manifest.xml 2012-03-30 16:56:56.000000000 +0200 @@ -46,6 +46,4 @@ manifest:full-path="Types.xcu"/> calc8_template - - -- calc8 -+ MS Excel 97 - - - private:factory/scalc -@@ -154,7 +154,7 @@ - impress8_template - - -- impress8 -+ MS PowerPoint 97 - - - private:factory/simpress -@@ -273,7 +273,7 @@ - writer8_template - - -- writer8 -+ MS Word 97 - - - private:factory/swriter diff --git a/pack-addressbook.diff b/pack-addressbook.diff deleted file mode 100644 index c30707d..0000000 --- a/pack-addressbook.diff +++ /dev/null @@ -1,22 +0,0 @@ ---- 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/pack-desktop-files-for-optional-filters.diff b/pack-desktop-files-for-optional-filters.diff index 809455d..a0ddda3 100644 --- a/pack-desktop-files-for-optional-filters.diff +++ b/pack-desktop-files-for-optional-filters.diff @@ -1,9 +1,8 @@ -Index: bin/distro-install-desktop-integration -=================================================================== ---- bin/distro-install-desktop-integration.orig -+++ bin/distro-install-desktop-integration -@@ -172,6 +172,10 @@ add_wrapper unopkg unopkg "" - test -f $DESTDIR/gid_Module_Optional_Binfilter && echo "$PREFIXDIR/share/applications/libreoffice-binfilter.desktop" >>"$DESTDIR/gid_Module_Optional_Binfilter" +diff -urN libreoffice-4.0.0.0.beta1.old/bin/distro-install-desktop-integration libreoffice-4.0.0.0.beta1/bin/distro-install-desktop-integration +--- libreoffice-4.0.0.0.beta1.old/bin/distro-install-desktop-integration 2012-12-17 12:47:12.343137682 +0100 ++++ libreoffice-4.0.0.0.beta1/bin/distro-install-desktop-integration 2012-12-17 12:53:56.520100212 +0100 +@@ -168,6 +168,10 @@ + # there are two more desktop files for optional filters test -f $DESTDIR/gid_Module_Optional_Xsltfiltersamples && echo "$PREFIXDIR/share/applications/libreoffice-xsltfilter.desktop" >>"$DESTDIR/gid_Module_Optional_Xsltfiltersamples" +# there are two more desktop files for optional filters diff --git a/pyuno-path.diff b/pyuno-path.diff deleted file mode 100644 index c866cb3..0000000 --- a/pyuno-path.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- pyuno/source/module/uno.py 2011-11-30 18:39:37 -0500 -+++ pyuno/source/module/uno.py 2011-11-30 19:38:14 -0500 -@@ -26,6 +26,12 @@ - #************************************************************************* - import os - import sys -+import platform -+ -+if platform.machine() == 'x86_64': -+ sys.path.append('/usr/lib64/libreoffice/program') -+else: -+ sys.path.append('/usr/lib/libreoffice/program') - - if getattr(os.environ, 'URE_BOOTSTRAP', None) is None: - os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:@INSTALLDIR@/program/fundamentalrc" diff --git a/scripting-prefer-internal-rhino.diff b/scripting-prefer-internal-rhino.diff index d2c002c..475d5e2 100644 --- a/scripting-prefer-internal-rhino.diff +++ b/scripting-prefer-internal-rhino.diff @@ -1,8 +1,21 @@ -Index: solenv/gbuild/Jar.mk -=================================================================== ---- solenv/gbuild/Jar.mk.orig -+++ solenv/gbuild/Jar.mk -@@ -201,6 +201,11 @@ $$(call gb_Output_error,\ +diff -urN libreoffice-4.0.0.0.beta1.old/scripting/Jar_ScriptProviderForJavaScript.mk libreoffice-4.0.0.0.beta1/scripting/Jar_ScriptProviderForJavaScript.mk +--- libreoffice-4.0.0.0.beta1.old/scripting/Jar_ScriptProviderForJavaScript.mk 2012-12-17 12:47:10.021137898 +0100 ++++ libreoffice-4.0.0.0.beta1/scripting/Jar_ScriptProviderForJavaScript.mk 2012-12-17 12:56:29.405086038 +0100 +@@ -40,6 +40,10 @@ + rhino \ + )) + ++$(eval $(call gb_Jar_prepend_xboot_jars,ScriptProviderForJavaScript,\ ++ $(OUTDIR)/bin/js.jar \ ++)) ++ + $(eval $(call gb_Jar_set_manifest,ScriptProviderForJavaScript,$(SRCDIR)/scripting/java/com/sun/star/script/framework/provider/javascript/MANIFEST.MF)) + + $(eval $(call gb_Jar_set_componentfile,ScriptProviderForJavaScript,scripting/java/ScriptProviderForJavaScript,OOO)) +diff -urN libreoffice-4.0.0.0.beta1.old/solenv/gbuild/Jar.mk libreoffice-4.0.0.0.beta1/solenv/gbuild/Jar.mk +--- libreoffice-4.0.0.0.beta1.old/solenv/gbuild/Jar.mk 2012-12-17 12:47:09.394137956 +0100 ++++ libreoffice-4.0.0.0.beta1/solenv/gbuild/Jar.mk 2012-12-17 12:56:29.404086038 +0100 +@@ -214,6 +214,11 @@ gb_Jar_add_jars: use gb_Jar_use_jars instead.) endef @@ -13,25 +26,23 @@ Index: solenv/gbuild/Jar.mk + # specify jars with imported modules define gb_Jar_use_jars - $(call gb_JavaClassSet_use_jars,$(call gb_Jar_get_classsetname,$(1)),$(2)) -Index: solenv/gbuild/JavaClassSet.mk -=================================================================== ---- solenv/gbuild/JavaClassSet.mk.orig -+++ solenv/gbuild/JavaClassSet.mk -@@ -46,6 +46,8 @@ $(call gb_Helper_abbreviate_dirs,\ + $(foreach jar,$(2),$(call gb_Jar_use_jar,$(1),$(jar))) +diff -urN libreoffice-4.0.0.0.beta1.old/solenv/gbuild/JavaClassSet.mk libreoffice-4.0.0.0.beta1/solenv/gbuild/JavaClassSet.mk +--- libreoffice-4.0.0.0.beta1.old/solenv/gbuild/JavaClassSet.mk 2012-12-17 12:47:09.393137956 +0100 ++++ libreoffice-4.0.0.0.beta1/solenv/gbuild/JavaClassSet.mk 2012-12-17 12:58:28.659074982 +0100 +@@ -47,6 +47,8 @@ $(filter-out $(JARDEPS),$(4))) && \ $(if $(3),$(gb_JavaClassSet_JAVACCOMMAND) \ $(gb_JavaClassSet_JAVACDEBUG) \ + $(gb_JavaClassSet_XBOOTCLASSPATH) \ + -Xbootclasspath/p:$(XBOOT_CP_P) \ - -cp "$(T_CP)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(2))" \ + -classpath "$(T_CP)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(2))" \ -d $(call gb_JavaClassSet_get_classdir,$(2)) \ @$$RESPONSEFILE &&) \ -@@ -112,6 +114,18 @@ $$(call gb_Output_error,\ +@@ -118,6 +120,17 @@ gb_JavaClassSet_add_jar: use gb_JavaClassSet_use_jar instead.) endef -+ +# Xbootclasspath +define gb_JavaClassSet_prepend_xboot_jar +$(eval $(call gb_JavaClassSet_get_target,$(1)) : $(2)) @@ -43,21 +54,6 @@ Index: solenv/gbuild/JavaClassSet.mk +$(foreach jar,$(2),$(call gb_JavaClassSet_prepend_xboot_jar,$(1),$(jar))) +endef + - # problem: currently we can't get these dependencies to work - # build order dependency is a hack to get these prerequisites out of the way in the build command define gb_JavaClassSet_use_jar -Index: scripting/Jar_ScriptProviderForJavaScript.mk -=================================================================== ---- scripting/Jar_ScriptProviderForJavaScript.mk.orig -+++ scripting/Jar_ScriptProviderForJavaScript.mk -@@ -40,6 +40,10 @@ $(eval $(call gb_Jar_use_externals,Scrip - rhino \ - )) - -+$(eval $(call gb_Jar_prepend_xboot_jars,ScriptProviderForJavaScript,\ -+ $(OUTDIR)/bin/js.jar \ -+)) -+ - $(eval $(call gb_Jar_set_manifest,ScriptProviderForJavaScript,$(SRCDIR)/scripting/java/com/sun/star/script/framework/provider/javascript/MANIFEST.MF)) - - $(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForJavaScript, \ + ifneq (,$$(filter-out $(gb_Jar_KNOWN),$(2))) + $$(eval $$(call gb_Output_info,currently known jars are: $(sort $(gb_Jar_KNOWN)),ALL)) diff --git a/sdext-disable-failing-xpdf-test.diff b/sdext-disable-failing-xpdf-test.diff deleted file mode 100644 index bbeaa5b..0000000 --- a/sdext-disable-failing-xpdf-test.diff +++ /dev/null @@ -1,25 +0,0 @@ ---- sdext/source/pdfimport/test/tests.cxx.old 2012-06-19 17:10:50.000000000 +0200 -+++ sdext/source/pdfimport/test/tests.cxx 2012-06-21 14:21:40.000000000 +0200 -@@ -125,12 +125,16 @@ namespace - CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( "A4 page size (in 100th of points): Height" , m_aPageSize.Height, 59500, 0.0000001 ); - CPPUNIT_ASSERT_MESSAGE( "endPage() called", m_bPageEnded ); - CPPUNIT_ASSERT_EQUAL_MESSAGE( "Num pages equal one", m_nNumPages, (sal_Int32) 1 ); -- CPPUNIT_ASSERT_MESSAGE( "Correct hyperlink bounding box", -- rtl::math::approxEqual(m_aHyperlinkBounds.X1,34.7 ) && -- rtl::math::approxEqual(m_aHyperlinkBounds.Y1,386.0) && -- rtl::math::approxEqual(m_aHyperlinkBounds.X2,166.7) && -- rtl::math::approxEqual(m_aHyperlinkBounds.Y2,406.2) ); -- CPPUNIT_ASSERT_EQUAL_MESSAGE( "Correct hyperlink URI", m_aURI, ::rtl::OUString("http://download.openoffice.org/") ); -+ printf ("m_aHyperlinkBounds.X1 = %d\n", m_aHyperlinkBounds.X1); -+ printf ("m_aHyperlinkBounds.Y1 = %d\n", m_aHyperlinkBounds.Y1); -+ printf ("m_aHyperlinkBounds.X2 = %d\n", m_aHyperlinkBounds.X2); -+ printf ("m_aHyperlinkBounds.Y2 = %d\n", m_aHyperlinkBounds.Y2); -+// CPPUNIT_ASSERT_MESSAGE( "Correct hyperlink bounding box", -+// rtl::math::approxEqual(m_aHyperlinkBounds.X1,34.7 ) && -+// rtl::math::approxEqual(m_aHyperlinkBounds.Y1,386.0) && -+// rtl::math::approxEqual(m_aHyperlinkBounds.X2,166.7) && -+// rtl::math::approxEqual(m_aHyperlinkBounds.Y2,406.2) ); -+// CPPUNIT_ASSERT_EQUAL_MESSAGE( "Correct hyperlink URI", m_aURI, ::rtl::OUString("http://download.openoffice.org/") ); - - const char* sText = " \n \nThis is a testtext\nNew paragraph,\nnew line\n" - "Hyperlink, this is\n?\nThis is more text\noutline mode\n?\nNew paragraph\n"; diff --git a/sdext-poppler-0.21.0.diff b/sdext-poppler-0.21.0.diff deleted file mode 100644 index f21dbfc..0000000 --- a/sdext-poppler-0.21.0.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.old 2012-10-15 15:45:49.000000000 +0200 -+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2012-10-31 11:55:44.000000000 +0100 -@@ -46,7 +46,11 @@ - #pragma warning(push, 1) - #endif - -+#if POPPLER_CHECK_VERSION(0, 21, 0) -+#include "UTF.h" -+#else - #include "UTF8.h" -+#endif - - #if defined __SUNPRO_CC - #pragma enable_warn diff --git a/sdext-poppler-0.21.1.diff b/sdext-poppler-0.21.1.diff deleted file mode 100644 index 4b4ce14..0000000 --- a/sdext-poppler-0.21.1.diff +++ /dev/null @@ -1,33 +0,0 @@ -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 - diff --git a/sofficerc-upstream b/sofficerc-upstream index c5aff14..3fa96e1 100644 --- a/sofficerc-upstream +++ b/sofficerc-upstream @@ -2,10 +2,10 @@ HideEula=1 Logo=1 NativeProgress=false -ProgressBarColor=255,255,255 -ProgressFrameColor=20,136,3 -ProgressPosition=61,317 -ProgressSize=407,6 -ProgressTextBaseline=287 +ProgressBarColor=128,128,128 +ProgressFrameColor=245,245,245 +ProgressPosition=72,189 +ProgressSize=409,8 +ProgressTextBaseline=170 ProgressTextColor=255,255,255 URE_BOOTSTRAP=${ORIGIN}/fundamentalrc diff --git a/solenv-java-source-version.diff b/solenv-java-source-version.diff index 58a28f9..70516da 100644 --- a/solenv-java-source-version.diff +++ b/solenv-java-source-version.diff @@ -9,5 +9,5 @@ Index: solenv/gbuild/JavaClassSet.mk + -source $(JAVA_SOURCE_VER) \ + -target $(JAVA_TARGET_VER) \ -Xbootclasspath/p:$(XBOOT_CP_P) \ - -cp "$(T_CP)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(2))" \ + -classpath "$(T_CP)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(2))" \ -d $(call gb_JavaClassSet_get_classdir,$(2)) \ diff --git a/split-help-buildhack-no-vcl.diff b/split-help-buildhack-no-vcl.diff new file mode 100644 index 0000000..a694604 --- /dev/null +++ b/split-help-buildhack-no-vcl.diff @@ -0,0 +1,17 @@ +--- xmlhelp/prj/build.lst.old 2013-04-16 18:12:49.000000000 +0200 ++++ xmlhelp/prj/build.lst 2013-04-16 18:18:33.000000000 +0200 +@@ -1,3 +1,3 @@ +-xh xmlhelp : comphelper ucbhelper LIBXSLT:libxslt unoil javaunohelper DESKTOP:l10ntools DESKTOP:helpcompiler unotools vcl NULL ++xh xmlhelp : comphelper ucbhelper LIBXSLT:libxslt unoil javaunohelper DESKTOP:l10ntools DESKTOP:helpcompiler unotools NULL + xh xmlhelp usr1 - all xh_mkout NULL + xh xmlhelp\prj nmake - all xh_prj NULL +--- xmlhelp/Module_xmlhelp.mk.old 2013-04-16 09:46:01.000000000 +0200 ++++ xmlhelp/Module_xmlhelp.mk 2013-04-16 18:12:00.000000000 +0200 +@@ -29,7 +29,6 @@ $(eval $(call gb_Module_Module,xmlhelp)) + + $(eval $(call gb_Module_add_targets,xmlhelp,\ + Library_tvhlp1 \ +- Library_ucpchelp1 \ + Package_xsl \ + Zip_helpxsl \ + )) diff --git a/split-icons-search-usr-share.diff b/split-icons-search-usr-share.diff index f7300b7..418adf7 100644 --- a/split-icons-search-usr-share.diff +++ b/split-icons-search-usr-share.diff @@ -1,8 +1,29 @@ -Index: vcl/source/gdi/impimagetree.cxx -=================================================================== ---- vcl/source/gdi/impimagetree.cxx.orig -+++ vcl/source/gdi/impimagetree.cxx -@@ -156,7 +156,16 @@ void loadFromStream( +diff -urN libreoffice-4.0.0.0.beta1.old/vcl/inc/impimagetree.hxx libreoffice-4.0.0.0.beta1/vcl/inc/impimagetree.hxx +--- libreoffice-4.0.0.0.beta1.old/vcl/inc/impimagetree.hxx 2012-12-17 12:47:09.692137928 +0100 ++++ libreoffice-4.0.0.0.beta1/vcl/inc/impimagetree.hxx 2012-12-17 12:48:30.214130463 +0100 +@@ -76,6 +76,10 @@ + typedef boost::unordered_map< + rtl::OUString, std::pair< bool, BitmapEx >, rtl::OUStringHash > IconCache; + ++ // we want to search zip files (icons) also in /usr/share/ ++ ::rtl::OUString m_datadir; // /usr/share/ ++ ::rtl::OUString m_libdir; // /usr/lib or /usr/lib64 ++ + rtl::OUString m_style; + Paths m_paths; + CheckStyleCache m_checkStyleCache; +@@ -84,6 +88,7 @@ + + void setStyle(rtl::OUString const & style ); + ++ void addUrlToPaths(const rtl::OUString &url); + void resetPaths(); + + bool checkStyleCacheLookup( rtl::OUString const & style, bool &exists ); +diff -urN libreoffice-4.0.0.0.beta1.old/vcl/source/gdi/impimagetree.cxx libreoffice-4.0.0.0.beta1/vcl/source/gdi/impimagetree.cxx +--- libreoffice-4.0.0.0.beta1.old/vcl/source/gdi/impimagetree.cxx 2012-12-17 12:47:09.685137929 +0100 ++++ libreoffice-4.0.0.0.beta1/vcl/source/gdi/impimagetree.cxx 2012-12-17 12:48:30.214130463 +0100 +@@ -146,7 +146,16 @@ } @@ -20,7 +41,7 @@ Index: vcl/source/gdi/impimagetree.cxx ImplImageTree::~ImplImageTree() {} -@@ -297,6 +306,22 @@ void ImplImageTree::setStyle(rtl::OUStri +@@ -288,6 +297,22 @@ } } @@ -43,7 +64,7 @@ Index: vcl/source/gdi/impimagetree.cxx void ImplImageTree::resetPaths() { m_paths.clear(); { -@@ -305,10 +330,7 @@ void ImplImageTree::resetPaths() { +@@ -296,10 +321,7 @@ rtl::Bootstrap::expandMacros(url); INetURLObject u(url); OSL_ASSERT(!u.HasError()); @@ -55,7 +76,7 @@ Index: vcl/source/gdi/impimagetree.cxx } { rtl::OUString url( -@@ -322,17 +344,12 @@ void ImplImageTree::resetPaths() { +@@ -313,17 +335,12 @@ b.appendAscii(RTL_CONSTASCII_STRINGPARAM("_brand")); bool ok = u.Append(b.makeStringAndClear(), INetURLObject::ENCODE_ALL); OSL_ASSERT(ok); (void) ok; @@ -75,7 +96,7 @@ Index: vcl/source/gdi/impimagetree.cxx } { rtl::OUString url( -@@ -345,18 +362,13 @@ void ImplImageTree::resetPaths() { +@@ -336,18 +353,13 @@ b.append(m_style); bool ok = u.Append(b.makeStringAndClear(), INetURLObject::ENCODE_ALL); OSL_ASSERT(ok); (void) ok; @@ -96,34 +117,10 @@ Index: vcl/source/gdi/impimagetree.cxx } } -Index: vcl/inc/impimagetree.hxx -=================================================================== ---- vcl/inc/impimagetree.hxx.orig -+++ vcl/inc/impimagetree.hxx -@@ -85,6 +85,10 @@ private: - typedef boost::unordered_map< - rtl::OUString, std::pair< bool, BitmapEx >, rtl::OUStringHash > IconCache; - -+ // we want to search zip files (icons) also in /usr/share/ -+ ::rtl::OUString m_datadir; // /usr/share/ -+ ::rtl::OUString m_libdir; // /usr/lib or /usr/lib64 -+ - rtl::OUString m_style; - Paths m_paths; - CheckStyleCache m_checkStyleCache; -@@ -93,6 +97,7 @@ private: - - void setStyle(rtl::OUString const & style ); - -+ void addUrlToPaths(const rtl::OUString &url); - void resetPaths(); - - bool checkStyleCacheLookup( rtl::OUString const & style, bool &exists ); -Index: xmlhelp/source/cxxhelp/provider/provider.cxx -=================================================================== ---- xmlhelp/source/cxxhelp/provider/provider.cxx.orig -+++ xmlhelp/source/cxxhelp/provider/provider.cxx -@@ -334,7 +334,7 @@ void ContentProvider::init() +diff -urN libreoffice-4.0.0.0.beta1.old/xmlhelp/source/cxxhelp/provider/provider.cxx libreoffice-4.0.0.0.beta1/xmlhelp/source/cxxhelp/provider/provider.cxx +--- libreoffice-4.0.0.0.beta1.old/xmlhelp/source/cxxhelp/provider/provider.cxx 2012-12-17 12:47:12.392137678 +0100 ++++ libreoffice-4.0.0.0.beta1/xmlhelp/source/cxxhelp/provider/provider.cxx 2012-12-17 12:48:30.214130463 +0100 +@@ -326,7 +326,7 @@ rtl::OUString( " " ) + setupextension ); @@ -132,7 +129,7 @@ Index: xmlhelp/source/cxxhelp/provider/provider.cxx xHierAccess = getHierAccess( sProvider, "org.openoffice.Office.Common" ); rtl::OUString aPath( getKey( xHierAccess, "Path/Current/UserConfig" ) ); -@@ -343,6 +343,19 @@ void ContentProvider::init() +@@ -335,6 +335,19 @@ aPath = rtl::OUString("$BRAND_BASE_DIR/share/config"); rtl::Bootstrap::expandMacros(aPath); @@ -151,4 +148,4 @@ Index: xmlhelp/source/cxxhelp/provider/provider.cxx + aPath = aPath.replaceAt( nLibDirPos, aLibDir.getLength(), aDataDir ); aImagesZipPaths[ 1 ] = aPath; - uno::Reference< uno::XComponentContext > xContext; + sal_Bool showBasic = getBooleanKey(xHierAccess,"Help/ShowBasic"); diff --git a/system-python-ure-bootstrap.diff b/system-python-ure-bootstrap.diff deleted file mode 100644 index b13bae3..0000000 --- a/system-python-ure-bootstrap.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- pyuno/source/module/uno.py.old 2012-02-24 16:34:51.000000000 +0100 -+++ pyuno/source/module/uno.py 2012-03-01 15:56:27.000000000 +0100 -@@ -26,8 +26,12 @@ - # for a copy of the LGPLv3 License. - # - #************************************************************************* -+import os - import sys - -+if getattr(os.environ, 'URE_BOOTSTRAP', None) is None: -+ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:@INSTALLDIR@/program/fundamentalrc" -+ - import pyuno - - try: diff --git a/system-pyuno.diff b/system-pyuno.diff new file mode 100644 index 0000000..83f1813 --- /dev/null +++ b/system-pyuno.diff @@ -0,0 +1,41 @@ +diff -urN libreoffice-4.0.0.0.beta2.old/desktop/scripts/soffice.sh libreoffice-4.0.0.0.beta2/desktop/scripts/soffice.sh +--- libreoffice-4.0.0.0.beta2.old/desktop/scripts/soffice.sh 2012-12-19 19:09:46.518989541 +0100 ++++ libreoffice-4.0.0.0.beta2/desktop/scripts/soffice.sh 2012-12-19 19:10:21.810986269 +0100 +@@ -120,6 +120,9 @@ + exit 1; + fi + ++PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH} ++export PYTHONPATH ++ + case "`uname -s`" in + NetBSD|OpenBSD|FreeBSD|DragonFly) + # this is a temporary hack until we can live with the default search paths +diff -urN libreoffice-4.0.0.0.beta2.old/pyuno/source/module/uno.py libreoffice-4.0.0.0.beta2/pyuno/source/module/uno.py +--- libreoffice-4.0.0.0.beta2.old/pyuno/source/module/uno.py 2012-12-19 19:09:49.483989266 +0100 ++++ libreoffice-4.0.0.0.beta2/pyuno/source/module/uno.py 2012-12-19 19:10:21.810986269 +0100 +@@ -16,8 +16,12 @@ + # except in compliance with the License. You may obtain a copy of + # the License at http://www.apache.org/licenses/LICENSE-2.0 . + # ++import os + import sys + ++sys.path.append('@INSTALLDIR@/program') ++if getattr(os.environ, 'URE_BOOTSTRAP', None) is None: ++ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:@INSTALLDIR@/program/fundamentalrc" + import pyuno + + try: +diff -urN libreoffice-4.0.0.0.beta2.old/scripting/source/pyprov/officehelper.py libreoffice-4.0.0.0.beta2/scripting/source/pyprov/officehelper.py +--- libreoffice-4.0.0.0.beta2.old/scripting/source/pyprov/officehelper.py 2012-12-19 19:09:46.868989508 +0100 ++++ libreoffice-4.0.0.0.beta2/scripting/source/pyprov/officehelper.py 2012-12-19 19:10:21.810986269 +0100 +@@ -44,7 +44,7 @@ + if "UNO_PATH" in os.environ: + sOffice = os.environ["UNO_PATH"] + else: +- sOffice = "" # lets hope for the best ++ sOffice = "@INSTALLDIR@/program" + sOffice = os.path.join(sOffice, "soffice") + if platform.startswith("win"): + sOffice += ".exe" diff --git a/touch-no-dereference.diff b/touch-no-dereference.diff new file mode 100644 index 0000000..36a44c5 --- /dev/null +++ b/touch-no-dereference.diff @@ -0,0 +1,37 @@ +From b03773728e53a83715d338b021f60375aed06bb9 Mon Sep 17 00:00:00 2001 +From: Petr Mladek +Date: Tue, 19 Mar 2013 14:38:58 +0100 +Subject: [PATCH] fix race condition when using hardlinks to deliver into + solver + +We need to use "touch --no-dereference" on the delivered files. +Otherwise, it creates empty target file when you touch symlinks and +delivering the real target file might fail. + +This caused many build failures when delivering: + + liblcms2.so -> liblcms2.so.2.0.4 + liblcms2.so.2 -> liblcms2.so.2.0.4 + liblcms2.so.2.0.4 + +Change-Id: Ibd61815c12e002b495e848a125a959b8524b0935 +--- + solenv/gbuild/Deliver.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/solenv/gbuild/Deliver.mk b/solenv/gbuild/Deliver.mk +index 0f257e5..ab56dab 100644 +--- a/solenv/gbuild/Deliver.mk ++++ b/solenv/gbuild/Deliver.mk +@@ -60,7 +60,7 @@ endif + endef + + define gb_Deliver__deliver +-$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) $(if $(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) && touch -r $(1) $(2) ++$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) $(if $(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) && touch --no-dereference -r $(1) $(2) + endef + + ifneq ($(strip $(gb_Deliver_GNUCOPY)),) +-- +1.8.1.3 +