diff --git a/.abf.yml b/.abf.yml index 0074d2e..fde28a6 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,8 +1,3 @@ -removed_sources: - libreoffice-4.1.2.3.tar.xz: ffaf13404599a9b66ce964fab1f7c98284e8c972 - libreoffice-dictionaries-4.1.2.3.tar.xz: e48b6bb3d3208748d4d8399a77cd9f1033030dd5 - libreoffice-help-4.1.2.3.tar.xz: 60f394d98cab6dd85795175d840d5cdb3cf769b9 - libreoffice-translations-4.1.2.3.tar.xz: 671082673cbab07ec4a6c4fd3f1346757858deb4 sources: 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz: 452eba922e4f41603539c9dc39947d2271e47093 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip: 7168b0f40aa5c72267899601c116d2348d2f56ec diff --git a/libreoffice-4.1.3.2-desktop-categories.patch b/libreoffice-4.1.3.2-desktop-categories.patch new file mode 100644 index 0000000..929e2fe --- /dev/null +++ b/libreoffice-4.1.3.2-desktop-categories.patch @@ -0,0 +1,84 @@ +diff -urN libreoffice-4.1.3.2/sysui/desktop/menus/base.desktop libreoffice-4.1.3.2-patched/sysui/desktop/menus/base.desktop +--- libreoffice-4.1.3.2/sysui/desktop/menus/base.desktop 2013-10-23 04:49:23.000000000 +1100 ++++ libreoffice-4.1.3.2-patched/sysui/desktop/menus/base.desktop 2013-11-15 13:25:32.389365730 +1100 +@@ -20,7 +20,7 @@ + Terminal=false + Icon=base + Type=Application +-Categories=Office;Database;X-Red-Hat-Base;X-MandrivaLinux-MoreApplications-Databases; ++Categories=Office;Database; + Exec=${UNIXBASISROOTNAME} --base %%FILE%% + MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base; + Name=%PRODUCTNAME Base +diff -urN libreoffice-4.1.3.2/sysui/desktop/menus/calc.desktop libreoffice-4.1.3.2-patched/sysui/desktop/menus/calc.desktop +--- libreoffice-4.1.3.2/sysui/desktop/menus/calc.desktop 2013-10-23 04:49:23.000000000 +1100 ++++ libreoffice-4.1.3.2-patched/sysui/desktop/menus/calc.desktop 2013-11-15 13:25:41.475513381 +1100 +@@ -20,7 +20,7 @@ + Terminal=false + Icon=calc + Type=Application +-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; + Name=%PRODUCTNAME Calc +diff -urN libreoffice-4.1.3.2/sysui/desktop/menus/draw.desktop libreoffice-4.1.3.2-patched/sysui/desktop/menus/draw.desktop +--- libreoffice-4.1.3.2/sysui/desktop/menus/draw.desktop 2013-10-23 04:49:23.000000000 +1100 ++++ libreoffice-4.1.3.2-patched/sysui/desktop/menus/draw.desktop 2013-11-15 13:25:52.312689503 +1100 +@@ -20,7 +20,7 @@ + Terminal=false + Icon=draw + Type=Application +-Categories=Office;FlowChart;Graphics;2DGraphics;VectorGraphics;X-Red-Hat-Base;X-MandrivaLinux-Office-Drawing; ++Categories=Office;FlowChart; + Exec=${UNIXBASISROOTNAME} --draw %%FILE%% + MimeType=application/vnd.oasis.opendocument.graphics;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; + Name=%PRODUCTNAME Draw +diff -urN libreoffice-4.1.3.2/sysui/desktop/menus/impress.desktop libreoffice-4.1.3.2-patched/sysui/desktop/menus/impress.desktop +--- libreoffice-4.1.3.2/sysui/desktop/menus/impress.desktop 2013-10-23 04:49:23.000000000 +1100 ++++ libreoffice-4.1.3.2-patched/sysui/desktop/menus/impress.desktop 2013-11-15 13:25:59.678809224 +1100 +@@ -20,7 +20,7 @@ + Terminal=false + Icon=impress + Type=Application +-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; + Name=%PRODUCTNAME Impress +diff -urN libreoffice-4.1.3.2/sysui/desktop/menus/math.desktop libreoffice-4.1.3.2-patched/sysui/desktop/menus/math.desktop +--- libreoffice-4.1.3.2/sysui/desktop/menus/math.desktop 2013-10-23 04:49:23.000000000 +1100 ++++ libreoffice-4.1.3.2-patched/sysui/desktop/menus/math.desktop 2013-11-15 13:26:10.457984427 +1100 +@@ -21,7 +21,7 @@ + NoDisplay=true + Icon=math + Type=Application +-Categories=Office;Education;Science;Math;X-Red-Hat-Base;X-MandrivaLinux-Office-Other; ++Categories=Office;Education;Science;Math; + Exec=${UNIXBASISROOTNAME} --math %%FILE%% + MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.oasis.opendocument.formula-template;text/mathml; + Name=%PRODUCTNAME Math +diff -urN libreoffice-4.1.3.2/sysui/desktop/menus/startcenter.desktop libreoffice-4.1.3.2-patched/sysui/desktop/menus/startcenter.desktop +--- libreoffice-4.1.3.2/sysui/desktop/menus/startcenter.desktop 2013-10-23 04:49:23.000000000 +1100 ++++ libreoffice-4.1.3.2-patched/sysui/desktop/menus/startcenter.desktop 2013-11-15 13:26:22.524180566 +1100 +@@ -21,7 +21,7 @@ + NoDisplay=true + Icon=startcenter + Type=Application +-Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other; ++Categories=Office; + Exec=${UNIXBASISROOTNAME} %%FILE%% + MimeType=application/vnd.openofficeorg.extension; + Name=%PRODUCTNAME +diff -urN libreoffice-4.1.3.2/sysui/desktop/menus/writer.desktop libreoffice-4.1.3.2-patched/sysui/desktop/menus/writer.desktop +--- libreoffice-4.1.3.2/sysui/desktop/menus/writer.desktop 2013-10-23 04:49:23.000000000 +1100 ++++ libreoffice-4.1.3.2-patched/sysui/desktop/menus/writer.desktop 2013-11-15 13:26:30.181305044 +1100 +@@ -20,7 +20,7 @@ + Terminal=false + Icon=writer + Type=Application +-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.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; + Name=%PRODUCTNAME Writer diff --git a/libreoffice.spec b/libreoffice.spec index 141c726..29f84fd 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -46,7 +46,7 @@ Summary: Office suite Name: libreoffice Epoch: 1 Version: 4.1.3 -Release: 1 +Release: 2 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 @@ -89,6 +89,7 @@ Patch51: libreoffice-4.1.2.2-impress-kde-crash-hack.patch # ROSA vendor patch Patch100: libreoffice-4.1-vendor.patch +Patch101: libreoffice-4.1.3.2-desktop-categories.patch # Other bugfix patches, including upstream Patch202: 0001-Resolves-rhbz-968892-force-render-full-grapheme-with.patch