Compare commits

...

36 Commits
f10 ... master

Author SHA1 Message Date
Fedora Release Engineering 80a9332850 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-26 23:31:04 +00:00
Fedora Release Engineering 2e96d2bcce - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-02 15:36:36 +00:00
Igor Gnatenko 8405714a4c Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
2019-01-28 20:24:49 +01:00
Fedora Release Engineering 178d84b9a7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-14 06:16:31 +00:00
Igor Gnatenko 3f2732fa09 add BuildRequires: gcc
Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot
2018-07-09 19:06:51 +02:00
Fedora Release Engineering 1eadd637c7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-09 16:58:53 +00:00
Fedora Release Engineering 25a3a1c0cd - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-03 08:33:48 +00:00
Fedora Release Engineering 0ccad10b40 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-27 18:46:24 +00:00
Fedora Release Engineering e223268a21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-11 13:34:54 +00:00
Fedora Release Engineering d469f67a36 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-05 00:08:52 +00:00
David King 9fb7b5f728 Convert XPM icon to PNG 2015-09-22 10:45:13 +01:00
Dennis Gilmore 9d4784cf1e - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild 2015-06-19 01:04:05 +00:00
David King 1f72ee0dce Update desktop file and validate it during check
Update the desktop file and tidy the spec file. Add an AppData
description. Preserve timestamps during install. Drop unnecessary (since
redhat-rpm-config 9.1.0-42) aarch64 patch.
2014-11-20 16:52:09 +00:00
Peter Robinson 1e5dac8835 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild 2014-08-18 02:40:06 +00:00
Dennis Gilmore 7da8e9f93c - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild 2014-06-08 01:32:48 -05:00
Iain Arnell 4cd63b0552 apply patch to avoid format-security errors (RHBZ#1037330) 2013-12-04 09:39:41 -07:00
Iain Arnell db85173fc3 use _pkgdocdir macro 2013-08-10 09:18:56 -06:00
Dennis Gilmore 0752dc8b89 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild 2013-08-04 09:52:06 -05:00
Iain Arnell f7bd9ff620 patch to support aarch64 (thanks, ausil) 2013-03-23 15:22:56 -06:00
Dennis Gilmore a9bbeb0292 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild 2013-02-14 18:06:33 -06:00
Dennis Gilmore fa066bcb40 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild 2012-07-21 14:51:01 -05:00
Iain Arnell a5c9180a97 fix build against libpng 1.5 2012-01-15 01:41:40 +01:00
Dennis Gilmore 6475f3984d - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild 2012-01-13 22:01:51 -06:00
Dennis Gilmore 051e7dfbed - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild 2011-02-09 08:11:16 -06:00
Iain Arnell 57c75fc5c5 Merge remote branch 'origin/f12/master' 2010-08-05 18:00:12 +02:00
Iain Arnell 460088435f Merge remote branch 'origin/f13/master' 2010-08-05 18:00:03 +02:00
Fedora Release Engineering dfef28e585 dist-git conversion 2010-07-29 12:51:08 +00:00
Fedora Release Engineering 27c5e3b6fa dist-git conversion 2010-07-29 12:51:08 +00:00
Fedora Release Engineering 42da54e779 dist-git conversion 2010-07-29 12:51:07 +00:00
Jesse Keating 7c219a2ff1 Initialize branch F-13 for slashem 2010-02-17 03:11:43 +00:00
Bill Nottingham b0e4ca9bf0 Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-26 01:40:50 +00:00
Bill Nottingham b6c2fe5ecd Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-25 23:15:33 +00:00
Jesse Keating 714df03038 Initialize branch F-12 for slashem 2009-09-29 06:52:23 +00:00
Jesse Keating 105418d224 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild 2009-07-27 04:26:30 +00:00
Iain Arnell 12c827ff58 - require nethack-bitmap-fonts-core, not nethack anymore 2009-07-19 12:51:44 +00:00
Iain Arnell 36f4467f56 initial import 2009-07-07 07:45:25 +00:00
10 changed files with 1954 additions and 21 deletions

View File

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
se008e0f1.tar.gz

View File

@ -1,21 +0,0 @@
# Makefile for source rpm: slashem
# $Id$
NAME := slashem
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)

26
slashem-config.patch Normal file
View File

@ -0,0 +1,26 @@
diff -up slashem-0.0.8E0F1/include/config.h.config slashem-0.0.8E0F1/include/config.h
--- slashem-0.0.8E0F1/include/config.h.config 2006-12-30 14:04:53.000000000 +0100
+++ slashem-0.0.8E0F1/include/config.h 2009-05-21 09:54:05.000000000 +0200
@@ -220,8 +220,8 @@
#ifdef UNIX
/* path and file name extension for compression program */
-# define COMPRESS "/usr/bin/compress" /* Lempel-Ziv compression */
-# define COMPRESS_EXTENSION ".Z" /* compress's extension */
+# define COMPRESS "/usr/bin/bzip2" /* bzip2 compression */
+# define COMPRESS_EXTENSION ".bz2" /* bzip2 extension */
/* An example of one alternative you might want to use: */
/* # define COMPRESS "/usr/local/bin/gzip" */ /* FSF gzip compression */
diff -up slashem-0.0.8E0F1/include/unixconf.h.config slashem-0.0.8E0F1/include/unixconf.h
--- slashem-0.0.8E0F1/include/unixconf.h.config 2006-12-30 14:04:53.000000000 +0100
+++ slashem-0.0.8E0F1/include/unixconf.h 2009-05-21 09:52:56.000000000 +0200
@@ -113,7 +113,7 @@
* FILE_AREA_DOC For human-readable documentation
*/
-/* #define FILE_AREAS */ /* Use file areas */
+#define FILE_AREAS /* Use file areas */
#ifdef FILE_AREAS

File diff suppressed because it is too large Load Diff

32
slashem-libpng-1.5.patch Normal file
View File

@ -0,0 +1,32 @@
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;

16
slashem.appdata.xml Normal file
View File

@ -0,0 +1,16 @@
<?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>

8
slashem.desktop Normal file
View File

@ -0,0 +1,8 @@
[Desktop Entry]
Name=Slash'EM
Comment=Slash'EM is a single player dungeon exploration game
Exec=slashem
Icon=slashem
Terminal=true
Type=Application
Categories=Game;AdventureGame;RolePlaying;X-Fedora;

248
slashem.spec Normal file
View File

@ -0,0 +1,248 @@
Name: slashem
Version: 0.0.8
Release: 0.27.E0F1%{?dist}
Summary: Super Lotsa Added Stuff Hack - Extended Magic
License: NGPL
URL: http://slashem.sourceforge.net/
Source0: http://downloads.sourceforge.net/%{name}/se008e0f1.tar.gz
Source1: %{name}.desktop
Source2: %{name}.appdata.xml
Patch0: slashem-config.patch
# fix building with libpng 1.5
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: libXmu-devel, libXpm-devel, libXt-devel
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
%{!?_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}
%description
From the land before 3DFX, before VGA graphics and DOOM, before the IBM PC, way
back in the dark ages of Unixland, there was a game. They called it Rogue.
People played it, and found it good. From this basis, Hack was born. Soon Hack
became Nethack, because it was developed by many people (and has nothing to do
with hacking the internet). And people played this on many machines, from
Unices to Macs to PCs, due to the amazing power of Open Source Code.
But the DevTeam, the reclusive masterminds of Nethack, are a rather quiet
bunch, gracing the world with new versions as they see fit, and when they see
fit. Which is usually a new version every good number of years.
And there was much gnashing of teeth.
But because of the Freely Available Source Code Phenomenon, people began making
their own versions of Nethack to tide themselves between magical releases.
SLASH'EM is the (continuing) saga of one such variant...
%prep
%setup -q -n %{name}-%{version}E0F1
%patch0 -p1 -b .config
%patch1 -p1 -b .libpng
%patch2 -p1 -b .format-security
sed -i \
-e 's:^\(#define FILE_AREA_VAR\).*:\1 "%{fa_var}/":' \
-e 's:^\(#define FILE_AREA_SAVE\).*:\1 "%{fa_save}/":' \
-e 's:^\(#define FILE_AREA_SHARE\).*:\1 "%{fa_share}/":' \
-e 's:^\(#define FILE_AREA_UNSHARE\).*:\1 "%{fa_unshare}/":' \
-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
mv $f.conv $f
done
%build
export LIBXAW_CFLAGS="-I/usr/include"
export LIBXAW_LIBS="$(pkg-config --libs xaw7)"
%configure \
--enable-tty-graphics \
--enable-x11-graphics \
--enable-sdl-graphics \
--enable-gl-graphics \
--enable-data-librarian \
--enable-sinks \
--enable-reincarnation \
--enable-zouthern \
--enable-score-on-botl \
--enable-wizmode=games
# smp_mflags fails
make \
FILE_AREA_VAR=%{fa_var} \
FILE_AREA_SAVE=%{fa_save} \
FILE_AREA_SHARE=%{fa_share} \
FILE_AREA_UNSHARE=%{fa_unshare} \
FILE_AREA_DOC=%{fa_doc} \
SHELLDIR=%{_bindir}
%install
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
install -d -m 0755 %{buildroot}%{_mandir}/man6
make -C doc MANDIR=%{buildroot}%{_mandir}/man6 manpages
sed -i \
-e 's!%{buildroot}!!g' \
-e '/XUSERFILE/s!\$HACKDIR!%{fa_share}!' \
%{buildroot}%{_bindir}/slashem
mv %{buildroot}%{fa_unshare}/recover %{buildroot}%{_bindir}/slashem-recover
mv %{buildroot}%{_mandir}/man6/recover.6 %{buildroot}%{_mandir}/man6/slashem-recover.6
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
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
%check
desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
%files
%doc history.txt doc/*.txt README.34 readme.* slamfaq.txt dat/license dat/history
%{_bindir}/slashem
%{_bindir}/slashem-recover
%{fa_share}
%dir %{fa_unshare}
%{fa_unshare}/nhushare
%{_mandir}/man6/*
%{_datadir}/appdata/%{name}.appdata.xml
%{_datadir}/applications/slashem.desktop
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%defattr(0664,root,games)
%config(noreplace) %{fa_var}/logfile
%config(noreplace) %{fa_var}/perm
%config(noreplace) %{fa_var}/record
%attr(0775,root,games) %dir %{fa_var}
%attr(0775,root,games) %dir %{fa_var}/save
%attr(2755,root,games) %{fa_unshare}/slashem
%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
* Sun Jul 19 2009 Iain Arnell <iarnell@gmail.com> 0.0.8-0.4.E0F1
- require nethack-bitmap-fonts-core, not nethack anymore
* Mon Jul 06 2009 Iain Arnell <iarnell@gmail.com> 0.0.8-0.3.E0F1
- don't install fonts - require nethack instead
* Wed Jun 10 2009 Iain Arnell <iarnell@gmail.com> 0.0.8-0.2.E0F1
- additional requires for scriptlets
- only run preun for final uninstall
* Thu May 21 2009 Iain Arnell <iarnell@gmail.com> 0.0.8-0.1.E0F1
- initial packaging

View File

@ -0,0 +1 @@
cdfceaf7888246934dec8e256ac0a738 se008e0f1.tar.gz