diff --git a/.abf.yml b/.abf.yml index 939c7b3..8014280 100644 --- a/.abf.yml +++ b/.abf.yml @@ -18,14 +18,14 @@ sources: a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt: d831314cf4c74f5afb3b37ee718dd58f981b97a8 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip: 2d49e11b0b711970f494294dc3698f05eb294853 af9314c5972d95a5d6da23ffad818f68-OOOP-gallery-pack-2.8.0.0.zip: c71f095bf032e29ab0afc277fd2718e592ba6ba4 - apache-ant-1.10.1-bin.tar.bz2: 1f947bb30516a01d459ef5f6e8dbea9c62919022 + apache-ant-1.10.2-bin.tar.bz2: bc67d9bb5656382ace23f5647799fb77397cbcb5 b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt: 27847d6c320297905303ca7d2a45dbd0c492f705 b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt: a476a199de32a32221132c8e77fad96c88616b08 b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2: aa8faa4f9e6721eed9bc6878862d74d0cb23251c b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt: bdec3915c01cd60e20892376aa5e5a0d3980c389 commons-logging-1.2-src.tar.gz: 0a134d01e9aeb09b33f4c7450fb41abb7bed9db6 - libreoffice-5.4.4.2.tar.xz: 05b8d7c3d8bbf5c347b4631d6854335ba60718fd - libreoffice-dictionaries-5.4.4.2.tar.xz: 5780ebae967ab3dcd8b15895b61346df96b9cc99 - libreoffice-help-5.4.4.2.tar.xz: 21a68f7048df40e22b58f2cbbf36f13e35d22c32 - libreoffice-translations-5.4.4.2.tar.xz: bc83980791314f78353433600b847d5067aa7d49 + libreoffice-5.4.5.1.tar.xz: a8ae35e9e4bc6995272f05054619cb9f24dbc014 + libreoffice-dictionaries-5.4.5.1.tar.xz: 576331ea7441fc7bc64aec0991ad74cc9291ea05 + libreoffice-help-5.4.5.1.tar.xz: 3b914afd95597f6139917ae9cac64dc580866e65 + libreoffice-translations-5.4.5.1.tar.xz: 77a92148fb59e7a152fd1ffcb1b469bc188b29ad pdfium-3064.tar.bz2: 70135df62d10db3471054bd29fb9bf48d8bc5b7c diff --git a/libreoffice-5.3.1.1-desktop-categories.patch b/libreoffice-5.3.1.1-desktop-categories.patch index d29be90..91c2b8c 100644 --- a/libreoffice-5.3.1.1-desktop-categories.patch +++ b/libreoffice-5.3.1.1-desktop-categories.patch @@ -10,9 +10,9 @@ diff -urN libreoffice-5.3.1.1/sysui/desktop/menus/base.desktop libreoffice-5.3.1 Exec=${UNIXBASISROOTNAME} --base %%FILE%% MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base; Name=%PRODUCTNAME Base -diff -urN libreoffice-5.3.1.1/sysui/desktop/menus/calc.desktop libreoffice-5.3.1.1-patched/sysui/desktop/menus/calc.desktop ---- libreoffice-5.3.1.1/sysui/desktop/menus/calc.desktop 2017-02-20 16:24:34.000000000 +0300 -+++ libreoffice-5.3.1.1-patched/sysui/desktop/menus/calc.desktop 2017-03-12 14:45:56.097234689 +0300 +diff -Naur libreoffice-5.4.5.1/sysui/desktop/menus/calc.desktop-orig libreoffice-5.4.5.1/sysui/desktop/menus/calc.desktop +--- libreoffice-5.4.5.1/sysui/desktop/menus/calc.desktop-orig 2018-01-30 20:22:07.000000000 +0300 ++++ libreoffice-5.4.5.1/sysui/desktop/menus/calc.desktop 2018-02-12 12:18:52.915474626 +0300 @@ -20,7 +20,7 @@ Terminal=false Icon=calc @@ -20,7 +20,7 @@ diff -urN libreoffice-5.3.1.1/sysui/desktop/menus/calc.desktop libreoffice-5.3.1 -Categories=Office;Spreadsheet;X-Red-Hat-Base;X-MandrivaLinux-Office-Spreadsheets; +Categories=Office;Spreadsheet; Exec=${UNIXBASISROOTNAME} --calc %%FILE%% - MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;application/x-dbf;text/spreadsheet;application/csv;application/excel;application/tab-separated-values;application/vnd.lotus-1-2-3;application/vnd.oasis.opendocument.chart;application/vnd.oasis.opendocument.chart-template;application/x-dbase;application/x-dos_ms_excel;application/x-excel;application/x-msexcel;application/x-ms-excel;application/x-quattropro;application/x-123;text/comma-separated-values;text/tab-separated-values;text/x-comma-separated-values;text/x-csv;application/vnd.oasis.opendocument.spreadsheet-flat-xml;application/vnd.ms-works;application/clarisworks;application/x-iwork-numbers-sffnumbers;application/x-starcalc; + MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroEnabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroEnabled.12;application/vnd.ms-excel.sheet.binary.macroEnabled.12;text/csv;application/x-dbf;text/spreadsheet;application/csv;application/excel;application/tab-separated-values;application/vnd.lotus-1-2-3;application/vnd.oasis.opendocument.chart;application/vnd.oasis.opendocument.chart-template;application/x-dbase;application/x-dos_ms_excel;application/x-excel;application/x-msexcel;application/x-ms-excel;application/x-quattropro;application/x-123;text/comma-separated-values;text/tab-separated-values;text/x-comma-separated-values;text/x-csv;application/vnd.oasis.opendocument.spreadsheet-flat-xml;application/vnd.ms-works;application/clarisworks;application/x-iwork-numbers-sffnumbers;application/x-starcalc; Name=%PRODUCTNAME Calc diff -urN libreoffice-5.3.1.1/sysui/desktop/menus/draw.desktop libreoffice-5.3.1.1-patched/sysui/desktop/menus/draw.desktop --- libreoffice-5.3.1.1/sysui/desktop/menus/draw.desktop 2017-02-20 16:24:34.000000000 +0300 @@ -34,9 +34,9 @@ diff -urN libreoffice-5.3.1.1/sysui/desktop/menus/draw.desktop libreoffice-5.3.1 Exec=${UNIXBASISROOTNAME} --draw %%FILE%% MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-flat-xml;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.visio;application/x-wpg;application/vnd.corel-draw;application/vnd.ms-publisher;image/x-freehand;application/clarisworks;application/x-pagemaker;application/pdf;application/x-stardraw; Name=%PRODUCTNAME Draw -diff -urN libreoffice-5.3.1.1/sysui/desktop/menus/impress.desktop libreoffice-5.3.1.1-patched/sysui/desktop/menus/impress.desktop ---- libreoffice-5.3.1.1/sysui/desktop/menus/impress.desktop 2017-02-20 16:24:34.000000000 +0300 -+++ libreoffice-5.3.1.1-patched/sysui/desktop/menus/impress.desktop 2017-03-12 14:45:29.919234983 +0300 +diff -Naur libreoffice-5.4.5.1/sysui/desktop/menus/impress.desktop-orig libreoffice-5.4.5.1/sysui/desktop/menus/impress.desktop +--- libreoffice-5.4.5.1/sysui/desktop/menus/impress.desktop-orig 2018-01-30 20:22:07.000000000 +0300 ++++ libreoffice-5.4.5.1/sysui/desktop/menus/impress.desktop 2018-02-12 12:25:14.439535365 +0300 @@ -20,7 +20,7 @@ Terminal=false Icon=impress @@ -44,7 +44,7 @@ diff -urN libreoffice-5.3.1.1/sysui/desktop/menus/impress.desktop libreoffice-5. -Categories=Office;Presentation;X-Red-Hat-Base;X-MandrivaLinux-Office-Presentations; +Categories=Office;Presentation; Exec=${UNIXBASISROOTNAME} --impress %%FILE%% - MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.slide;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;application/vnd.oasis.opendocument.presentation-flat-xml;application/x-iwork-keynote-sffkey; + MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.slide;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;application/vnd.oasis.opendocument.presentation-flat-xml;application/x-iwork-keynote-sffkey; Name=%PRODUCTNAME Impress diff -urN libreoffice-5.3.1.1/sysui/desktop/menus/math.desktop libreoffice-5.3.1.1-patched/sysui/desktop/menus/math.desktop --- libreoffice-5.3.1.1/sysui/desktop/menus/math.desktop 2017-02-20 16:24:34.000000000 +0300 @@ -70,9 +70,9 @@ diff -urN libreoffice-5.3.1.1/sysui/desktop/menus/startcenter.desktop libreoffic Exec=${UNIXBASISROOTNAME} %%FILE%% MimeType=application/vnd.openofficeorg.extension;x-scheme-handler/vnd.libreoffice.cmis; Name=%PRODUCTNAME -diff -urN libreoffice-5.3.1.1/sysui/desktop/menus/writer.desktop libreoffice-5.3.1.1-patched/sysui/desktop/menus/writer.desktop ---- libreoffice-5.3.1.1/sysui/desktop/menus/writer.desktop 2017-02-20 16:24:34.000000000 +0300 -+++ libreoffice-5.3.1.1-patched/sysui/desktop/menus/writer.desktop 2017-03-12 14:46:41.189234182 +0300 +diff -Naur libreoffice-5.4.5.1/sysui/desktop/menus/writer.desktop-orig libreoffice-5.4.5.1/sysui/desktop/menus/writer.desktop +--- libreoffice-5.4.5.1/sysui/desktop/menus/writer.desktop-orig 2018-01-30 20:22:07.000000000 +0300 ++++ libreoffice-5.4.5.1/sysui/desktop/menus/writer.desktop 2018-02-12 12:29:38.212419191 +0300 @@ -20,7 +20,7 @@ Terminal=false Icon=writer @@ -80,5 +80,5 @@ diff -urN libreoffice-5.3.1.1/sysui/desktop/menus/writer.desktop libreoffice-5.3 -Categories=Office;WordProcessor;X-Red-Hat-Base;X-MandrivaLinux-Office-Wordprocessors; +Categories=Office;WordProcessor; Exec=${UNIXBASISROOTNAME} --writer %%FILE%% - MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.oasis.opendocument.text-master-template;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/msword;application/vnd.ms-word;application/x-doc;application/x-hwp;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.lotus-wordpro;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/vnd.ms-works;application/vnd.stardivision.writer-global;application/x-extension-txt;application/x-t602;text/plain;application/vnd.oasis.opendocument.text-flat-xml;application/x-fictionbook+xml;application/macwriteii;application/x-aportisdoc;application/prs.plucker;application/vnd.palm;application/clarisworks;application/x-sony-bbeb;application/x-abiword;application/x-iwork-pages-sffpages;application/x-mswrite;application/x-starwriter; + MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.oasis.opendocument.text-master-template;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/msword;application/vnd.ms-word;application/x-doc;application/x-hwp;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.lotus-wordpro;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroEnabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroEnabled.12;application/vnd.ms-works;application/vnd.stardivision.writer-global;application/x-extension-txt;application/x-t602;text/plain;application/vnd.oasis.opendocument.text-flat-xml;application/x-fictionbook+xml;application/macwriteii;application/x-aportisdoc;application/prs.plucker;application/vnd.palm;application/clarisworks;application/x-sony-bbeb;application/x-abiword;application/x-iwork-pages-sffpages;application/x-mswrite;application/x-starwriter; Name=%PRODUCTNAME Writer diff --git a/libreoffice.spec b/libreoffice.spec index ba4dac2..170111d 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -23,9 +23,9 @@ %define oxyurl http://ooo.itc.hu/oxygenoffice/download/libreoffice/ %define distroname ROSA %define ooname libreoffice -%define buildver %{version}.2 +%define buildver %{version}.1 %define ooodir %{_libdir}/libreoffice -%define antver 1.10.1 +%define antver 1.10.2 %define antpath %{_builddir}/libreoffice-%{version}/apache-ant-%{antver} %define ccachedir ~/.ccache-OOo @@ -41,8 +41,8 @@ Summary: Office suite Name: libreoffice Epoch: 1 -Version: 5.4.4 -Release: 2 +Version: 5.4.5 +Release: 1 License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic Group: Office Url: http://www.libreoffice.org