Package for Nethack 3.6.1

2018-05-13 21:08:34 -05:00 · 2018-05-13 21:08:34 -05:00 · 0102b1e9e5
parent 46dc983b26
commit 0102b1e9e5
9 changed files with 50 additions and 58 deletions
--- a/Makefile.top.patch
+++ b/Makefile.top.patch
@ -0,0 +1,11 @@
+--- sys/unix/Makefile.top.orig	2018-05-02 15:01:59.419155535 -0500
+++ sys/unix/Makefile.top	2018-05-02 15:02:52.288507817 -0500
+@@ -49,7 +49,7 @@
+ # per discussion in Install.X11 and Install.Qt
+ #VARDATND = 
+ # VARDATND = x11tiles NetHack.ad pet_mark.xbm pilemark.xbm
+-# VARDATND = x11tiles NetHack.ad pet_mark.xbm pilemark.xbm rip.xpm
+VARDATND = x11tiles NetHack.ad pet_mark.xbm pilemark.xbm rip.xpm
+ # for Atari/Gem
+ # VARDATND = nh16.img title.img GEM_RSC.RSC rip.img
+ # for BeOS
--- a/nethack-3.6.0-x11.patch
+++ b/nethack-3.6.0-x11.patch
--- a/nethack-3.6.0-guidebook.patch
+++ b/nethack-3.6.0-guidebook.patch
@ -1,16 +0,0 @@
--- sys/unix/Makefile.doc.orig	2016-10-02 20:41:46.620046458 -0500
-+++ sys/unix/Makefile.doc	2016-10-02 20:42:50.714521302 -0500
-@@ -26,10 +26,11 @@
- 
- # Use the "cat" GUIDECMD if nroff and/or tbl and/or col are not installed
- # Not appropriate for creating Guidebook.txt.
-# GUIDECMD = cat Guidebook.txt
-+GUIDECMD = cat Guidebook.txt
- # The following works better with groff-1.18, eg on Linux
- # GUIDECMD = $(GUIDE_PREFORMAT) | nroff -c -Tascii | $(COLCMD)
-GUIDECMD = $(GUIDE_PREFORMAT) | nroff | $(COLCMD)
-+# GUIDECMD = $(GUIDE_PREFORMAT) | nroff | $(COLCMD)
-+GUIDECMD = tbl tmac.n Guidebook.mn | nroff | $(COLCMD)
- 
- # Only generate output for the current configuration:
- NHGREP = $(MAKEDEFS) --grep --input - --output -
--- a/nethack-3.6.1-config.patch
+++ b/nethack-3.6.1-config.patch
@ -36,16 +36,7 @@
 #ifndef COMPRESS
 --- include/unixconf.h.orig	2015-11-17 04:54:25.000000000 -0600
 +++ include/unixconf.h	2017-05-22 13:48:46.766291818 -0500
-@@ -36,7 +36,7 @@
- #define NETWORK        /* if running on a networked system */
-                        /* e.g. Suns sharing a playground through NFS */
- /* #define SUNOS4 */   /* SunOS 4.x */
-/* #define LINUX */    /* Another Unix clone */
-+#define LINUX    /* Another Unix clone */
- /* #define CYGWIN32 */ /* Unix on Win32 -- use with case sensitive defines */
- /* #define GENIX */    /* Yet Another Unix Clone */
- /* #define HISX */     /* Bull Unix for XPS Machines */
-@@ -101,7 +101,7 @@
+@@ -104,7 +104,7 @@
  * If you want the static parts of your playground on a read-only file
  * system, define VAR_PLAYGROUND to be where the variable parts are kept.
  */
@ -54,12 +45,12 @@
 
 /*
  * Define DEF_PAGER as your default pager, e.g. "/bin/cat" or "/usr/ucb/more"
-@@ -128,7 +128,7 @@
+@@ -131,7 +131,7 @@
  * "extra output" method is used, but not all systems provide access to
  * a fine-grained timer.
  */
 -/* #define TIMED_DELAY */ /* usleep() */
 +#define TIMED_DELAY /* usleep() */
 #endif
- 
- /*
+ #if defined(MACOSX) && !defined(TIMED_DELAY)
+ #define TIMED_DELAY
--- a/nethack-3.6.1-guidebook.patch
+++ b/nethack-3.6.1-guidebook.patch
@ -0,0 +1,18 @@
+--- sys/unix/Makefile.doc.orig	2018-05-02 15:30:26.382529453 -0500
+++ sys/unix/Makefile.doc	2018-05-02 15:32:45.159454158 -0500
+@@ -28,12 +28,13 @@
+ 
+ # Use the "cat" GUIDECMD if nroff and/or tbl and/or col are not installed
+ # Not appropriate for creating Guidebook.txt.
+-# GUIDECMD = cat Guidebook.txt
+GUIDECMD = cat Guidebook.txt
+ #
+ # Single page. Might need adjustment to .pl value
+ # GUIDECMD= $(GUIDE_PREFORMAT) | perl -pe 's/^(.mt)$$/.pl 4720v\n.in 0\n.po 8\n.ll 64m\n$$1/' | nroff -c -Tascii | $(COLCMD)
+ #
+-GUIDECMD = $(GUIDE_PREFORMAT) | nroff -c -Tascii | $(COLCMD)
+#GUIDECMD = $(GUIDE_PREFORMAT) | nroff -c -Tascii | $(COLCMD)
+GUIDECMD = tbl tmac.n Guidebook.mn | nroff | $(COLCMD)
+ 
+ # Only generate output for the current configuration:
+ NHGREP = $(MAKEDEFS) --grep --input - --output -
--- a/nethack-3.6.1-makefile.patch
+++ b/nethack-3.6.1-makefile.patch
@ -89,13 +89,3 @@
 
 # these are the names of the output files from YACC/LEX. Under MS-DOS
 # and similar systems, they may differ
--- sys/unix/Makefile.top.orig	2016-10-02 19:08:10.317717433 -0500
-+++ sys/unix/Makefile.top	2016-10-02 20:37:08.558986445 -0500
-@@ -47,6 +47,7 @@
- # per discussion in Install.X11 and Install.Qt
- #VARDATND = 
- # VARDATND = x11tiles NetHack.ad pet_mark.xbm pilemark.xpm
-+VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm pilemark.xbm
- # VARDATND = x11tiles NetHack.ad pet_mark.xbm pilemark.xpm rip.xpm
- # for Atari/Gem
- # VARDATND = nh16.img title.img GEM_RSC.RSC rip.img
--- a/nethack-3.6.0-format-security.patch
+++ b/nethack-3.6.0-format-security.patch
--- a/nethack.spec
+++ b/nethack.spec
@ -1,21 +1,22 @@
-%global nhgamedir /usr/games/nethack-3.6.0
+%global nhgamedir /usr/games/nethack
 %global nhdatadir /var/games/nethack

 %global fontname nethack-bitmap

 Name:           nethack
-Version:        3.6.0
-Release:        43%{?dist}
+Version:        3.6.1
+Release:        1%{?dist}
 Summary:        A rogue-like single player dungeon exploration game

 Group:          Amusements/Games
 License:        NGPL
 URL:            http://nethack.org
-Source0:        https://sourceforge.net/projects/%{name}/files/%{name}/%{version}/%{name}-360-src.tgz
+Source0:        https://sourceforge.net/projects/%{name}/files/%{name}/%{version}/%{name}-361-src.tgz
 Source1:        %{name}.desktop
 Patch0:         %{name}-%{version}-makefile.patch
-Patch1:         %{name}-%{version}-config.patch
-Patch2:         %{name}-%{version}-guidebook.patch
+Patch1:         Makefile.top.patch
+Patch2:         %{name}-%{version}-config.patch
+Patch3:         %{name}-%{version}-guidebook.patch
 Requires:       %{fontname}-fonts-core

 BuildRequires:  ncurses-devel
@ -65,8 +66,9 @@ X11 core fonts configuration for %{fontname}.
 %prep
 %setup -q
 %patch0 -b .makefile
-%patch1 -b .config
-%patch2 -b .guidebook
+%patch1  
+%patch2 -b .config
+%patch3 -b .guidebook

 %{__sed} -i -e "s:PREFIX=\$(wildcard ~)/nh/install:PREFIX=/usr:" sys/unix/hints/linux
 %{__sed} -i -e "s:^\(HACKDIR=\).*:\1%{nhgamedir}:" sys/unix/hints/linux
@ -132,6 +134,9 @@ if [ $1 -eq 0 ] ; then
    rm %{_fontdir}/fonts.dir
 fi;

+%clean
+rm -rf $RPM_BUILD_ROOT
+

 %files
 %doc doc/*.txt README dat/license dat/history
@ -166,15 +171,8 @@ fi;
 %defattr(-,root,root,-)

 %changelog
-* Wed May 02 2018 Ron Olson <tachoknight@gmail.com> - 3.6.0-43
- RPM should own the game directory so it can be properly cleaned
-  up if the user removes the package
-
-* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.6.0-42
- Escape macros in %%changelog
-
-* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.0-41
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+* Wed May 02 2018 Ron Olson <tachoknight@gmail.com> 3.6.1-1
+- First version of 3.6.1

 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.0-40
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
@ -266,7 +264,7 @@ fi;
 - Rebuild for FC6

 * Mon Apr 10 2006 Luke Macken <lmacken@redhat.com> 3.4.3-10
- Remove $RPM_BUILD_ROOT from %%post (Bug #188008)
+- Remove $RPM_BUILD_ROOT from %post (Bug #188008)

 * Wed Feb 15 2006 Luke Macken <lmacken@redhat.com> 3.4.3-9
 - Add nethack-3.4.3-guidebook.patch to fix issues with generating the Guidebook
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (nethack-360-src.tgz) = 92370a3c60a4f6861b9c0f1e1320fc23d91cedc1615d0d09e06a0ee3e13c9c8c0cd931389bfd7a25845ed07ef966d19d9e46e77ae07084a941685dc67f49c813
+SHA512 (nethack-361-src.tgz) = bd6e36c163f0d85e1ab1fc659464696b5a02c3864a800ad47e047fdc4a35fff4ef7dd28a9b071fa46f7f67fa45c97fdc77bc1f2bdbad80cc02950d73731d9c30