From 9fb7b5f728e9f19e397a5230eab6d5d72c0bf306 Mon Sep 17 00:00:00 2001
From: David King <amigadave@amigadave.com>
Date: Tue, 22 Sep 2015 10:45:13 +0100
Subject: [PATCH] Convert XPM icon to PNG

---
 slashem.spec | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/slashem.spec b/slashem.spec
index b7ba9c5..276e020 100644
--- a/slashem.spec
+++ b/slashem.spec
@@ -1,6 +1,6 @@
 Name:           slashem
 Version:        0.0.8
-Release:        0.18.E0F1%{?dist}
+Release:        0.19.E0F1%{?dist}
 Summary:        Super Lotsa Added Stuff Hack - Extended Magic
 
 Group:          Amusements/Games
@@ -16,6 +16,7 @@ Patch1:         slashem-libpng-1.5.patch
 Patch2:         slashem-format-security.patch
 
 BuildRequires:  /usr/bin/appstream-util
+BuildRequires:  /usr/bin/convert
 BuildRequires:  ncurses-devel
 BuildRequires:  bison, flex, desktop-file-utils
 BuildRequires:  bdftopcf, libX11-devel, libXext-devel
@@ -24,6 +25,8 @@ BuildRequires:  SDL-devel  libGL-devel libpng-devel zlib-devel
 BuildRequires:  pkgconfig(xaw7)
 # to compress save files
 Requires:       bzip2
+# For icon theme directories.
+Requires:       hicolor-icon-theme
 # for X11 core fonts
 Requires:       nethack-bitmap-fonts-core
 
@@ -126,7 +129,8 @@ rm %{buildroot}%{_mandir}/man6/[^s]*
 
 sed -i -e 's:^!\(SlashEM.tile_file.*\):\1:' %{buildroot}%{fa_share}/SlashEM.ad
 
-install -Dpm 0644 win/X11/nh_icon.xpm %{buildroot}%{_datadir}/pixmaps/slashem.xpm
+install -d %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
+convert win/X11/nh_icon.xpm %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE1}
 install -Dpm 0644 %{SOURCE2} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
 
@@ -146,7 +150,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/%{name}.ap
 %{_mandir}/man6/*
 %{_datadir}/appdata/%{name}.appdata.xml
 %{_datadir}/applications/slashem.desktop
-%{_datadir}/pixmaps/slashem.xpm
+%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 %defattr(0664,root,games)
 %config(noreplace) %{fa_var}/logfile
 %config(noreplace) %{fa_var}/perm
@@ -157,6 +161,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/%{name}.ap
 
 
 %changelog
+* Tue Sep 22 2015 David King <amigadave@amigadave.com> - 0.0.8-0.19.E0F1
+- Convert XPM icon the PNG
+
 * Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.8-0.18.E0F1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild