public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Justin Wheeler <jwheel@fedoraproject.org>
To: git-commits@fedoraproject.org
Subject: [rpms/zork] epel9: ⬆️ spec: Update to v1.1.0
Date: Tue, 30 Jun 2026 04:34:58 GMT	[thread overview]
Message-ID: <178279409845.1.10451608562677632331.rpms-zork-ae6c087e4892@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/zork
            Branch : epel9
            Commit : ae6c087e4892b72dd57db27af5e079e34f5e6a41
            Author : Justin Wheeler <jwheel@fedoraproject.org>
            Date   : 2026-06-30T00:26:47-04:00
            Stats  : +17/-13 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/zork/c/ae6c087e4892b72dd57db27af5e079e34f5e6a41?branch=epel9

            Log:
            ⬆️ spec: Update to v1.1.0

Upstream v1.1.0 includes several bug fixes merged since v1.0.3: out-of-
bounds array access in preposition vocabulary, missing `unistd.h` header
include, incorrect `localtime` prototype, and a preprocessor guard for
the curses header. The `Makefile` also gained native `LDFLAGS` support.

Refreshed `zork-tweak-makefile.patch` against the new source — the
`LDFLAGS` addition shifted hunk context and caused `fuzz=0` failures in
Koji on the original patch. All four patch hunks remain necessary:
upstream's `-DTEXTFILE` flag in the Makefile is overridden by the
`#define` in `dinit.c`, so the source-level path fix is still required.

Migrated `Release` to `%autorelease` and removed the
`%global _hardened_build 1` macro (default since Fedora 23, and
misplaced inside `%prep` rather than at spec top).

Assisted-by: Claude Opus 4.6 (1M context)
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 d7ebd3f..6ed401d 100644
--- a/zork-tweak-makefile.patch
+++ b/zork-tweak-makefile.patch
@@ -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 dcaf3c0..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.

                 reply	other threads:[~2026-06-30  4:34 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178279409845.1.10451608562677632331.rpms-zork-ae6c087e4892@fedoraproject.org \
    --to=jwheel@fedoraproject.org \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox