rdieter pushed to ksudoku (f22). "fix build (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Thu Apr 23 14:54:14 UTC 2015
>From 256da859e63e42134616e14d45d74f1dcc2a7e98 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sat, 18 Apr 2015 16:30:50 -0500
Subject: fix build
BR: libkdegames4
put appdata into separate Sources (easier to upstream)
diff --git a/ksudoku.appdata.xml b/ksudoku.appdata.xml
new file mode 100644
index 0000000..78c1e42
--- /dev/null
+++ b/ksudoku.appdata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2014 William Moreno <williamjmorenor at gmail.com> -->
+<!--
+ EmailAddress: wolfgang at rohdewald.de
+SentUpstream: 2014-09-24
+-->
+<component type="desktop">
+ <id>ksudoku.desktop</id>
+ <metadata_license>CC0-1.0</metadata_license>
+ <summary>Complete a numeric puzzle with the numbers from one to nine</summary>
+ <description>
+ <p>
+ KSudoku is a free version of the popular logic game Sudoku for the KDE desktop.
+ The game is to fill a nine by nine grid with the numbers from one to nine filling
+ the rows, columns and three by three squares without repeating a value on them.
+ </p>
+ </description>
+ <url type="homepage">https://projects.kde.org/projects/kde/kdegames/ksudoku</url>
+ <screenshots>
+ <screenshot type="default">
+ <image>http://games.kde.org/games/ksudoku/screenshots/originals/ksudoku01.jpg</image>
+ </screenshot>
+ </screenshots>
+</component>
diff --git a/ksudoku.spec b/ksudoku.spec
index 38ad2ef..a9bfba6 100644
--- a/ksudoku.spec
+++ b/ksudoku.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: ksudoku.appdata.xml
-Requires: libkdegames%{?_isa} >= %{version}
+BuildRequires: desktop-file-utils
+BuildRequires: kdelibs4-devel >= 4.14
+BuildRequires: libkdegames4-devel
%description
KSudoku is a logic-based symbol placement puzzle. The player has to
@@ -33,7 +40,7 @@ it is your job to fill in the rest.
%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 William Moreno <williamjmorenor at gmail.com> -->
-<!--
-EmailAddress: wolfgang at rohdewald.de
-SentUpstream: 2014-09-24
--->
-<component type="desktop">
- <id>ksudoku.desktop</id>
- <metadata_license>CC0-1.0</metadata_license>
- <summary>Complete a numeric puzzle with the numbers from one to nine</summary>
- <description>
- <p>
- KSudoku is a free version of the popular logic game Sudoku for the KDE desktop.
- The game is to fill a nine by nine grid with the numbers from one to nine filling
- the rows, columns and three by three squares without repeating a value on them.
- </p>
- </description>
- <url type="homepage">https://projects.kde.org/projects/kde/kdegames/ksudoku</url>
- <screenshots>
- <screenshot type="default">
- <image>http://games.kde.org/games/ksudoku/screenshots/originals/ksudoku01.jpg</image>
- </screenshot>
- </screenshots>
-</component>
-EOF
+install -p -D -m644 %{SOURCE1} %{buildroot}%{_kde4_datadir}/appdata/%{name}.appdata.xml
%find_lang %{name} --with-kde
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/ksudoku.git/commit/?h=f22&id=256da859e63e42134616e14d45d74f1dcc2a7e98
More information about the scm-commits
mailing list