[rpms/zork] epel8: 🔀 Merge branch 'rawhide' into epel8

[rpms/zork] epel8: 🔀 Merge branch 'rawhide' into epel8

[Justin Wheeler]

            A new commit has been pushed.

            Repo   : rpms/zork
            Branch : epel8
            Commit : 82b8491cda7225d1c108c573cfdbe5911fb06533
            Author : Justin Wheeler <jwheel@fedoraproject.org>
            Date   : 2026-06-30T00:37:12-04:00
            Stats  : +23/-19 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/zork/c/82b8491cda7225d1c108c573cfdbe5911fb06533?branch=epel8

            Log:
            🔀 Merge branch 'rawhide' into epel8

Here comes a new version of Zork!

Signed-off-by: Justin Wheeler <jwheel@fedoraproject.org>

---
diff --git a/.gitignore b/.gitignore
index 0749dd7..30501bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /zork-1.0.2.tar.gz
 /zork-1.0.3.tar.gz
+/zork-1.1.0.tar.gz

diff --git a/sources b/sources
index 11c813a..61464b3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (zork-1.0.3.tar.gz) = def2063a01880eac1fac97a9fb2b4539202f13f9e18ed96275e23d7f73fefa68eff1b62ac256065aaf7603ea4dae3d84488fe8c3757881eb25eea8795e7c7d6a
+SHA512 (zork-1.1.0.tar.gz) = e72082b4e2e3ff8a68588ce19409fa132921e16e4d15cfef84c9471b3ac989a4d1c251bf2518ddfa7770b803b7dfc40c264377d5a1310688551413b73471cb3d

diff --git a/zork-tweak-makefile.patch b/zork-tweak-makefile.patch
index 6a81080..6ed401d 100644
--- a/zork-tweak-makefile.patch
+++ b/zork-tweak-makefile.patch
@@ -1,5 +1,5 @@
 From ce241188ca387a42c3ab09454c881acfe30c955e Mon Sep 17 00:00:00 2001
-From: "Justin W. Flory" <git@jwf.io>
+From: "Justin Wheeler" <jwheel@fedoraproject.org>
 Date: Tue, 30 Apr 2019 15:36:07 -0400
 Subject: [PATCH 1/1] Makefile: Change compile options for Fedora RPM package
 
@@ -8,11 +8,9 @@ Subject: [PATCH 1/1] Makefile: Change compile options for Fedora RPM package
  dinit.c  | 2 +-
  2 files changed, 4 insertions(+), 4 deletions(-)
 
-diff --git a/Makefile b/Makefile
-index 88305ce..aae1916 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -42,7 +42,7 @@ TERMFLAG =
+@@ -42,7 +42,7 @@
  # Uncomment the following line if you want to have access to the game
  # debugging tool.  This is invoked by typing "gdt".  It is not much
  # use except for debugging.
@@ -21,8 +19,8 @@ index 88305ce..aae1916 100644
  
  # Compilation flags
  CFLAGS = -g #-static
-@@ -69,7 +69,7 @@ dungeon: $(OBJS) dtextc.dat
- 	$(CC) $(CFLAGS) -o zork $(OBJS) $(LIBS)
+@@ -70,7 +70,7 @@
+ 	$(CC) $(CFLAGS) -o zork $(OBJS) $(LDFLAGS) $(LIBS)
  
  install: zork dtextc.dat
 -	mkdir -p $(BINDIR) $(LIBDIR) $(MANDIR)/man6
@@ -30,7 +28,7 @@ index 88305ce..aae1916 100644
  	cp zork $(BINDIR)
  	cp dtextc.dat $(DATADIR)
  	cp dungeon.6 $(MANDIR)/man6/
-@@ -93,7 +93,7 @@ local.o: local.c funcs.h vars.h
+@@ -94,7 +94,7 @@
  	$(CC) $(CFLAGS) $(GDTFLAG) -c local.c
  
  supp.o: supp.c funcs.h vars.h
@@ -39,11 +37,9 @@ index 88305ce..aae1916 100644
  
  actors.o: funcs.h vars.h
  ballop.o: funcs.h vars.h
-diff --git a/dinit.c b/dinit.c
-index d687cf4..cda5878 100644
 --- a/dinit.c
 +++ b/dinit.c
-@@ -24,7 +24,7 @@ FILE *dbfile;
+@@ -24,7 +24,7 @@
  #define TEXTFILE "lib:dtextc.dat"
  #else /* ! __AMOS__ */
  #ifdef unix

diff --git a/zork.spec b/zork.spec
index 46c856f..ae81461 100644
--- a/zork.spec
+++ b/zork.spec
@@ -1,6 +1,6 @@
 Name:           zork
-Version:        1.0.3
-Release:        12%{?dist}
+Version:        1.1.0
+Release:        %autorelease
 Summary:        Public Domain original DUNGEON game (AKA, Zork)
 
 License:        LicenseRef-Fedora-Public-Domain
@@ -21,7 +21,6 @@ codebase is a C port derived from the FORTRAN source of Zork 2.6.
 
 
 %prep
-%global _hardened_build 1
 %autosetup
 
 %build
@@ -50,6 +49,14 @@ echo ".so dungeon.6" > %{buildroot}%{_mandir}/man6/zork.6
 
 
 %changelog
+* Tue Jun 30 2026 Justin Wheeler <jwheel@fedoraproject.org> - 1.1.0-1
+- Update to v1.1.0
+- Upstream bug fixes: out-of-bounds array access, missing unistd.h header,
+  localtime prototype, curses header preprocessor guard
+- Upstream build improvements: LDFLAGS support in Makefile
+- Migrate to %%autorelease
+- Remove unnecessary %%global _hardened_build 1 (default since F23)
+
 * Sun Feb 22 2026 Justin Wheeler <jwheel@fedoraproject.org> - 1.0.3-12
 - Fix FTBFS. Thanks @limb for the hotfix.
 - Upstream work ongoing for improved support with newer versions of the C programming language and compilers.
@@ -84,12 +91,12 @@ echo ".so dungeon.6" > %{buildroot}%{_mandir}/man6/zork.6
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
-* Tue Mar 02 2021 Justin W. Flory <jflory7@fedoraproject.org> - 1.0.3-1
+* Tue Mar 02 2021 Justin Wheeler <jwheel@fedoraproject.org> - 1.0.3-1
 - Fix reused integers from being optimized out.
 - Props to Jan Drögehoff (FAS: sentry) for sending this fix upstream to avoid carrying a Fedora-specific patch.
 - Remove grues.
 
-* Wed Feb 17 2021 Justin W. Flory <jflory7@fedoraproject.org> - 1.0.2-6
+* Wed Feb 17 2021 Justin Wheeler <jwheel@fedoraproject.org> - 1.0.2-6
 - Remove compiler optimization flag to workaround segfault while upstream change is assessed
 
 * Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-5
@@ -98,12 +105,12 @@ echo ".so dungeon.6" > %{buildroot}%{_mandir}/man6/zork.6
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
-* Tue Mar 03 2020 Justin W. Flory <jflory7@fedoraproject.org> - 1.0.2-3
+* Tue Mar 03 2020 Justin Wheeler <jwheel@fedoraproject.org> - 1.0.2-3
 - Add manpage alias for zork, to match binary executable
 - Add upstream 'history' file as a doc
 
-* Tue Apr 30 2019 Justin W. Flory <jflory7@fedoraproject.org> - 1.0.2-2
+* Tue Apr 30 2019 Justin Wheeler <jwheel@fedoraproject.org> - 1.0.2-2
 - Use Fedora CFLAGS during compilation
 
-* Mon Apr 29 2019 Justin W. Flory <jflory7@fedoraproject.org> - 1.0.2-1
+* Mon Apr 29 2019 Justin Wheeler <jwheel@fedoraproject.org> - 1.0.2-1
 - First zork package