[hex-a-hop/f21] New upstream version

[Mario Blättermann]

commit 03255661464c7611985f3b1f2b95cd854bf54f4d
Author: Mario Blättermann <mario.blaettermann at gmail.com>
Date:   Fri Jan 2 15:26:33 2015 +0100

    New upstream version

 .gitignore        |    1 +
 hex-a-hop.desktop |    9 ---------
 hex-a-hop.spec    |   48 +++++++++++++++++++++++++++++++-----------------
 sources           |    3 +--
 4 files changed, 33 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ad753c5..ec7d8cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /hex-a-hop-1.1.0.tar.gz
 /hex-a-hop-man.tar.gz
+/hex-a-hop-1.2.0-git20140926.tar.xz
diff --git a/hex-a-hop.spec b/hex-a-hop.spec
index 255be4d..c3f32f2 100644
--- a/hex-a-hop.spec
+++ b/hex-a-hop.spec
@@ -1,20 +1,22 @@
+%global  snapshot 20140926
+
 Name:           hex-a-hop
-Version:        1.1.0
-Release:        6%{?dist}
+Version:        1.2.0
+Release:        git%{snapshot}.1%{?dist}
 Summary:        Puzzle game based on hexagonal tiles
 
 License:        GPLv2+
 URL:            https://sourceforge.net/projects/hexahop
-Source0:        http://downloads.sourceforge.net/hexahop/%{name}-%{version}.tar.gz
-Source1:        %{name}.desktop
-# Man pages are available from the Debian package
-Source2:        %{name}-man.tar.gz
+Source0:        %{name}-%{version}-git%{snapshot}.tar.xz
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  ImageMagick
+BuildRequires:  SDL_image-devel
 BuildRequires:  SDL_mixer-devel
+BuildRequires:  SDL_Pango-devel
 BuildRequires:  SDL_ttf-devel
 
+Requires:       hicolor-icon-theme
 Requires:       liberation-serif-fonts
 
 %description
@@ -24,9 +26,10 @@ you just have to find a way to destroy all the green tiles and step on
 a safe tile at the end.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-git%{snapshot}
 
 %build
+./autogen.sh
 %configure
 make %{?_smp_mflags}
 
@@ -34,31 +37,42 @@ make %{?_smp_mflags}
 %install
 %make_install
 mkdir -p %{buildroot}%{_datadir}/pixmaps/
-convert data/icon.bmp %{buildroot}%{_datadir}/pixmaps/%{name}.png
+convert data/%{name}.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
 rm -f %{buildroot}%{_datadir}/%{name}/font.ttf
 ln -s %{_datadir}/fonts/liberation/LiberationSerif-Regular.ttf \
       %{buildroot}%{_datadir}/%{name}/font.ttf
-desktop-file-install                                    \
---dir=%{buildroot}%{_datadir}/applications         \
-%{SOURCE1}
 
-mkdir -p %{buildroot}%{_mandir}
-tar -xvzf %{SOURCE2} -C %{buildroot}%{_mandir}
+desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
+
+for size in 48 96 128 192 256; do
+  mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps
+  convert data/hex-a-hop.png -resize ${size} \
+      %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps/%{name}.png
+done
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/16x16/apps
+install -m644 data/hex-a-hop-16.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
 
-%find_lang %{name} --with-man
+
+%find_lang %{name}
 
 %files -f %{name}.lang
-%doc AUTHORS COPYING
+%doc AUTHORS NEWS README TODO
+%license COPYING
 %{_bindir}/%{name}
+%{_datadir}/appdata/%{name}.appdata.xml
 %{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_datadir}/%{name}/
 %{_datadir}/pixmaps/%{name}.png
 %{_mandir}/man6/%{name}.6.*
 
-# Some of the sound files are licensed under CC Sampling Plus 1.0
-%exclude %{_datadir}/%{name}/*nonfree*
 
 %changelog
+* Fri Jan 02 2015 Mario Blättermann <mario.blaettermann at gmail.com> - 1.2.0-git20140926.1
+- New upstream version based on a Git snapshot
+- Use the %%license macro
+- New icon sizes (rhbz #1157543)
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index c62e11a..61196d3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-cc8d065c2cc0fce9e08852b8c465175e  hex-a-hop-1.1.0.tar.gz
-2adb85a3258bebd48bc3c8e6b5249e52  hex-a-hop-man.tar.gz
+b31ba5c8b94fd9da2ed13e25203724a1  hex-a-hop-1.2.0-git20140926.tar.xz