rdieter pushed to cantor (master). "fix appdata name, validate it, add Comment= key to .desktop"

[notifications at fedoraproject.org]

From 851ab764c73a28680edb0d0f1a7d7c1778909bd3 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Tue, 26 May 2015 12:28:30 -0500
Subject: fix appdata name, validate it, add Comment= key to .desktop


diff --git a/cantor.spec b/cantor.spec
index 2b08075..e7e2e77 100644
--- a/cantor.spec
+++ b/cantor.spec
@@ -34,6 +34,7 @@ BuildRequires: python2-devel
 BuildRequires: python3-devel
 BuildRequires: kf5-kconfig-devel kf5-knewstuff-devel kf5-ktexteditor-devel kf5-kcoreaddons-devel
 BuildRequires: kf5-karchive-devel kf5-kparts-devel kf5-kpty-devel kf5-kdelibs4support-devel
+BuildRequires: libappstream-glib
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
@@ -82,9 +83,16 @@ make %{?_smp_mflags} -C %{_target_platform}
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+grep '^Comment=' %{buildroot}%{_kde4_datadir}/applications/org.kde.%{name}.desktop || \
+desktop-file-install \
+  --dir=%{buildroot}%{_kde4_datadir}/applications \
+  --set-comment="%{summary}" \
+  %{buildroot}%{_kde4_datadir}/applications/org.kde.%{name}.desktop
+
 
 %check
-desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/org.kde.cantor.desktop 
+appstream-util validate-relax --nonet %{buildroot}%{_kde4_datadir}/appdata/org.kde.%{name}.appdata.xml ||:
+desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/org.kde.%{name}.desktop
 
 
 %post
@@ -104,8 +112,8 @@ fi
 %license COPYING COPYING.DOC
 %{_kf5_docdir}/HTML/en/cantor/
 %{_kf5_bindir}/cantor
-%{_datadir}/appdata/cantor.appdata.xml
-%{_datadir}/applications/org.kde.cantor.desktop
+%{_kde4_datadir}/appdata/org.kde.%{name}.appdata.xml
+%{_kde4_datadir}/applications/org.kde.%{name}.desktop
 %{_kf5_sysconfdir}/xdg/cantor.knsrc
 %{_kf5_sysconfdir}/xdg/cantor_kalgebra.knsrc
 %if 0%{?has_luajit}
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/cantor.git/commit/?h=master&id=851ab764c73a28680edb0d0f1a7d7c1778909bd3