rdieter pushed to kubrick (master). "fix build (..more)"

[notifications at fedoraproject.org]

>From d74a317cd055899c54fcc61ef66c0e22c34cc149 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sat, 18 Apr 2015 17:53:58 -0500
Subject: fix build

BR: libkdegames4, use separate appdata file

diff --git a/kubrick.appdata.xml b/kubrick.appdata.xml
new file mode 100644
index 0000000..d8ddafd
--- /dev/null
+++ b/kubrick.appdata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2014 Edgar Muniz Berlinck <edgar.vv at gmail.com> -->
+<!--
+     EmailAddress: wolfgang at rohdewald.de
+SentUpstream: 2014-09-24
+-->
+<component type="desktop">
+  <id>kubrick.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <summary>Rubik's Cube Puzzle Game</summary>
+  <description>
+    <p>
+      Puzzle Game based on Rubik's Cube for KDE.
+    </p>
+  </description>
+  <url type="homepage">https://projects.kde.org/projects/kde/kdegames/kubrick</url>
+  <screenshots>
+    <screenshot type="default">
+      <image>https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/kubrick/a.png</image>
+    </screenshot>
+    <screenshot/>
+    <screenshot/>
+  </screenshots>
+</component>
diff --git a/kubrick.spec b/kubrick.spec
index 4f9b59f..5e5d08b 100644
--- a/kubrick.spec
+++ b/kubrick.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: kubrick.appdata.xml
 
-Requires: libkdegames%{?_isa} >= %{version}
+BuildRequires: desktop-file-utils
+BuildRequires: kdelibs4-devel >= 4.14
+BuildRequires: libkdegames4-devel
 
 %description
 Kubrick is a puzzle cube solving game. The cube sizes range from
@@ -33,7 +40,7 @@ moves. It is also possible to make up your own puzzles.
 
 
 %build
-mkdir -p %{_target_platform}
+mkdir %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
@@ -44,40 +51,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 Edgar Muniz Berlinck <edgar.vv at gmail.com> -->
-<!--
-EmailAddress: wolfgang at rohdewald.de
-SentUpstream: 2014-09-24
--->
-<component type="desktop">
-  <id>kubrick.desktop</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <summary>Rubik's Cube Puzzle Game</summary>
-  <description>
-    <p>
-      Puzzle Game based on Rubik's Cube for KDE.
-    </p>
-  </description>
-  <url type="homepage">https://projects.kde.org/projects/kde/kdegames/kubrick</url>
-  <screenshots>
-    <screenshot type="default">
-      <image>https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/kubrick/a.png</image>
-    </screenshot>
-    <screenshot/>
-    <screenshot/>
-  </screenshots>
-</component>
-EOF
+install -p -m644 -D %{SOURCE1} %{buildroot}%{_kde4_datadir}/appdata/%{name}.appdata.xml
 
 %find_lang %{name} --with-kde
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kubrick.git/commit/?h=master&id=d74a317cd055899c54fcc61ef66c0e22c34cc149