From 6e1a83b963758b19161e06de0fe8d82d12aef462 Mon Sep 17 00:00:00 2001 From: David King Date: Jul 28 2015 09:00:31 +0000 Subject: Validate desktop files in check phase --- diff --git a/orca-3.17.4-desktop-file-translations.patch b/orca-3.17.4-desktop-file-translations.patch new file mode 100644 index 0000000..7ec20b0 --- /dev/null +++ b/orca-3.17.4-desktop-file-translations.patch @@ -0,0 +1,54 @@ +From 2136d6925f57a5fa900220bfdddbc4b1387b8bf1 Mon Sep 17 00:00:00 2001 +From: David King +Date: Tue, 28 Jul 2015 09:56:05 +0100 +Subject: [PATCH] Fix desktop file translations + +List keys must end with semicolons. Found with desktop-file-validate. +--- + po/bs.po | 2 +- + po/oc.po | 2 +- + po/sl.po | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/po/bs.po b/po/bs.po +index 65e48b8..11911bc 100644 +--- a/po/bs.po ++++ b/po/bs.po +@@ -28,7 +28,7 @@ msgstr "Obezbjeđuje pristup grafičkom okruženju preko sintetizovanog govora i + + #: ../orca.desktop.in.h:4 + msgid "screen reader;speech;braille;" +-msgstr "čitač ekrana;govor;brailleovo pismo" ++msgstr "čitač ekrana;govor;brailleovo pismo;" + + #. Translators: short braille for the rolename of an invalid GUI object. + #. We strive to keep it under three characters to preserve real estate. +diff --git a/po/oc.po b/po/oc.po +index 5b11418..281cf5f 100644 +--- a/po/oc.po ++++ b/po/oc.po +@@ -40,7 +40,7 @@ msgstr "" + msgid "screen reader;speech;braille;" + msgstr "" + "lector d'ecran;oral;braille;votz;sintèsi vocala;sintesi vocala;lector " +-"ecran;tts" ++"ecran;tts;" + + #. Translators: short braille for the rolename of an invalid GUI object. + #. We strive to keep it under three characters to preserve real estate. +diff --git a/po/sl.po b/po/sl.po +index cd43a2c..06412e4 100644 +--- a/po/sl.po ++++ b/po/sl.po +@@ -41,7 +41,7 @@ msgstr "" + + #: ../orca.desktop.in.h:4 + msgid "screen reader;speech;braille;" +-msgstr "govor;zaslonski bralnik;Braillova pisava;brajica;povečevalnik" ++msgstr "govor;zaslonski bralnik;Braillova pisava;brajica;povečevalnik;" + + #. Translators: short braille for the rolename of an invalid GUI object. + #. We strive to keep it under three characters to preserve real estate. +-- +2.4.6 + diff --git a/orca.spec b/orca.spec index 7988e0d..0e7e14a 100644 --- a/orca.spec +++ b/orca.spec @@ -8,6 +8,8 @@ License: LGPLv2+ URL: https://wiki.gnome.org/Projects/Orca #VCS: git:git://git.gnome.org/orca Source0: https://download.gnome.org/sources/%{name}/3.17/%{name}-%{version}.tar.xz +# Taken from upstream git. +Patch0: orca-3.17.4-desktop-file-translations.patch BuildArch: noarch @@ -26,6 +28,7 @@ BuildRequires: python3-brlapi BuildRequires: python3-devel BuildRequires: python3-pyatspi BuildRequires: python3-speechd +BuildRequires: /usr/bin/desktop-file-validate Requires: liblouis-python3 Requires: libwnck3 @@ -41,6 +44,8 @@ provider interface (AT-SPI), e.g. the GNOME desktop. %prep %setup -q +%patch0 -p1 + %build %configure @@ -48,11 +53,18 @@ make %{?_smp_mflags} %install -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=%{buildroot} %find_lang %{name} --with-gnome -find $RPM_BUILD_ROOT -name '*.la' | xargs rm -f +find %{buildroot} -name '*.la' -delete + + +%check +desktop-file-validate %{buildroot}%{_datadir}/applications/orca.desktop +# Does not validate due to Cinnamon value for OnlyShowIn. +#desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/orca-autostart.desktop + %post touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -86,6 +98,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - Update URL - Update man page glob in files section - Use pkgconfig for BuildRequires +- Validate desktop files in check phase * Tue Jun 30 2015 Kalev Lember - 3.17.3-1 - Update to 3.17.3