From bf7805c84ff4ead25a2f940a8120232ffd89d9d0 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Thu, 1 Nov 2012 06:24:17 +0100 Subject: [PATCH] Resolves: rhbz#871929 add keywords to desktop files --- ...57-adding-Keywords-to-.desktop-files.patch | 99 +++++++++++++++++++ libreoffice.spec | 7 +- 2 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 0001-fdo-47157-adding-Keywords-to-.desktop-files.patch diff --git a/0001-fdo-47157-adding-Keywords-to-.desktop-files.patch b/0001-fdo-47157-adding-Keywords-to-.desktop-files.patch new file mode 100644 index 0000000..9c0fc27 --- /dev/null +++ b/0001-fdo-47157-adding-Keywords-to-.desktop-files.patch @@ -0,0 +1,99 @@ +From 9d844ce3f8e411bfb4237372b1a6d4aec21a0a65 Mon Sep 17 00:00:00 2001 +From: Marco Biscaro +Date: Sun, 26 Aug 2012 21:32:41 -0300 +Subject: [PATCH] fdo#47157 adding Keywords to .desktop files +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Adding Keywords to .desktop files, following the suggestions in +https://bugs.freedesktop.org/show_bug.cgi?id=47157#c0 + +Change-Id: Ic2a1428aaa12bc31b0af8488d166f78d5a970a1d +Reviewed-on: https://gerrit.libreoffice.org/490 +Reviewed-by: Björn Michaelsen +Tested-by: Björn Michaelsen +--- + sysui/desktop/menus/base.desktop | 1 + + sysui/desktop/menus/calc.desktop | 1 + + sysui/desktop/menus/draw.desktop | 1 + + sysui/desktop/menus/impress.desktop | 1 + + sysui/desktop/menus/math.desktop | 1 + + sysui/desktop/menus/writer.desktop | 1 + + 6 files changed, 6 insertions(+) + +diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop +index 72cf467..578e5c7 100755 +--- a/sysui/desktop/menus/base.desktop ++++ b/sysui/desktop/menus/base.desktop +@@ -9,6 +9,7 @@ MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.bas + Name=%PRODUCTNAME Base + GenericName=Database Development + Comment=Manage databases, create queries and reports to track and manage your information by using Base. ++Keywords=Data;SQL; + InitialPreference=5 + X-Ayatana-Desktop-Shortcuts=X-New + [X-New Shortcut Group] +diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop +index e9f3250..638b9e2 100755 +--- a/sysui/desktop/menus/calc.desktop ++++ b/sysui/desktop/menus/calc.desktop +@@ -9,6 +9,7 @@ MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.op + Name=%PRODUCTNAME Calc + GenericName=Spreadsheet + Comment=Perform calculations, analyze information and manage lists in spreadsheets by using Calc. ++Keywords=Accounting;Stats;Chart;ods;xls;xlsx; + InitialPreference=5 + X-Ayatana-Desktop-Shortcuts=X-New + [X-New Shortcut Group] +diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop +index 9511fd5..6d92845 100755 +--- a/sysui/desktop/menus/draw.desktop ++++ b/sysui/desktop/menus/draw.desktop +@@ -9,6 +9,7 @@ MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opend + Name=%PRODUCTNAME Draw + GenericName=Drawing Program + Comment=Create and edit drawings, flow charts, and logos by using Draw. ++Keywords=Vector;Schema;Diagram;odg; + InitialPreference=5 + X-Ayatana-Desktop-Shortcuts=X-New + [X-New Shortcut Group] +diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop +index 2fb8650..d8ca703 100755 +--- a/sysui/desktop/menus/impress.desktop ++++ b/sysui/desktop/menus/impress.desktop +@@ -9,6 +9,7 @@ MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.o + Name=%PRODUCTNAME Impress + GenericName=Presentation + Comment=Create and edit presentations for slideshows, meeting and Web pages by using Impress. ++Keywords=Slideshow;odp;ppt;pptx; + InitialPreference=5 + X-Ayatana-Desktop-Shortcuts=X-New + [X-New Shortcut Group] +diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop +index 867711d..4381a49 100755 +--- a/sysui/desktop/menus/math.desktop ++++ b/sysui/desktop/menus/math.desktop +@@ -10,6 +10,7 @@ MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math + Name=%PRODUCTNAME Math + GenericName=Formula Editor + Comment=Create and edit scientific formulas and equations by using Math. ++Keywords=Equation; + InitialPreference=5 + X-Ayatana-Desktop-Shortcuts=X-New + [X-New Shortcut Group] +diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop +index 888b382..f76ac4e 100755 +--- a/sysui/desktop/menus/writer.desktop ++++ b/sysui/desktop/menus/writer.desktop +@@ -9,6 +9,7 @@ MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocum + Name=%PRODUCTNAME Writer + GenericName=Word Processor + Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer. ++Keywords=Text;Letter;CV;odt;doc;docx; + InitialPreference=5 + X-Ayatana-Desktop-Shortcuts=X-New + [X-New Shortcut Group] +-- +1.7.11.7 + diff --git a/libreoffice.spec b/libreoffice.spec index 3495d8a..a7b5438 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -40,7 +40,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.2 -Release: 3%{?libo_prerelease}%{?dist} +Release: 4%{?libo_prerelease}%{?dist} 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 and MPLv2.0 Group: Applications/Productivity URL: http://www.documentfoundation.org/develop @@ -188,6 +188,7 @@ Patch23: 0002-rework-selection-of-transformer-for-an-XSLT-filter.patch Patch24: 0003-drop-saxon-based-XSLT-transformer.patch Patch25: 0004-remove-all-traces-of-saxon.patch Patch26: 0001-resolved-rhbz865058-retard-overflow-of-internal-tabl.patch +Patch27: 0001-fdo-47157-adding-Keywords-to-.desktop-files.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define instdir %{_libdir} @@ -810,6 +811,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch24 -p1 -b .drop-saxon-based-XSLT-transformer.patch %patch25 -p1 -b .remove-all-traces-of-saxon.patch %patch26 -p1 -b .rhbz865058-retard-overflow-of-internal-tabl.patch +%patch27 -p1 -b .fdo-47157-adding-Keywords-to-.desktop-files.patch # TODO: check this # these are horribly incomplete--empty translations and copied english @@ -2038,6 +2040,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Thu Nov 01 2012 David Tardon - 1:3.6.3.2-4 +- Resolves: rhbz#871929 add keywords to desktop files + * Wed Oct 31 2012 Eike Rathke - 1:3.6.3.2-3 - Resolves: rhbz#865058 increase number of user-defined format codes