commit 9ad0b643e3da2d50cc8dc4a2069a866cc8766637
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Sat Mar 17 13:58:10 2018 +0100
Updated URL
Added gcc-c++ dependency
Removed obsolete scriptlets
Added license tag
Added AppData file
Spec file clean up
pushover.appdata.xml | 25 +++++++++++++++++++++++++
pushover.spec | 48 +++++++++++++++++++++++++-----------------------
2 files changed, 50 insertions(+), 23 deletions(-)
---
diff --git a/pushover.appdata.xml b/pushover.appdata.xml
new file mode 100644
index 0000000..11907ea
--- /dev/null
+++ b/pushover.appdata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2018 Andrea Musuruane <musuruan(a)gmail.com> -->
+<component type="desktop">
+ <id>pushover.desktop</id>
+ <metadata_license>CC-BY-SA-3.0</metadata_license>
+ <project_license>GPL-3.0 and proprietary</project_license>
+ <name>Pushover</name>
+ <summary>Fun puzzle game with dominos</summary>
+ <description>
+ <p>
+ Rearrange the dominoes on the different platforms so that you can
+ start a chain reaction that makes all dominoes topple over.
+ </p>
+ </description>
+ <screenshots>
+ <screenshot type="default">
+
<image>https://pushover.github.io/website/images/Screenshot2.jpg</image>
+ </screenshot>
+ <screenshot>
+
<image>https://pushover.github.io/website/images/Screenshot3.png</image>
+ </screenshot>
+ </screenshots>
+ <url type="homepage">https://pushover.github.io/</url>
+</component>
+
diff --git a/pushover.spec b/pushover.spec
index 2395f08..b9edccb 100644
--- a/pushover.spec
+++ b/pushover.spec
@@ -1,14 +1,16 @@
Name: pushover
Version: 0.0.5
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Fun puzzle game with dominos
# Some proprietary graphics from the original game are still used
License: GPLv3 and proprietary
-URL:
http://pushover.sourceforge.net/
+URL:
https://pushover.github.io/
Source0:
http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source1: %{name}.desktop
+Source2: %{name}.appdata.xml
+BuildRequires: gcc-c++
BuildRequires: SDL_mixer-devel
BuildRequires: SDL_ttf-devel
BuildRequires: libpng-devel
@@ -17,6 +19,7 @@ BuildRequires: lua-devel
BuildRequires: gettext
BuildRequires: ImageMagick
BuildRequires: desktop-file-utils
+BuildRequires: libappstream-glib
Requires: hicolor-icon-theme
Requires: gnu-free-sans-fonts
@@ -37,14 +40,11 @@ mv ChangeLog.utf8 ChangeLog
%build
%configure
-make %{?_smp_mflags}
+%make_build
%install
-make install DESTDIR=$RPM_BUILD_ROOT
-
-# Remove installed docs
-rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}/
+%make_install
# Symlink system font
rm $RPM_BUILD_ROOT%{_datadir}/%{name}/data/FreeSans.ttf
@@ -54,7 +54,7 @@ ln -s %{_datadir}/fonts/gnu-free/FreeSans.ttf \
# Install icons (16, 32, 48, 64px)
for i in 0 1 2 3; do
px=$(expr ${i} \* 16 + 16)
- mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${px}x${px}/apps
+ install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${px}x${px}/apps
convert %{name}.ico[${i}] \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${px}x${px}/apps/%{name}.png
done
@@ -64,22 +64,13 @@ desktop-file-install \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE1}
-%find_lang %{name}
-
-
-%post
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+# Install AppData file
+install -d $RPM_BUILD_ROOT%{_datadir}/metainfo
+install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/metainfo
+appstream-util validate-relax --nonet $RPM_BUILD_ROOT/%{_datadir}/metainfo/*.appdata.xml
-%postun
-if [ $1 -eq 0 ] ; then
- touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-
-%posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+%find_lang %{name}
%files -f %{name}.lang
@@ -87,10 +78,21 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null ||
:
%{_datadir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png
-%doc AUTHORS ChangeLog COPYING NEWS README
+%{_datadir}/metainfo/%{name}.appdata.xml
+%doc %{_pkgdocdir}
+%exclude %{_pkgdocdir}/COPYING
+%license COPYING
%changelog
+* Sat Mar 17 2018 Andrea Musuruane <musuruan(a)gmail.com> - 0.0.5-10
+- Updated URL
+- Added gcc-c++ dependency
+- Removed obsolete scriptlets
+- Added license tag
+- Added AppData file
+- Spec file clean up
+
* Fri Mar 02 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> -
0.0.5-9
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild