diff --git a/.abf.yml b/.abf.yml index 20d4218..4befc3e 100644 --- a/.abf.yml +++ b/.abf.yml @@ -5,21 +5,14 @@ sources: 185d60944ea767075d27247c3162b3bc-unowinreg.dll: 0619ed3a89644bef318df67db12045b2b590585b 1be202fbbbc13f10592a98f70a4a87fb-OOOP-templates-pack-2.9.0.0.zip: 1dd5bd9962e851b5e487b0c2033b5a8951aaefad 1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt: 206a371b46a3d991722b059b5d6f3bb29f1fc48b - 23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt: da769c6f73206f0f0e6db4697f802c0bacbf4d02 - 27211596cf0ad97cab7321239406fde0-gdocs_3.0.1_modified.oxt: 6d400d83fa2080847ad9d7e2ca466a98ee2dbfa4 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz: 5c604f102e0716597b3d2659ac3e77f80a02f22d 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip: 1acea86fd399ed7817879d36370d3d1f8b109050 - 3ed18025a766f1e955707b969c8113a5-Barcode_1.3.5.0.oxt: c01632cfaee10322bc4badef316bedd08a759224 - 451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt: e38bfefa6b747db13182e4ea5c1ad2eed3fa9cda 472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt: d2b6a076b40d8d517075e52220ddd8f89f655c8f 4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt: bf25bef71f72a4622089c85958bfd6c58d8516a6 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2: 1169780b4a0c515b23b96c913fd9bc52ceb7fb39 53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt: 4fea33622d89c7ac62053e5ee3616cfe504e0f14 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip: 8a90669029e107b61953b90ba11545fef586c2ca - 86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz: a0cc67aa534167bb59bcca0dc6a7db2573814542 8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz: c78ddd06845e267ba5bec20a38430f66eec3e0e4 - 8d74685d41f8bffe8c3e71fe8deac09d-SmART_0.9.5.oxt: ad53e6f0b18842ade578cad5acc9ea651ad01a03 - 9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt: 0f0e7f1f1fd7951de2dd3b6bb7313c6adb4d17b8 Mandriva-Rosa_Icons.tar.bz2: 53448c079fcb3008d1fdec7f95305fe392460c1f OpenCOLLADA-master-6509aa13af.tar.bz2: c4f5760a1d21213dc52e2cf3ad9c0b9112585f36 a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt: d831314cf4c74f5afb3b37ee718dd58f981b97a8 @@ -30,11 +23,9 @@ sources: b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt: a476a199de32a32221132c8e77fad96c88616b08 b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2: aa8faa4f9e6721eed9bc6878862d74d0cb23251c b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt: bdec3915c01cd60e20892376aa5e5a0d3980c389 - bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt: c89331a8d7642429f4fe3ffe07ee6d675f99561a commons-logging-1.2-src.tar.gz: 0a134d01e9aeb09b33f4c7450fb41abb7bed9db6 libreoffice-5.4.0.3.tar.xz: 46ed5a449c39b31927d2d12ccce02f311486e7ff libreoffice-dictionaries-5.4.0.3.tar.xz: 862e764e25953d3efd79757f018b007aa7eb63ad libreoffice-help-5.4.0.3.tar.xz: c972b0b43aef81e8e39dbf897efb5c8479dc2aac libreoffice-translations-5.4.0.3.tar.xz: 7811e8139ee6c40b2778d41992f692e6d5a6e52e pdfium-3064.tar.bz2: 70135df62d10db3471054bd29fb9bf48d8bc5b7c - xmlsec1-1.2.24.tar.gz: b64a443641de3338d7d1ba17f25653a314d65d93 diff --git a/libreoffice.spec b/libreoffice.spec index f8d23d0..a7c4d76 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -68,18 +68,10 @@ Source36: %{devurl}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip Source37: %{devurl}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip # Extensions -Source48: %{srcurl}xmlsec1-1.2.24.tar.gz Source49: %{srcurl}pdfium-3064.tar.bz2 -Source50: %{srcurl}451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt Source51: %{srcurl}b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2 -Source52: %{oxyurl}3ed18025a766f1e955707b969c8113a5-Barcode_1.3.5.0.oxt -Source53: %{oxyurl}8d74685d41f8bffe8c3e71fe8deac09d-SmART_0.9.5.oxt Source54: %{oxyurl}b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt -Source55: %{srcurl}27211596cf0ad97cab7321239406fde0-gdocs_3.0.1_modified.oxt Source56: %{srcurl}b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt -Source57: %{oxyurl}9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt -Source58: %{oxyurl}bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt -Source59: %{oxyurl}23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt Source60: %{oxyurl}af9314c5972d95a5d6da23ffad818f68-OOOP-gallery-pack-2.8.0.0.zip Source61: %{oxyurl}1be202fbbbc13f10592a98f70a4a87fb-OOOP-templates-pack-2.9.0.0.zip Source62: %{oxyurl}53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt @@ -91,7 +83,6 @@ Source67: %{oxyurl}b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0 Source68: %{srcurl}4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 Source69: %{srcurl}OpenCOLLADA-master-6509aa13af.tar.bz2 Source70: %{srcurl}1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt -Source71: %{srcurl}86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz Source1000: libreoffice.rpmlintrc @@ -257,7 +248,6 @@ Requires: %{name}-math = %{EVRD} Requires: %{name}-writer = %{EVRD} Provides: LibreOffice = %{EVRD} Provides: LibreOffice-libs = %{EVRD} -Obsoletes: libreoffice-style-oxygen < %{EVRD} %description LibreOffice is an Open Source, community-developed, multi-platform @@ -353,6 +343,52 @@ Obsoletes: %{name}-dtd-officedocument1.0 < %{EVRD} Conflicts: %{name}-extension-xsltfilter < %{EVRD} Obsoletes: %{name}-extension-xsltfilter < %{EVRD} Conflicts: %{name}-openclipart < 1:5.1.2-2 +Obsoletes: %{name}-style-oxygen < %{EVRD} +Conflicts: %{name}-style-oxygen < %{EVRD} +Obsoletes: %{name}-extension-barcode < %{EVRD} +Conflicts: %{name}-extension-barcode < %{EVRD} +Obsoletes: %{name}-extension-gdocs < %{EVRD} +Conflicts: %{name}-extension-gdocs < %{EVRD} +Obsoletes: %{name}-extension-SmART < %{EVRD} +Conflicts: %{name}-extension-SmART < %{EVRD} +Obsoletes: %{name}-extension-typo < %{EVRD} +Conflicts: %{name}-extension-typo < %{EVRD} +Obsoletes: %{name}-extension-validator < %{EVRD} +Conflicts: %{name}-extension-validator < %{EVRD} +Obsoletes: %{name}-extension-watchwindow < %{EVRD} +Conflicts: %{name}-extension-watchwindow < %{EVRD} +Obsoletes: %{name}-templates-common < %{EVRD} +Conflicts: %{name}-templates-common < %{EVRD} +Obsoletes: %{name}-templates-cs < %{EVRD} +Obsoletes: %{name}-templates-de < %{EVRD} +Obsoletes: %{name}-templates-en_US < %{EVRD} +Obsoletes: %{name}-templates-es < %{EVRD} +Obsoletes: %{name}-templates-fi < %{EVRD} +Obsoletes: %{name}-templates-fr < %{EVRD} +Obsoletes: %{name}-templates-hu < %{EVRD} +Obsoletes: %{name}-templates-it < %{EVRD} +Obsoletes: %{name}-templates-ja < %{EVRD} +Obsoletes: %{name}-templates-nl < %{EVRD} +Obsoletes: %{name}-templates-pl < %{EVRD} +Obsoletes: %{name}-templates-pt_BR < %{EVRD} +Obsoletes: %{name}-templates-sv < %{EVRD} +Obsoletes: %{name}-templates-tr < %{EVRD} +Obsoletes: %{name}-templates-zh_CN < %{EVRD} +Conflicts: %{name}-templates-cs < %{EVRD} +Conflicts: %{name}-templates-de < %{EVRD} +Conflicts: %{name}-templates-en_US < %{EVRD} +Conflicts: %{name}-templates-es < %{EVRD} +Conflicts: %{name}-templates-fi < %{EVRD} +Conflicts: %{name}-templates-fr < %{EVRD} +Conflicts: %{name}-templates-hu < %{EVRD} +Conflicts: %{name}-templates-it < %{EVRD} +Conflicts: %{name}-templates-ja < %{EVRD} +Conflicts: %{name}-templates-nl < %{EVRD} +Conflicts: %{name}-templates-pl < %{EVRD} +Conflicts: %{name}-templates-pt_BR < %{EVRD} +Conflicts: %{name}-templates-sv < %{EVRD} +Conflicts: %{name}-templates-tr < %{EVRD} +Conflicts: %{name}-templates-zh_CN < %{EVRD} %description common This package contains the application-independent files of LibreOffice. @@ -479,6 +515,7 @@ This package contains the presentation component for LibreOffice. Summary: KDE4 Integration for LibreOffice (Widgets, Dialogs, Addressbook) Group: Office Requires: %{name}-common = %{EVRD} +Suggests: %{name}-style-breeze = %{EVRD} %description kde4 This package contains the KDE4 plugin for drawing LibreOffice widgets with @@ -2943,20 +2980,13 @@ touch autogen.lastrun --enable-gstreamer-1.0 \ --disable-gstreamer-0.10 \ --enable-release-build \ - --disable-kde \ --enable-kde4 \ - --enable-lockdown \ - --enable-opengl \ --disable-firebird-sdbc \ --disable-introspection \ --enable-eot \ --enable-odk \ --enable-split-app-modules \ --enable-split-opt-features \ - --disable-telepathy \ - --enable-extra-gallery \ - --enable-extra-template \ - --with-sun-templates \ --without-fonts \ --without-junit \ %if %{javaless} @@ -2972,21 +3002,12 @@ touch autogen.lastrun --with-external-thes-dir=%{_datadir}/dict/ooo \ --with-system-libs \ --with-system-ucpp \ - --without-system-npapi-headers \ - --enable-ext-watch-window \ - --enable-ext-diagram \ - --enable-ext-validator \ - --enable-ext-barcode \ --enable-ext-ct2n \ --enable-ext-numbertext \ - --enable-ext-hunart \ - --enable-ext-typo \ - --enable-ext-google-docs \ --enable-ext-nlpsolver \ --enable-ext-languagetool \ --enable-ext-wiki-publisher \ --enable-verbose \ - --enable-hardlink-deliver \ --enable-ext-mariadb-connector \ %if %{with ccache} && !%{with icecream} --with-gcc-speedup=ccache \ @@ -3034,19 +3055,12 @@ ln -sf %{SOURCE35} external/tarballs/ ln -sf %{SOURCE36} external/tarballs/ ln -sf %{SOURCE37} external/tarballs/ -cp %{SOURCE48} external/tarballs/ cp %{SOURCE49} external/tarballs/ -ln -sf %{SOURCE50} external/tarballs/ ln -sf %{SOURCE51} external/tarballs/ -ln -sf %{SOURCE52} external/tarballs/ ln -sf %{SOURCE53} external/tarballs/ ln -sf %{SOURCE54} external/tarballs/ -ln -sf %{SOURCE55} external/tarballs/ ln -sf %{SOURCE56} external/tarballs/ -ln -sf %{SOURCE57} external/tarballs/ -ln -sf %{SOURCE58} external/tarballs/ -ln -sf %{SOURCE59} external/tarballs/ ln -sf %{SOURCE60} external/tarballs/ ln -sf %{SOURCE61} external/tarballs/ ln -sf %{SOURCE62} external/tarballs/ @@ -3058,7 +3072,6 @@ ln -sf %{SOURCE67} external/tarballs/ ln -sf %{SOURCE68} external/tarballs/ ln -sf %{SOURCE69} external/tarballs/ ln -sf %{SOURCE70} external/tarballs/ -ln -sf %{SOURCE71} external/tarballs/ touch external/tarballs/.downloaded