[rpms/nethack] rawhide: Update to 5.0.0. Fixes rhbz#2483160

[Kevin Fenzi <kevin@scrye.com>]

            A new commit has been pushed.

            Repo   : rpms/nethack
            Branch : rawhide
            Commit : e3f6eb64aa49f22ed4fe05bbeb5b6e2855cc395d
            Author : Kevin Fenzi <kevin@scrye.com>
            Date   : 2026-07-08T10:12:26-07:00
            Stats  : +91/-405 in 14 file(s)
            URL    : https://src.fedoraproject.org/rpms/nethack/c/e3f6eb64aa49f22ed4fe05bbeb5b6e2855cc395d?branch=rawhide

            Log:
            Update to 5.0.0. Fixes rhbz#2483160

Drop old X11 interface and bitmap fonts

Signed-off-by: Kevin Fenzi <kevin@scrye.com>

---
diff --git a/.gitignore b/.gitignore
index aacd3b2..12548f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ nethack-343-src.tgz
 /nethack-365-src.tgz
 /nethack-366-src.tgz
 /nethack-367-src.tgz
+/nethack-500-src.tgz

diff --git a/hackdir.patch b/hackdir.patch
deleted file mode 100644
index 82d08b3..0000000
--- a/hackdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nethack-3.6.6/include/config.orig	2020-03-08 12:29:31.000000000 -0500
-+++ nethack-3.6.6/include/config.h	2021-03-10 11:54:04.834363252 -0600
-@@ -352,7 +352,7 @@
-  * otherwise it will be the current directory.
-  */
- #ifndef HACKDIR
--#define HACKDIR "/usr/games/lib/nethackdir"
-+#define HACKDIR "/usr/games/nethack"
- #endif
- 
- /*

diff --git a/modern_c.patch b/modern_c.patch
deleted file mode 100644
index c7a9be0..0000000
--- a/modern_c.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --color -Naur NetHack-3.6.7/include-orig/system.h NetHack-3.6.7/include/system.h
---- NetHack-3.6.7/include-orig/system.h	2025-01-22 20:05:17.954360996 -0600
-+++ NetHack-3.6.7/include/system.h	2025-01-22 20:05:52.440085109 -0600
-@@ -60,7 +60,7 @@
- #endif
- #ifndef SIG_RET_TYPE
- #if defined(NHSTDC) || defined(POSIX_TYPES) || defined(OS2) || defined(__DECC)
--#define SIG_RET_TYPE void (*)()
-+#define SIG_RET_TYPE void (*)(int)
- #endif
- #endif
- #ifndef SIG_RET_TYPE
-@@ -96,7 +96,7 @@
- E void FDECL(srand48, (long));
- #else
- E long lrand48();
--E void srand48();
-+E void srand48(long);
- #endif /* MACOSX */
- #endif /* BSD || ULTRIX || RANDOM */
- 
-@@ -355,7 +355,7 @@
- E void sleep();
- #endif
- #if defined(ULTRIX) || defined(SYSV)
--E unsigned sleep();
-+E unsigned sleep(unsigned int);
- #endif
- #if defined(HPUX)
- E unsigned int FDECL(sleep, (unsigned int));
-@@ -519,7 +519,8 @@
- #else
- #if !(defined(HPUX) && defined(_POSIX_SOURCE))
- E int FDECL(tgetent, (char *, const char *));
--E void FDECL(tputs, (const char *, int, int (*)()));
-+//E void FDECL(tputs, (const char *, int, int (*)()));
-+E void FDECL(tputs, (const char *, int, int (*)(int)));
- #endif
- E int FDECL(tgetnum, (const char *));
- E int FDECL(tgetflag, (const char *));
-diff --color -Naur NetHack-3.6.7/include-orig/winX.h NetHack-3.6.7/include/winX.h
---- NetHack-3.6.7/include-orig/winX.h	2025-01-22 20:05:17.956361038 -0600
-+++ NetHack-3.6.7/include/winX.h	2025-01-22 20:05:52.442085151 -0600
-@@ -279,7 +279,8 @@
- } AppResources;
- 
- E AppResources appResources;
--E void (*input_func)();
-+//E void (*input_func)();
-+E void (*input_func)(Widget, XEvent *, String *, Cardinal *);
- 
- extern struct window_procs X11_procs;
- 
-diff --color -Naur NetHack-3.6.7/include-orig/xwindow.h NetHack-3.6.7/include/xwindow.h
---- NetHack-3.6.7/include-orig/xwindow.h	2025-01-22 20:05:17.957361059 -0600
-+++ NetHack-3.6.7/include/xwindow.h	2025-01-22 20:05:52.442085151 -0600
-@@ -76,8 +76,8 @@
- #define XtNexposeCallback "exposeCallback"
- #define XtNresizeCallback "resizeCallback"
- 
--extern XFontStruct *WindowFontStruct(/* Widget */);
--extern Font WindowFont(/* Widget */);
-+extern XFontStruct *WindowFontStruct(Widget w);
-+extern Font WindowFont(Widget w);
- 
- #define XtCWindowResource "WindowResource"
- #define XtCRows "Rows"

diff --git a/nethack-3.6.7-config.patch b/nethack-3.6.7-config.patch
deleted file mode 100644
index 2208837..0000000
--- a/nethack-3.6.7-config.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- include/config.h.orig	2019-05-13 10:47:48.545839681 -0500
-+++ include/config.h	2019-05-13 15:46:04.080338820 -0500
-@@ -45,8 +45,8 @@
- #if !defined(NOTTYGRAPHICS)
- #define TTY_GRAPHICS /* good old tty based graphics */
- #endif
--/* #define CURSES_GRAPHICS *//* Curses interface - Karl Garrison*/
--/* #define X11_GRAPHICS */   /* X11 interface */
-+#define CURSES_GRAPHICS /* Curses interface - Karl Garrison*/
-+#define X11_GRAPHICS   /* X11 interface */
- /* #define QT_GRAPHICS */    /* Qt interface */
- /* #define GNOME_GRAPHICS */ /* Gnome interface */
- /* #define MSWIN_GRAPHICS */ /* Windows NT, CE, Graphics */
-@@ -263,11 +263,11 @@
- 
- #if defined(UNIX) && !defined(ZLIB_COMP) && !defined(COMPRESS)
- /* 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/compress" */ /* Lempel-Ziv compression */
-+/* #define COMPRESS_EXTENSION ".Z" */      /* compress's extension */
- /* An example of one alternative you might want to use: */
--/* #define COMPRESS "/usr/local/bin/gzip" */ /* FSF gzip compression */
--/* #define COMPRESS_EXTENSION ".gz" */       /* normal gzip extension */
-+#define COMPRESS "/usr/bin/gzip" /* FSF gzip compression */
-+#define COMPRESS_EXTENSION ".gz"       /* normal gzip extension */
- #endif
- 
- #ifndef COMPRESS
-@@ -311,7 +311,7 @@
-  *      a tar-like file, thus making a neater installation.  See *conf.h
-  *      for detailed configuration.
-  */
--/* #define DLB */ /* not supported on all platforms */
-+#define DLB /* not supported on all platforms */
- 
- /*
-  *      Defining REPRODUCIBLE_BUILD causes 'util/makedefs -v' to construct
---- include/unixconf.h.orig	2019-05-13 10:48:00.595904458 -0500
-+++ include/unixconf.h	2019-05-13 19:38:45.882219484 -0500
-@@ -106,7 +106,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.
-  */
--/* #define VAR_PLAYGROUND "/var/lib/games/nethack" */
-+#define VAR_PLAYGROUND "/var/games/nethack" 
- 
- /*
-  * Define DEF_PAGER as your default pager, e.g. "/bin/cat" or "/usr/ucb/more"
-@@ -133,7 +133,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

diff --git a/nethack-3.6.7-guidebook.patch b/nethack-3.6.7-guidebook.patch
deleted file mode 100644
index 112a5cc..0000000
--- a/nethack-3.6.7-guidebook.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- sys/unix/Makefile.doc.orig	2020-03-10 10:09:24.608069997 -0500
-+++ sys/unix/Makefile.doc	2020-03-10 10:12:18.889062816 -0500
-@@ -28,12 +28,12 @@
- 
- # 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 = tbl tmac.n Guidebook.mn | nroff | $(COLCMD)
- ONEPAGECMD = $(ONEPAGE_PREFORMAT) | nroff -c -Tascii | $(COLCMD) \
- 	| sed -e '/EOF--EOF/,12345D'
- 

diff --git a/nethack-3.6.7-makefile.patch b/nethack-3.6.7-makefile.patch
deleted file mode 100644
index cab257f..0000000
--- a/nethack-3.6.7-makefile.patch
+++ /dev/null
@@ -1,99 +0,0 @@
---- sys/unix/Makefile.src.orig	2019-05-13 10:45:22.525054741 -0500
-+++ sys/unix/Makefile.src	2019-05-13 15:54:05.290209398 -0500
-@@ -66,7 +66,7 @@
- #	if you get setcgtty() warnings during execution, you are feeding gcc
- #		a non-ANSI <sys/ioctl.h> -- either run fixincludes on it or use
- #		-traditional in CFLAGS
--# CC = gcc
-+CC = gcc
- #
- #	For Bull DPX/2 systems at B.O.S. 2.0 or higher use the following:
- #
-@@ -130,7 +130,8 @@
- # flags for Linux
- #   compile normally
- # CFLAGS = -O2 -fomit-frame-pointer -I../include
--# LFLAGS = -L/usr/X11R6/lib
-+LFLAGS = -L/usr/X11R6/lib
-+CFLAGS = -D__clang_minor__ -O2 -fomit-frame-pointer -I../include ${RPM_OPT_FLAGS}
- #   OR compile backwards compatible a.out format
- # CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include
- # LFLAGS = -b i486-linuxaout -L/usr/X11R6/lib
-@@ -267,12 +267,12 @@
- #WINBEOBJ = winbe.o NHWindow.o NHMenuWindow.o NHMapWindow.o tile.o
- #
- #
--#WINSRC = $(WINTTYSRC)
--#WINOBJ = $(WINTTYOBJ)
-+#WINSRC = $(WINTTYSRC) $(WINX11SRC)
-+#WINOBJ = $(WINTTYOBJ) $(WINX11OBJ)
- #
- # Curses - Karl Garrison, Tangles
--#WINSRC = $(WINCURSESSRC)
--#WINOBJ = $(WINCURSESOBJ)
-+WINSRC = $(WINTTYSRC) $(WINX11SRC) $(WINCURSESSRC)
-+WINOBJ =  $(WINTTYOBJ) $(WINX11OBJ) $(WINCURSESOBJ)
- #
- # on some systems the termcap library is in -ltermcap or -lcurses
- # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
-@@ -287,12 +287,12 @@
- # WINTTYLIB = -ltermcap
- # WINTTYLIB = -lcurses
- # WINTTYLIB = -lcurses16
--# WINTTYLIB = -lncurses
-+WINTTYLIB = -lncurses
- #WINTTYLIB = -ltermlib
- #
- # libraries for X11
- # If USE_XPM is defined in config.h, you will also need -lXpm here.
--#WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
-+WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11
- # WINX11LIB = -lXaw -lXmu -lXt -lX11
- # WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm
- # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
-@@ -327,7 +327,7 @@
- # same as above, for XCurses
- #WINCURSESLIB = -L/usr/local/lib/pdcurses -lXCurses -lXawM -lXmu -lXext -lXt -lX11
- #
--#WINLIB = $(WINTTYLIB)
-+WINLIB = $(WINTTYLIB) $(WINX11LIB) 
- #
- # For Curses
- #WINLIB = $(WINCURSESLIB)
---- sys/unix/Makefile.utl.orig	2019-05-13 11:05:33.255674384 -0500
-+++ sys/unix/Makefile.utl	2019-05-13 11:07:09.572212625 -0500
-@@ -20,7 +20,7 @@
- 
- # if you are using gcc as your compiler,
- #	uncomment the CC definition below if it's not in your environment
--# CC = gcc
-+CC = gcc
- #
- #	For Bull DPX/2 systems at B.O.S. 2.0 or higher use the following:
- #
-@@ -78,7 +78,8 @@
- # flags for Linux
- #   compile normally
- # CFLAGS = -O2 -fomit-frame-pointer -I../include
--# LFLAGS = -L/usr/X11R6/lib
-+LFLAGS = -L/usr/X11R6/lib
-+CFLAGS = -D__clang_minor__ -O2 -fomit-frame-pointer -I../include ${RPM_OPT_FLAGS}
- #   OR compile backwards compatible a.out format
- # CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include
- # LFLAGS = -b i486-linuxaout -L/usr/X11R6/lib
-@@ -111,11 +111,11 @@
- 
- # yacc/lex programs to use to generate *_comp.h, *_lex.c, and *_yacc.c.
- # if, instead of yacc/lex you have bison/flex, comment/uncomment the following.
--YACC     = yacc
--LEX      = lex
--# YACC     = bison -y
-+# YACC     = yacc
-+# LEX      = lex
-+YACC     = bison -y
- # YACC     = byacc
--# LEX      = flex
-+LEX      = flex
- 
- # these are the names of the output files from YACC/LEX. Under MS-DOS
- # and similar systems, they may differ

diff --git a/nethack-3.6.7-top.patch b/nethack-3.6.7-top.patch
deleted file mode 100644
index 48bf496..0000000
--- a/nethack-3.6.7-top.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- sys/unix/Makefile.top.orig	2019-05-13 11:07:15.731247038 -0500
-+++ sys/unix/Makefile.top	2019-05-13 11:10:12.118232737 -0500
-@@ -27,7 +27,7 @@
- 
- # Permissions - some places use setgid instead of setuid, for instance
- # See also the option "SECURE" in include/config.h
--#GAMEPERM = 04755
-+GAMEPERM = 02755
- FILEPERM = 0644
- # VARFILEPERM = 0644
- EXEPERM  = 0755
-@@ -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

diff --git a/nethack-3.6.7-xpm.patch b/nethack-3.6.7-xpm.patch
deleted file mode 100644
index f69b08a..0000000
--- a/nethack-3.6.7-xpm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/config.h.orig	2022-07-02 08:16:35.484181081 -0700
-+++ include/config.h	2022-07-02 08:17:35.554634170 -0700
-@@ -134,7 +134,7 @@
-  * would allow:
-  *  xpmtoppm <x11tiles.xpm | pnmscale 1.25 | ppmquant 90 >x11tiles_big.xpm
-  */
--/* # define USE_XPM */ /* Disable if you do not have the XPM library */
-+#define USE_XPM /* Disable if you do not have the XPM library */
- #ifdef USE_XPM
- #define GRAPHIC_TOMBSTONE /* Use graphical tombstone (rip.xpm) */
- #endif

diff --git a/nethack-5.0.0-guidebook.patch b/nethack-5.0.0-guidebook.patch
new file mode 100644
index 0000000..cc7f00e
--- /dev/null
+++ b/nethack-5.0.0-guidebook.patch
@@ -0,0 +1,12 @@
+diff --color -Nur NetHack-5.0.0.orig/sys/unix/Makefile.doc NetHack-5.0.0/sys/unix/Makefile.doc
+--- NetHack-5.0.0.orig/sys/unix/Makefile.doc	2026-05-02 09:47:25.000000000 -0700
++++ NetHack-5.0.0/sys/unix/Makefile.doc	2026-07-02 12:12:15.031247133 -0700
+@@ -38,7 +38,7 @@
+ # 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 $(NROFF_FLAGS) | $(COLCMD)
++GUIDECMD = tbl tmac.n Guidebook.mn | nroff | $(COLCMD)
+ ONEPAGECMD = $(ONEPAGE_PREFORMAT) | nroff -c -Tascii $(NROFF_FLAGS) | $(COLCMD)
+ 
+ # Only generate output for the current configuration:

diff --git a/nethack-5.0.0-hackdir.patch b/nethack-5.0.0-hackdir.patch
new file mode 100644
index 0000000..a39a524
--- /dev/null
+++ b/nethack-5.0.0-hackdir.patch
@@ -0,0 +1,30 @@
+diff --color -Nur NetHack-5.0.0.orig/include/config.h NetHack-5.0.0/include/config.h
+--- NetHack-5.0.0.orig/include/config.h 2026-07-02 12:10:27.704579390 -0700
++++ NetHack-5.0.0/include/config.h      2026-07-02 15:10:06.163226005 -0700
+@@ -59,6 +59,9 @@
+ /* #define X11_GRAPHICS */   /* X11 interface */
+ /* #define QT_GRAPHICS */    /* Qt interface */
+ /* #define MSWIN_GRAPHICS */ /* Windows NT, CE, Graphics */
++/* #define CURSES_GRAPHICS */ /* Curses interface - Karl Garrison*/
++/* #define X11_GRAPHICS */    /* X11 interface */
++/* #define QT_GRAPHICS */      /* Qt interface */
+ 
+ /*
+  * Define the default window system.  This should be one that is compiled
+@@ -444,7 +447,7 @@
+  * otherwise it will be the current directory.
+  */
+ #ifndef HACKDIR
+-#define HACKDIR "/usr/games/lib/nethackdir"
++#define HACKDIR "/usr/games/nethack"
+ #endif
+ 
+ /*
+@@ -606,6 +609,7 @@
+  * terminals (e.g. old versions of gnome-terminal) don't work with this. */
+ /* #define TTY_TILES_ESCCODES */
+ /* #define TTY_SOUND_ESCCODES */
++/* #define TTY_TILES_ESCCODES */
+ 
+ /* An experimental minimalist inventory list capability under tty if you have
+  * at least 28 additional rows beneath the status window on your terminal  */

diff --git a/nethack-5.0.0-playground.patch b/nethack-5.0.0-playground.patch
new file mode 100644
index 0000000..ff6ca77
--- /dev/null
+++ b/nethack-5.0.0-playground.patch
@@ -0,0 +1,12 @@
+diff --color -Nur NetHack-5.0.0.orig/include/unixconf.h NetHack-5.0.0/include/unixconf.h
+--- NetHack-5.0.0.orig/include/unixconf.h       2026-07-02 12:10:27.701887630 -0700
++++ NetHack-5.0.0/include/unixconf.h    2026-07-02 14:39:23.278388406 -0700
+@@ -84,6 +84,7 @@
+  * system, define VAR_PLAYGROUND to be where the variable parts are kept.
+  */
+ /* #define VAR_PLAYGROUND "/var/lib/games/nethack" */
++#define VAR_PLAYGROUND "/var/games/nethack"
+ 
+ /*
+  * Define DEF_PAGER as your default pager, e.g. "/bin/cat" or "/usr/ucb/more"
+diff --color -Nur NetHack-5.0.0.orig/sys/unix/Makefile.doc NetHack-5.0.0/sys/unix/Makefile.doc

diff --git a/nethack.desktop b/nethack.desktop
deleted file mode 100644
index 39abe5c..0000000
--- a/nethack.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=NetHack
-Comment=Nethack is a single player dungeon exploration game
-Exec=nethack
-Icon=nethack.xpm
-Terminal=true
-Type=Application
-Encoding=UTF-8
-Categories=Application;Game;X-Fedora;

diff --git a/nethack.spec b/nethack.spec
index c639b05..23d7597 100644
--- a/nethack.spec
+++ b/nethack.spec
@@ -4,31 +4,23 @@
 %global fontname nethack-bitmap
 
 Name:           nethack
-Version:        3.6.7
-Release:        9%{?dist}
+Version:        5.0.0
+Release:        1%{?dist}
 Summary:        A rogue-like single player dungeon exploration game
 
 License:        NGPL
 URL:            https://nethack.org
-Source0:        https://www.nethack.org/download/3.6.7/nethack-367-src.tgz
-Source1:        %{name}.desktop
-Patch0:         %{name}-%{version}-makefile.patch
-Patch1:         %{name}-%{version}-top.patch
-Patch2:         %{name}-%{version}-config.patch
-Patch3:         %{name}-%{version}-guidebook.patch
-Patch4:         hackdir.patch
-Patch5:         %{name}-%{version}-xpm.patch
-Patch6:         modern_c.patch
-Requires:       %{fontname}-fonts-core
+Source0:        https://nethack.org/download/5.0.0/nethack-500-src.tgz
+Patch:          nethack-5.0.0-guidebook.patch
+Patch:          nethack-5.0.0-hackdir.patch
+Patch:          nethack-5.0.0-playground.patch
+Obsoletes:      nethack-bitmap-fonts <= 5.0.0-2
+Obsoletes:      nethack-bitmap-fonts-core <= 5.0.0-2
 
 BuildRequires:  make
 BuildRequires:  gcc
 BuildRequires:  ncurses-devel
-BuildRequires:  bison, flex, desktop-file-utils
-BuildRequires:  bdftopcf, mkfontdir, libX11-devel, libXaw-devel, libXext-devel
-BuildRequires:  libXmu-devel, libXpm-devel, libXt-devel
-BuildRequires:  fontpackages-devel
-BuildRequires:  bdftopcf
+BuildRequires:  lua-devel lua-static
 
 
 %description
@@ -47,52 +39,12 @@ and its denizens to be discovered by the player in one of a number of
 characters: you can pick your race, your role, and your gender.
 
 
-%package -n %{fontname}-fonts
-Summary:        Bitmap fonts for Nethack
-BuildArch:      noarch
-Requires:       fontpackages-filesystem
-
-
-%description -n %{fontname}-fonts
-Bitmap fonts for Nethack.
-
-
-%package -n %{fontname}-fonts-core
-Summary:         X11 core fonts configuration for %{fontname}
-BuildArch:      noarch
-Requires:        %{fontname}-fonts
-Requires(post):  %{fontname}-fonts
-Requires(post):  mkfontdir
-Requires(post):	 coreutils
-Requires(preun): coreutils
-
-
-%description -n %{fontname}-fonts-core
-X11 core fonts configuration for %{fontname}.
-
-
 %prep
-%setup -q -c -n nethack-3.6.7
-cd NetHack-3.6.7
-mv * ..
-cd ..
-rm -rf NetHack-3.6.7
-%dnl %patch0 -b .makefile
-%patch -P0 -b .makefile
-%patch -P1 -p0 
-%patch -P2 -b .config
-%patch -P3 -b .guidebook
-
-# Extra patches
-%patch -P4 -p1
+%autosetup -p1 -n NetHack-5.0.0
 
-%patch -P5 -b .xpm
-
-%patch -P6 -p1
-
-%{__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
-sh sys/unix/setup.sh sys/unix/hints/linux
+%{__sed} -i -e "s:PREFIX=\$(wildcard ~)/nh/install:PREFIX=/usr:" sys/unix/hints/linux.500
+%{__sed} -i -e "s:^\(HACKDIR=\).*:\1%{nhgamedir}:" sys/unix/hints/linux.500
+sh sys/unix/setup.sh sys/unix/hints/linux.500
 
 # Set our paths
 %{__sed} -i -e "s:^\(HACKDIR=\).*:\1%{nhgamedir}:" sys/unix/nethack.sh
@@ -102,15 +54,21 @@ sh sys/unix/setup.sh sys/unix/hints/linux
 %{__sed} -i -e "s:/usr/games/lib/nethackdir:%{nhgamedir}:" \
         doc/nethack.6 doc/nethack.txt doc/recover.6 doc/recover.txt
 
-# Point the linker in the right direction
-%{__sed} -i -e "s:-L/usr/X11R6/lib:-L/usr/X11R6/%{_lib}:" \
-        src/Makefile util/Makefile
-
 %build
-make all
+
+# Instead of downloading lua from the network and building it
+# just link to the fedora lua-static/lua-devel
+# Note that the version here doesn't matter
+mkdir -p lib/lua-5.4.8/src/
+cp -a %{_includedir}/lua.h lib/lua-5.4.8/src/
+cp -a %{_includedir}/lauxlib.h lib/lua-5.4.8/src/
+cp -a %{_includedir}/lualib.h lib/lua-5.4.8/src/
+cp -a %{_libdir}/liblua.a lib/lua-5.4.8/src/liblua.a
+
+export CFLAGS+="%{optflags}"
+%make_build WANT_WIN_TTY=1 WANT_WIN_CURSES=1
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %make_install \
         PREFIX=$RPM_BUILD_ROOT \
         HACKDIR=$RPM_BUILD_ROOT%{nhgamedir} \
@@ -123,70 +81,35 @@ rm -rf $RPM_BUILD_ROOT
 install -d -m 0755 $RPM_BUILD_ROOT%{_mandir}/man6
 make -C doc MANDIR=$RPM_BUILD_ROOT%{_mandir}/man6 manpages
 
-install -D -p -m 0644 win/X11/nh_icon.xpm \
-        $RPM_BUILD_ROOT%{_datadir}/pixmaps/nethack.xpm
-
-desktop-file-install \
-        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-        --add-category Game \
-        --add-category RolePlaying \
-        %{SOURCE1}
-
-# Install the fonts for the X11 interface
-cd win/X11
-bdftopcf -o nh10.pcf nh10.bdf
-bdftopcf -o ibm.pcf ibm.bdf
-install -m 0755 -d $RPM_BUILD_ROOT%{_fontdir}
-install -m 0644 -p *.pcf $RPM_BUILD_ROOT%{_fontdir}
-
-%{__sed} -i -e 's:^!\(NetHack.tile_file.*\):\1:' \
-        $RPM_BUILD_ROOT%{nhgamedir}/NetHack.ad
-
-%post -n %{fontname}-fonts-core
-mkfontdir %{_fontdir}
-if [ ! -L /etc/X11/fontpath.d/nethack ] ; then
-    ln -s %{_fontdir} /etc/X11/fontpath.d/nethack
-fi
-
-%preun -n %{fontname}-fonts-core
-if [ $1 -eq 0 ] ; then 
-    rm /etc/X11/fontpath.d/nethack
-    rm %{_fontdir}/fonts.dir
-fi;
-
+# drop duplicate license file
+rm -f $RPM_BUILD_ROOT%{nhgamedir}/license
 
 %files
-%doc doc/*.txt README dat/license dat/history
+%license dat/license
+%doc doc/*.txt README dat/history
 %doc dat/opthelp dat/wizhelp
 %{_mandir}/man6/*
-%{_datadir}/pixmaps/nethack.xpm
-%{_datadir}/applications/nethack.desktop
 %{_bindir}/nethack
-%{nhgamedir}
 %defattr(0664,root,games)
 %config(noreplace) %{nhdatadir}/record
 %config(noreplace) %{nhdatadir}/perm
 %config(noreplace) %{nhdatadir}/logfile
 %config(noreplace) %{nhdatadir}/xlogfile
+%config(noreplace) %{nhdatadir}/livelog
 %attr(0775,root,games) %dir %{nhdatadir}
 %attr(0775,root,games) %dir %{nhdatadir}/save
+%dir %{nhgamedir}
 %attr(2755,root,games) %{nhgamedir}/nethack
 %config(noreplace) %{nhgamedir}/nhdat
 %config(noreplace) %{nhgamedir}/sysconf
-%config(noreplace) %{nhgamedir}/NetHack.ad
-%config(noreplace) %{nhgamedir}/license
-%config(noreplace) %{nhgamedir}/pet_mark.xbm
 %config(noreplace) %attr(0555,root,games) %{nhgamedir}/recover
-%config(noreplace) %{nhgamedir}/rip.xpm
-%config(noreplace) %{nhgamedir}/pilemark.xbm
 %config(noreplace) %{nhgamedir}/symbols
-%config(noreplace) %{nhgamedir}/x11tiles
-
-%_font_pkg -n bitmap *.pcf
-
-%files -n %{fontname}-fonts-core
 
 %changelog
+* Tue Jul 07 2026 Kevin Fenzi <kevin@scrye.com> - 5.0.0-1
+- Update to 5.0.0. Fixes rhbz#2483160
+- Drop old X11 interface and bitmap fonts
+
 * Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.7-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
 

diff --git a/sources b/sources
index 8b081c2..b8140e4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nethack-367-src.tgz) = 7890d17e087f4344d30e9a908fa1f24d7c72bc714c4a6415ed59800902cc0aa6b3ce94c5d73857b0222349b96b1fdc8bf3f93b3ac1153477ad1419af7b0d3fb5
+SHA512 (nethack-500-src.tgz) = a668525d9030055a4b7a504ff6a6b028d4a6d6db5b79a1f1e716d60d40346c0e6d4ac281f393a6ae8aa0453103850bafc67882a75f0518fecc6225af5efda1db