slashem-libpng-1.5.patch

@@ -1,32 +0,0 @@
-diff -up slashem-0.0.8E0F1/win/gl/gl_image.c.libpng slashem-0.0.8E0F1/win/gl/gl_image.c
---- slashem-0.0.8E0F1/win/gl/gl_image.c.libpng	2006-12-30 14:04:53.000000000 +0100
-+++ slashem-0.0.8E0F1/win/gl/gl_image.c	2012-01-15 01:13:55.000000000 +0100
-@@ -495,7 +495,7 @@ unsigned char *sdlgl_load_png_file(const
-   /* set error handling since we are using the setjmp/longjmp method
-    * (this is the normal method of doing things with libpng).
-    */
--  if (setjmp(png_ptr->jmpbuf))
-+  if (setjmp(png_jmpbuf(png_ptr)))
-   {
-     sdlgl_warning("Problem within LibPNG (unknown)\n");
-     goto failed;
-diff -up slashem-0.0.8E0F1/win/share/tile2png.c.libpng slashem-0.0.8E0F1/win/share/tile2png.c
---- slashem-0.0.8E0F1/win/share/tile2png.c.libpng	2012-01-15 01:14:08.000000000 +0100
-+++ slashem-0.0.8E0F1/win/share/tile2png.c	2012-01-15 01:25:02.000000000 +0100
-@@ -26,6 +26,7 @@
- #undef blue
- 
- #include <png.h>
-+#include <zlib.h>
- #include <assert.h>
- 
- 
-@@ -104,7 +105,7 @@ void save_png(const char *filename, int
-   /* set error handling since we are using the setjmp/longjmp method
-    * (this is the normal method of doing things with libpng).
-    */
--  if (setjmp(png_ptr->jmpbuf))
-+  if (setjmp(png_jmpbuf(png_ptr)))
-   {
-     fprintf(stderr, "tile2png: Unknown problem while writing PNG.\n");
-     goto failed;

slashem.appdata.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 David King <amigadave@amigadave.com> -->
-<application>
-    <id type="desktop">slashem.desktop</id>
-    <name>Slash'EM</name>
-    <summary>Slash'EM is a single player dungeon exploration game</summary>
-    <metadata_license>CC0-1.0</metadata_license>
-    <project_license>NGPL</project_license>
-    <description>
-        <p>Slash'EM (Super Lotsa Added Stuff Hack - Extended Magic) is a
-        variant of the roguelike game NetHack that offers extra features,
-        monsters, levels and items.</p>
-    </description>
-    <url type="homepage">http://slashem.sourceforge.net/</url>
-    <updatecontact>amigadave@amigadave.com</updatecontact>
-</application>

slashem.desktop

@@ -2,7 +2,8 @@
 Name=Slash'EM
 Comment=Slash'EM is a single player dungeon exploration game
 Exec=slashem
-Icon=slashem
+Icon=slashem.xpm
 Terminal=true
 Type=Application
-Categories=Game;AdventureGame;RolePlaying;X-Fedora;
+Encoding=UTF-8
+Categories=Application;Game;X-Fedora;

slashem.spec

@@ -1,42 +1,31 @@
 Name:           slashem
 Version:        0.0.8
-Release:        0.27.E0F1%{?dist}
+Release:        0.5.E0F1%{?dist}
 Summary:        Super Lotsa Added Stuff Hack - Extended Magic
 
+Group:          Amusements/Games
 License:        NGPL
 URL:            http://slashem.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/%{name}/se008e0f1.tar.gz
+Source0:        http://downloads.sourceforge.net/slashem/se008e0f1.tar.gz
 Source1:        %{name}.desktop
-Source2:        %{name}.appdata.xml
 Patch0:         slashem-config.patch
-# fix building with libpng 1.5
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1:         slashem-libpng-1.5.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=1037330
-Patch2:         slashem-format-security.patch
 
-BuildRequires:  gcc
-BuildRequires:  /usr/bin/appstream-util
-BuildRequires:  /usr/bin/convert
 BuildRequires:  ncurses-devel
 BuildRequires:  bison, flex, desktop-file-utils
-BuildRequires:  bdftopcf, libX11-devel, libXext-devel
+BuildRequires:  bdftopcf, libX11-devel, libXaw-devel, libXext-devel
 BuildRequires:  libXmu-devel, libXpm-devel, libXt-devel
-BuildRequires:  SDL-devel  libGL-devel libpng-devel zlib-devel
+BuildRequires:  SDL-devel  libGL-devel libpng-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
 
-%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
-
 %global fa_var      /var/games/%{name}
 %global fa_save     /var/games/%{name}/save
 %global fa_share    %{_datadir}/games/%{name}
 %global fa_unshare  %{_libdir}/games/%{name}
-%global fa_doc      %{_pkgdocdir}
+%global fa_doc      %{_defaultdocdir}/%{name}-%{version}
 
 %description
 From the land before 3DFX, before VGA graphics and DOOM, before the IBM PC, way
@@ -60,9 +49,7 @@ SLASH'EM is the (continuing) saga of one such variant...
 
 %prep
 %setup -q -n %{name}-%{version}E0F1
-%patch0 -p1 -b .config
+%patch0 -p 1 -b .config
-%patch1 -p1 -b .libpng
-%patch2 -p1 -b .format-security
 
 sed -i \
     -e 's:^\(#define FILE_AREA_VAR\).*:\1 "%{fa_var}/":' \
@@ -72,6 +59,7 @@ sed -i \
     -e 's:^\(#define FILE_AREA_DOC\).*:\1 "%{fa_doc}/":' \
     include/unixconf.h
 
+
 for f in *.txt ; do
   iconv -f iso8859-1 -t utf-8 $f >$f.conv
   touch -r $f $f.conv
@@ -102,15 +90,14 @@ make \
     FILE_AREA_DOC=%{fa_doc} \
     SHELLDIR=%{_bindir}
 
-
 %install
+rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} \
     FILE_AREA_VAR=%{buildroot}%{fa_var} \
     FILE_AREA_SAVE=%{buildroot}%{fa_save} \
     FILE_AREA_SHARE=%{buildroot}%{fa_share} \
     FILE_AREA_UNSHARE=%{buildroot}%{fa_unshare} \
     FILE_AREA_DOC=%{buildroot}%{fa_doc} \
-    INSTALL="install -p" \
     SHELLDIR=%{buildroot}%{_bindir} \
     CHOWN=/bin/true \
     CHGRP=/bin/true
@@ -129,18 +116,21 @@ rm %{buildroot}%{_mandir}/man6/[^s]*
 
 sed -i -e 's:^!\(SlashEM.tile_file.*\):\1:' %{buildroot}%{fa_share}/SlashEM.ad
 
-install -d %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
+install -D -p -m 0644 win/X11/nh_icon.xpm %{buildroot}%{_datadir}/pixmaps/slashem.xpm
-convert win/X11/nh_icon.xpm %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+desktop-file-install \
-desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE1}
+    --dir %{buildroot}%{_datadir}/applications \
-install -Dpm 0644 %{SOURCE2} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
+    --add-category X-Fedora \
+    --add-category Application \
+    --add-category Game \
+    %{SOURCE1}
 
 
-%check
+%clean
-desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
+rm -rf %{buildroot}
-appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
 
 
 %files
+%defattr(-,root,root,-)
 %doc history.txt doc/*.txt README.34 readme.* slamfaq.txt dat/license dat/history
 %{_bindir}/slashem
 %{_bindir}/slashem-recover
@@ -148,9 +138,8 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/%{name}.ap
 %dir %{fa_unshare}
 %{fa_unshare}/nhushare
 %{_mandir}/man6/*
-%{_datadir}/appdata/%{name}.appdata.xml
 %{_datadir}/applications/slashem.desktop
-%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{_datadir}/pixmaps/slashem.xpm
 %defattr(0664,root,games)
 %config(noreplace) %{fa_var}/logfile
 %config(noreplace) %{fa_var}/perm
@@ -161,75 +150,6 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/%{name}.ap
 
 
 %changelog
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.8-0.27.E0F1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.8-0.26.E0F1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.8-0.25.E0F1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.8-0.24.E0F1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.8-0.23.E0F1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.8-0.22.E0F1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.8-0.21.E0F1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.8-0.20.E0F1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* 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
-
-* Thu Nov 20 2014 David King <amigadave@amigadave.com> - 0.0.8-0.17.E0F1
-- Update desktop file and validate it during check
-- Add AppData description and validate it during check
-- Preserve timestamps during install
-- Tidy spec file
-
-* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.8-0.16.E0F1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.8-0.15.E0F1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Wed Dec 04 2013 Iain Arnell <iarnell@gmail.com> 0.0.8-0.14.E0F1
-- apply patch to avoid format-security errors (RHBZ#1037330)
-
-* Sat Aug 10 2013 Iain Arnell <iarnell@gmail.com> 0.0.8-0.13.E0F1
-- use _pkgdocdir macro
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.8-0.12.E0F1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Sat Mar 23 2013 Iain Arnell <iarnell@gmail.com> 0.0.8-0.11.E0F1
-- patch to support aarch64 (thanks, ausil)
-
-* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.8-0.10.E0F1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.8-0.9.E0F1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Sun Jan 15 2012 Iain Arnell <iarnell@gmail.com> 0.0.8-0.8.E0F1
-- fix build against libpng 1.5
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.8-0.7.E0F1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.8-0.6.E0F1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.8-0.5.E0F1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild