[BlockOutII] Found a better 48x48 icon

[Hans de Goede]

commit 8d6ef93d065ab8063c273876a263709d9f28f59c
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Mon Oct 27 15:05:14 2014 +0100

    Found a better 48x48 icon

 BlockOutII.png  |  Bin 22179 -> 0 bytes
 BlockOutII.spec |   24 +++++++++++++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)
---
diff --git a/BlockOutII.spec b/BlockOutII.spec
index d6b64fb..4ed0208 100644
--- a/BlockOutII.spec
+++ b/BlockOutII.spec
@@ -5,7 +5,7 @@
 
 Name:           BlockOutII
 Version:        2.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A free adaptation of the original BlockOut DOS game
 Group:          Amusements/Games
 License:        GPLv2+
@@ -13,14 +13,13 @@ URL:            http://www.blockout.net/blockout2/
 Source0:        http://downloads.sourceforge.net/blockout/bl25-src.tar.gz
 Source1:        http://downloads.sourceforge.net/blockout/bl25-linux-x86.tar.gz
 Source2:        %{name}.desktop
-Source3:        %{name}.png
 Patch0:         BlockOutII-2.3-syslibs.patch
 Patch1:         BlockOutII-2.3-bl2Home.patch
 Patch2:         BlockOutII-2.3-restore-resolution.patch
 Patch3:         BlockOutII-2.3-libpng15.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1037001
 Patch4:         BlockOutII-2.3-format-security.patch
-BuildRequires:  SDL_mixer-devel libpng-devel desktop-file-utils
+BuildRequires:  SDL_mixer-devel libpng-devel desktop-file-utils ImageMagick
 Requires:       hicolor-icon-theme opengl-games-utils
 
 %description
@@ -66,6 +65,8 @@ make %{?_smp_mflags} \
     ADD_LIBS="-L../ImageLib/src -limagelib -lpng -lz"
 popd
 
+convert BlockOut/block_icon.ico BlockOutII.png
+
 
 %install
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
@@ -79,9 +80,15 @@ install -p -m 644 blockout/sounds/* $RPM_BUILD_ROOT%{_datadir}/%{name}/sounds
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps
-install -p -m 644 %{SOURCE3} \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+install -p -m 644 %{name}-1.png \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+install -p -m 644 %{name}-0.png \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+install -p -m 644 %{name}-2.png \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 
 
 %post
@@ -102,10 +109,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_bindir}/%{name}*
 %{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
 
 
 %changelog
+* Mon Oct 27 2014 Hans de Goede <hdegoede at redhat.com> - 2.5-2
+- Found a better 48x48 icon
+
 * Mon Oct 27 2014 Hans de Goede <hdegoede at redhat.com> - 2.5-1
 - New upstream release 2.5
 - Include a larger (128x128) icon (rhbz#1157498)