[rpms/mirrormagic] rawhide: Rebase mirrormagic to upstream version 3.3.1

[rpms/mirrormagic] rawhide: Rebase mirrormagic to upstream version 3.3.1

[Michal Schorm]

            A new commit has been pushed.

            Repo   : rpms/mirrormagic
            Branch : rawhide
            Commit : 198b16fe258675ebdbcf0dca34b3b52ce5f6c3b5
            Author : Michal Schorm <mschorm@redhat.com>
            Date   : 2026-07-14T21:52:42+02:00
            Stats  : +33/-103 in 6 file(s)
            URL    : https://src.fedoraproject.org/rpms/mirrormagic/c/198b16fe258675ebdbcf0dca34b3b52ce5f6c3b5?branch=rawhide

            Log:
            Rebase mirrormagic to upstream version 3.3.1

Upstream release dates: 3.0.0 (2018-04-10), 3.3.1 (2023-11-02).

Upstream changes (3.0.0 -> 3.3.1):
- All three Fedora patches merged upstream:
  'mirrormagic-3.0.0-yesno.patch' (Y/N key handling),
  'mirrormagic-3.0.0-fcommon-fix.patch' (-fcommon multiple definitions),
  'mirrormagic-3.0.0-c23.patch' (C23 compatibility)
- Build system changes: 'RO_GAME_DIR' replaced by 'BASE_PATH',
  'sdl2' make target removed (auto-detected), new bundled minizip
  for zip level support

Build adjustments:
- Update 'Source0' URL: upstream moved from '/unix/' to '/linux/' path
  with '-linux' suffix on tarball name
- Add 'zlib-devel' BuildRequires (new zip support via bundled minizip)
- Remove pre-built binary and bundled shared libraries in '%prep'
- Drop iconv CREDITS conversion (file is now UTF-8 upstream)
- URL updated to HTTPS

License: corrected to 'GPL-2.0-only'. The old 'GPL+' tag (present
since the original 2006 package) was always wrong — 'COPYING' has
always contained the GPL-2.0 text without an "or later" clause.
The automated SPDX conversion mechanically mapped 'GPL+' to
'GPL-1.0-or-later', which was equally wrong. This is a tag
correction, not an upstream license change.

Co-Authored-By: Claude AI <noreply@anthropic.com>

---
diff --git a/.gitignore b/.gitignore
index 9a96e20..f6a3a77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-mirrormagic-2.0.2.tar.gz
-/mirrormagic-3.0.0.tar.gz
+/*.tar.gz

diff --git a/mirrormagic-3.0.0-c23.patch b/mirrormagic-3.0.0-c23.patch
deleted file mode 100644
index 07dc846..0000000
--- a/mirrormagic-3.0.0-c23.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up mirrormagic-3.0.0/src/game_mm/mm_game.c~ mirrormagic-3.0.0/src/game_mm/mm_game.c
---- mirrormagic-3.0.0/src/game_mm/mm_game.c~	2018-04-10 21:44:08.000000000 +0200
-+++ mirrormagic-3.0.0/src/game_mm/mm_game.c	2026-01-24 13:12:44.540133749 +0100
-@@ -4323,7 +4323,7 @@ void LoadEngineSnapshotValues_MM()
-   energy_delay   = engine_snapshot_mm.energy_delay;
-   overload_delay = engine_snapshot_mm.overload_delay;
- 
--  RedrawPlayfield_MM(TRUE);
-+  RedrawPlayfield_MM();
- }
- 
- static int getAngleFromTouchDelta(int dx, int dy,  int base)

diff --git a/mirrormagic-3.0.0-fcommon-fix.patch b/mirrormagic-3.0.0-fcommon-fix.patch
deleted file mode 100644
index fba7d46..0000000
--- a/mirrormagic-3.0.0-fcommon-fix.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -up mirrormagic-3.0.0/src/game_sp/export.h~ mirrormagic-3.0.0/src/game_sp/export.h
---- mirrormagic-3.0.0/src/game_sp/export.h~	2018-04-10 21:44:08.000000000 +0200
-+++ mirrormagic-3.0.0/src/game_sp/export.h	2020-03-07 13:54:02.800674685 +0100
-@@ -174,6 +173,7 @@ extern struct LevelInfo_SP native_sp_lev
- extern struct GraphicInfo_SP graphic_info_sp_object[TILE_MAX][8];
- extern struct GraphicInfo_SP graphic_info_sp_player[MAX_PLAYERS][SPR_MAX][8];
- extern struct EngineSnapshotInfo_SP engine_snapshot_sp;
-+extern int GfxFrame[SP_MAX_PLAYFIELD_WIDTH][SP_MAX_PLAYFIELD_HEIGHT];
- 
- extern void sp_open_all();
- extern void sp_close_all();
-diff -up mirrormagic-3.0.0/src/game_sp/main_sp.h~ mirrormagic-3.0.0/src/game_sp/main_sp.h
---- mirrormagic-3.0.0/src/game_sp/main_sp.h~	2018-04-10 21:44:08.000000000 +0200
-+++ mirrormagic-3.0.0/src/game_sp/main_sp.h	2020-03-07 13:58:52.070062453 +0100
-@@ -70,7 +70,6 @@ extern Bitmap *bitmap_db_field_sp;
- extern int GfxElementLast[SP_MAX_PLAYFIELD_WIDTH][SP_MAX_PLAYFIELD_HEIGHT];
- extern int GfxGraphicLast[SP_MAX_PLAYFIELD_WIDTH][SP_MAX_PLAYFIELD_HEIGHT];
- extern int GfxGraphic[SP_MAX_PLAYFIELD_WIDTH][SP_MAX_PLAYFIELD_HEIGHT];
--extern int GfxFrame[SP_MAX_PLAYFIELD_WIDTH][SP_MAX_PLAYFIELD_HEIGHT];
- 
- 
- /* ------------------------------------------------------------------------- */
-diff -up mirrormagic-3.0.0/src/main.c~ mirrormagic-3.0.0/src/main.c
---- mirrormagic-3.0.0/src/main.c~	2018-04-10 21:44:08.000000000 +0200
-+++ mirrormagic-3.0.0/src/main.c	2020-03-07 13:54:13.953689635 +0100
-@@ -69,7 +69,6 @@ short			ExplodeDelay[MAX_LEV_FIELDX][MAX
- int			RunnerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
- int			PlayerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
- 
--int			GfxFrame[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
- int 			GfxRandom[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
- int 			GfxElement[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
- int			GfxAction[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-@@ -138,7 +137,6 @@ struct LevelInfo	level, level_template;
- struct PlayerInfo	stored_player[MAX_PLAYERS], *local_player = NULL;
- struct HiScore		highscore[MAX_SCORE_ENTRIES];
- struct TapeInfo		tape;
--struct SetupInfo	setup;
- struct GameInfo		game;
- struct GlobalInfo	global;
- struct BorderInfo	border;
-diff -up mirrormagic-3.0.0/src/main.h~ mirrormagic-3.0.0/src/main.h
---- mirrormagic-3.0.0/src/main.h~	2018-04-10 21:44:08.000000000 +0200
-+++ mirrormagic-3.0.0/src/main.h	2020-03-07 13:55:33.641796458 +0100
-@@ -3554,7 +3554,6 @@ extern short			ExplodeDelay[MAX_LEV_FIEL
- extern int			RunnerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
- extern int			PlayerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
- 
--extern int			GfxFrame[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
- extern int			GfxRandom[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
- extern int 			GfxElement[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
- extern int			GfxAction[MAX_LEV_FIELDX][MAX_LEV_FIELDY];

diff --git a/mirrormagic-3.0.0-yesno.patch b/mirrormagic-3.0.0-yesno.patch
deleted file mode 100644
index 855299a..0000000
--- a/mirrormagic-3.0.0-yesno.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up mirrormagic-3.0.0/src/tools.c~ mirrormagic-3.0.0/src/tools.c
---- mirrormagic-3.0.0/src/tools.c~	2018-04-10 21:44:08.000000000 +0200
-+++ mirrormagic-3.0.0/src/tools.c	2018-04-19 16:22:55.428555968 +0200
-@@ -4201,6 +4201,18 @@ static int RequestHandleEvents(unsigned
- 		result = 0;
- 		break;
- 
-+	      case KSYM_y:
-+	      case KSYM_Y:
-+		if (req_state & REQ_ASK)
-+		  result = 1;
-+		break;
-+
-+	      case KSYM_n:
-+	      case KSYM_N:
-+		if (req_state & REQ_ASK)
-+		  result = 0;
-+		break;
-+
- 	      default:
- 		HandleKeysDebug(key);
- 		break;

diff --git a/mirrormagic.spec b/mirrormagic.spec
index 80ebab8..eac4782 100644
--- a/mirrormagic.spec
+++ b/mirrormagic.spec
@@ -1,18 +1,16 @@
 Name:           mirrormagic
-Version:        3.0.0
-Release:        22%{?dist}
+Version:        3.3.1
+Release:        1%{?dist}
 Summary:        Puzzle game where you steer a beam of light using mirrors
-License:        GPL-1.0-or-later
-URL:            http://www.artsoft.org/mirrormagic/
-Source0:        http://www.artsoft.org/RELEASES/unix/%{name}/%{name}-%{version}.tar.gz
+License:        GPL-2.0-only
+URL:            https://www.artsoft.org/mirrormagic/
+Source0:        https://www.artsoft.org/RELEASES/linux/%{name}/%{name}-%{version}-linux.tar.gz
 Source1:        %{name}.desktop
 Source2:        %{name}.png
 Source3:        %{name}.appdata.xml
-Patch0:         %{name}-%{version}-yesno.patch
-Patch1:         %{name}-%{version}-fcommon-fix.patch
-Patch2:         %{name}-%{version}-c23.patch
 BuildRequires:  gcc make
 BuildRequires:  SDL2_image-devel SDL2_mixer-devel SDL2_net-devel
+BuildRequires:  zlib-devel
 BuildRequires:  libappstream-glib desktop-file-utils
 Requires:       hicolor-icon-theme
 
@@ -27,17 +25,18 @@ familiar from the games "Deflektor" and "Mindbender".
 %prep
 %autosetup -p1
 rm levels/Classic_Games/classic_mindbender/*.level.orig
-iconv -f ISO_8859-1 -t UTF8 CREDITS > CREDITS.tmp
-touch -r CREDITS CREDITS.tmp
-mv CREDITS.tmp CREDITS
+rm levels/Classic_Games/classic_mindbender/tapes/*.tape.orig
+# Remove pre-built binary and bundled libraries
+rm %{name}
+rm -r lib
 
 
 %build
 # parallel build has been disabled because for some unknown reason
 # it leads to unknown symbols during the linking of the mirrormagic binary
-make PROGBASE=%{name} RO_GAME_DIR=%{_datadir}/%{name} \
-  OPTIONS="$RPM_OPT_FLAGS -DUSE_USERDATADIR_FOR_COMMONDATA" \
-  EXTRA_LDFLAGS="$RPM_OPT_FLAGS $RPM_LD_FLAGS" sdl2
+make PROGBASE=%{name} BASE_PATH=%{_datadir}/%{name} \
+  OPTIONS="$RPM_OPT_FLAGS" \
+  EXTRA_LDFLAGS="$RPM_OPT_FLAGS $RPM_LD_FLAGS"
 
 
 %install
@@ -68,6 +67,24 @@ appstream-util validate-relax --nonet \
 
 
 %changelog
+* Tue Jul 14 2026 Michal Schorm <mschorm@redhat.com> - 3.3.1-1
+- Rebase to upstream version 3.3.1
+- Update 'Source0' URL: upstream moved from '/unix/' to '/linux/' path
+  and changed the tarball naming convention to include '-linux' suffix
+- Drop all three patches, merged upstream:
+  'mirrormagic-3.0.0-yesno.patch' (Y/N key handling),
+  'mirrormagic-3.0.0-fcommon-fix.patch' (-fcommon multiple definitions),
+  'mirrormagic-3.0.0-c23.patch' (C23 compatibility)
+- Update build flags: replace 'RO_GAME_DIR' with 'BASE_PATH',
+  drop removed 'sdl2' make target (now auto-detected),
+  drop unused '-DUSE_USERDATADIR_FOR_COMMONDATA' flag
+- Add 'zlib-devel' BuildRequires (new upstream zip support via bundled minizip)
+- Remove pre-built binary and bundled shared libraries in '%prep'
+- Drop iconv CREDITS conversion (file is now UTF-8 upstream)
+- Correct License to 'GPL-2.0-only' (COPYING contains GPL-2.0 text; the prior
+  'GPL-1.0-or-later' was a mechanical SPDX conversion from the old 'GPL+' tag)
+- Update URL to HTTPS
+
 * Sat Jan 24 2026 Hans de Goede <johannes.goede@oss.qualcomm.com> - 3.0.0-22
 - Fix FTBFS (rhbz#2340868, rhbz#2385191)
 

diff --git a/sources b/sources
index 5f7ad7e..cba026d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mirrormagic-3.0.0.tar.gz) = 4cec053bc78a10090a5f9cf678429fd3c927637c3299652de9914b4d8a19518c2e5e10d72bba56aff6a545bbf30e95874576be5b08978060cd59cdba1903de2a
+SHA512 (mirrormagic-3.3.1-linux.tar.gz) = 04f82a4f6616b9676cb493f7796e1ec43d71874d5f55286b3ae55539f1d5fb422cac35dc7d248b59af3142cf598e0c4212f9401654d7bf91e28c69c0839665a7