rdieter pushed to picmi (master). "BR: libkdegames4, separate appdata"

[notifications at fedoraproject.org]

>From 5d8cf63a4a0a06d2198c60d7aeec708df2ea6cc1 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sun, 19 Apr 2015 08:00:43 -0500
Subject: BR: libkdegames4, separate appdata


diff --git a/picmi.appdata.xml b/picmi.appdata.xml
new file mode 100644
index 0000000..649c573
--- /dev/null
+++ b/picmi.appdata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2014 Eduardo Mayorga <e at mayorgalinux.com> -->
+<!--
+     EmailAddress: jakob.gruber at gmail.com
+SentUpstream: 2014-09-25
+-->
+<component type="desktop">
+  <id>picmi.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <summary>Puzzle game based on number logic</summary>
+  <description>
+    <p>
+      The goal is to reveal the hidden pattern in the board by coloring or
+      leaving blank the cells in a grid according to numbers given at the side
+      of the grid.
+      This is a single player game.
+    </p>
+  </description>
+  <url type="homepage">https://projects.kde.org/projects/kde/kdegames/picmi</url>
+  <screenshots>
+    <screenshot type="default">
+      <image>http://games.kde.org/games/picmi/screenshots/originals/picmi01.png</image>
+    </screenshot>
+  </screenshots>
+</component>
diff --git a/picmi.spec b/picmi.spec
index 159b1dc..f170a98 100644
--- a/picmi.spec
+++ b/picmi.spec
@@ -14,10 +14,17 @@ URL:     https://projects.kde.org/projects/kde/kdegames/%{name}
 %endif
 Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz
 
-BuildRequires: desktop-file-utils
-BuildRequires: libkdegames-devel >= %{version}
+# Register as an application to be visible in the software center
+#
+# NOTE: It would be *awesome* if this file was maintained by the upstream
+# project, translated and installed into the right place during `make install`.
+#
+# See http://www.freedesktop.org/software/appstream/docs/ for more details.
+Source1: picmi.appdata.xml
 
-Requires: libkdegames%{?_isa} >= %{version}
+BuildRequires: desktop-file-utils
+BuildRequires: kdelibs4-devel >= 4.14
+BuildRequires: libkdegames4-devel >= %{version}
 
 %description
 Picmi is a single player puzzle game.  The object of the game is to
@@ -29,7 +36,7 @@ color cells according to numbers given at the side of the board.
 
 
 %build
-mkdir -p %{_target_platform}
+mkdir %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
@@ -40,41 +47,7 @@ make %{?_smp_mflags} -C %{_target_platform}
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-# Register as an application to be visible in the software center
-#
-# NOTE: It would be *awesome* if this file was maintained by the upstream
-# project, translated and installed into the right place during `make install`.
-#
-# See http://www.freedesktop.org/software/appstream/docs/ for more details.
-#
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
-cat > $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Eduardo Mayorga <e at mayorgalinux.com> -->
-<!--
-EmailAddress: jakob.gruber at gmail.com
-SentUpstream: 2014-09-25
--->
-<component type="desktop">
-  <id>picmi.desktop</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <summary>Puzzle game based on number logic</summary>
-  <description>
-    <p>
-      The goal is to reveal the hidden pattern in the board by coloring or
-      leaving blank the cells in a grid according to numbers given at the side
-      of the grid.
-      This is a single player game.
-    </p>
-  </description>
-  <url type="homepage">https://projects.kde.org/projects/kde/kdegames/picmi</url>
-  <screenshots>
-    <screenshot type="default">
-      <image>http://games.kde.org/games/picmi/screenshots/originals/picmi01.png</image>
-    </screenshot>
-  </screenshots>
-</component>
-EOF
+install -m644 -p -D %{SOURCE1} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml <<EOF
 
 %find_lang %{name} --with-kde
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/picmi.git/commit/?h=master&id=5d8cf63a4a0a06d2198c60d7aeec708df2ea6cc1