From d604d953abc21c6900330dcbcd6134180c54b192 Mon Sep 17 00:00:00 2001 From: Cédric OLIVIER Date: Feb 16 2015 18:02:57 +0000 Subject: Update to 7995 svn revision --- diff --git a/josm.spec b/josm.spec index 7d05515..21fc1cf 100644 --- a/josm.spec +++ b/josm.spec @@ -38,7 +38,9 @@ BuildRequires: svgsalamander BuildRequires: apache-commons-codec BuildRequires: apache-commons-compress BuildRequires: gnu-getopt +%if 0%{?fedora} BuildRequires: libappstream-glib +%endif Requires: java >= 1:1.7.0 Requires: jpackage-utils Requires: hicolor-icon-theme @@ -121,11 +123,15 @@ install -p -m 644 images/logo.png %{buildroot}%{_datadir}/icons/hicolor/128x128/ install -Dp -m 644 linux/tested/usr/share/man/man1/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 +%if 0%{?fedora} install -Dp linux/tested/usr/share/appdata/%{name}.appdata.xml %{buildroot}/%{_datadir}/appdata/%{name}.appdata.xml +%endif desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ linux/tested/usr/share/applications/%{name}.desktop +%if 0%{?fedora} appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.appdata.xml +%endif %clean rm -rf %{buildroot} @@ -150,7 +156,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/128x128/apps/%{name}.png +%if 0%{?fedora} %{_datadir}/appdata/%{name}.appdata.xml +%endif %files javadoc %defattr(-,root,root,-)