From f63b85e4fbcac3592fac91d39aed10433346c06b Mon Sep 17 00:00:00 2001
From: Andrea Musuruane <musuruan@gmail.com>
Date: Feb 08 2019 14:20:09 +0000
Subject: Fixed FTBFS

Used %set_build_flags macro
Added appdata file

---

diff --git a/flobopuyo.appdata.xml b/flobopuyo.appdata.xml
new file mode 100644
index 0000000..5a26048
--- /dev/null
+++ b/flobopuyo.appdata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2019 Andrea Musuruane <musuruan@gmail.com> -->
+<application>
+  <id type="desktop">flobopuyo.desktop</id>
+  <metadata_license>CC-BY-SA-3.0</metadata_license>
+  <project_license>GPLv2+</project_license>
+  <name>flobopuyo</name>
+  <summary>2-player falling bubbles game</summary>
+  <description>
+    <p>
+       The goal of flobopuyo is to make groups of four or more Puyos 
+       (colored bubbles) to make them explode and send bad ghost Puyos to 
+       your opponent. You win the game if your opponent reaches the top 
+       of the board. You can play against computer or another human.
+    </p>
+  </description>
+  <url type="homepage">http://www.fovea.cc/flobopuyo-en/</url>
+  <screenshots>
+    <screenshot type="default">
+      <image>https://screenshots.debian.net/screenshots/000/001/990/large.png</image>
+    </screenshot>
+  </screenshots>
+</application>
+
diff --git a/flobopuyo.spec b/flobopuyo.spec
index c2102ec..de8e483 100644
--- a/flobopuyo.spec
+++ b/flobopuyo.spec
@@ -1,12 +1,13 @@
 Name:           flobopuyo
 Version:        0.20
-Release:        27%{?dist}
+Release:        28%{?dist}
 Summary:        2-player falling bubbles game
 
 License:        GPLv2+
 URL:            http://www.fovea.cc/flobopuyo-en
 Source0:        http://www.fovea.cc/files/flobopuyo/%{name}-%{version}.tgz
 Source1:        %{name}.desktop
+Source2:        %{name}.appdata.xml
 # Fix building on 64bit
 # Patch by Michael Thomas aka Wart <wart at kobold dot org>
 # https://lists.fedoraproject.org/archives/list/games@lists.fedoraproject.org/thread/ECMVJBXDAITOV35723OMGQSF3CLXKLZK/
@@ -31,6 +32,7 @@ BuildRequires:  bison
 BuildRequires:  SDL_mixer-devel 
 BuildRequires:  SDL_image-devel 
 BuildRequires:  libicns-utils
+BuildRequires:  libappstream-glib
 BuildRequires:  desktop-file-utils
 Requires:       hicolor-icon-theme
 
@@ -58,9 +60,9 @@ rm data/sfx/._bi
 
 
 %build
-export CFLAGS="%{optflags}"
-export LDFLAGS="%{__global_ldflags}"
-%make_build PREFIX=%{_prefix}
+%set_build_flags macro
+# It does not support parallel building
+make PREFIX=%{_prefix}
 
 
 %install
@@ -68,7 +70,7 @@ export LDFLAGS="%{__global_ldflags}"
 
 # Install man page
 install -d -m 755 %{buildroot}%{_mandir}/man6
-install -m 644 man/%{name}.6 %{buildroot}%{_mandir}/man6
+install -p -m 644 man/%{name}.6 %{buildroot}%{_mandir}/man6
 
 # Install desktop file
 desktop-file-install \
@@ -83,6 +85,14 @@ install -d -m 755 %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/
 install -p -m 644 icon_128x128x32.png \
   %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
 
+# Install appdata
+install -d -m 755 %{buildroot}%{_datadir}/metainfo
+install -p -m 644 %{SOURCE2} \
+  %{buildroot}%{_datadir}/metainfo
+appstream-util validate-relax --nonet \
+  %{buildroot}%{_datadir}/metainfo/%{name}.appdata.xml
+
+
 %files
 %doc TODO Changelog
 %license COPYING
@@ -90,10 +100,16 @@ install -p -m 644 icon_128x128x32.png \
 %{_datadir}/%{name}
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/128x128/apps/%{name}.png
+%{_datadir}/metainfo/%{name}.appdata.xml
 %{_mandir}/man6/%{name}.6*
 
 
 %changelog
+* Fri Feb 08 2019 Andrea Musuruane <musuruan@gmail.com> - 0.20-28
+- Fixed FTBFS
+- Used %%set_build_flags macro
+- Added appdata file
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.20-27
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild