From f1daf6d7b13e14b94ced07aeed103c9be941686b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:18:35 +0000 Subject: [PATCH 01/11] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xblast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xblast.spec b/xblast.spec index 3a5cba3..bbe8fd6 100644 --- a/xblast.spec +++ b/xblast.spec @@ -1,6 +1,6 @@ Name: xblast Version: 2.10.4 -Release: 32%{?dist} +Release: 33%{?dist} Summary: Lay bombs and Blast the other players of the field (SDL version) License: GPLv2+ URL: http://xblast.sourceforge.net @@ -119,6 +119,9 @@ appstream-util validate-relax --nonet \ %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 2.10.4-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 2.10.4-32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 6e8309ddd8fb8abdf8816379e2ee4cc3e4067985 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:50:12 +0000 Subject: [PATCH 02/11] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xblast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xblast.spec b/xblast.spec index bbe8fd6..b017e29 100644 --- a/xblast.spec +++ b/xblast.spec @@ -1,6 +1,6 @@ Name: xblast Version: 2.10.4 -Release: 33%{?dist} +Release: 34%{?dist} Summary: Lay bombs and Blast the other players of the field (SDL version) License: GPLv2+ URL: http://xblast.sourceforge.net @@ -119,6 +119,9 @@ appstream-util validate-relax --nonet \ %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 2.10.4-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 2.10.4-33 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 4ec6438d601e0f3ff4504b0a7caf6dded0f3aa1f Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sat, 16 Jul 2022 17:44:20 +0200 Subject: [PATCH 03/11] Fix xblast-x11 crashing with BadFont error after using xblast-sdl (#2107144) --- xblast-2.10.4-font-config-fix.patch | 62 +++++++++++++++++++++++++++++ xblast.spec | 9 +++-- 2 files changed, 68 insertions(+), 3 deletions(-) create mode 100644 xblast-2.10.4-font-config-fix.patch diff --git a/xblast-2.10.4-font-config-fix.patch b/xblast-2.10.4-font-config-fix.patch new file mode 100644 index 0000000..8b699f5 --- /dev/null +++ b/xblast-2.10.4-font-config-fix.patch @@ -0,0 +1,62 @@ +diff -up xblast-2.10.4/atom.c~ xblast-2.10.4/atom.c +--- xblast-2.10.4/atom.c~ 2006-02-09 22:21:22.000000000 +0100 ++++ xblast-2.10.4/atom.c 2022-07-16 17:36:05.151322538 +0200 +@@ -168,6 +168,7 @@ XBAtom atomRight; + XBAtom atomRightKeyboard; + XBAtom atomScrambleDel; + XBAtom atomScrambleDraw; ++XBAtom atomSDL; + XBAtom atomSelect; + XBAtom atomServer; + XBAtom atomShape; +@@ -373,6 +374,7 @@ InitDefaultAtoms (void) + atomRightKeyboard = GUI_StringToAtom ("rightKeyboard"); + atomScrambleDel = GUI_StringToAtom ("scrambleDel"); + atomScrambleDraw = GUI_StringToAtom ("scrambleDraw"); ++ atomSDL = GUI_StringToAtom ("sdl"); + atomSelect = GUI_StringToAtom ("select"); + atomServer = GUI_StringToAtom ("server"); + atomShape = GUI_StringToAtom ("shape"); +diff -up xblast-2.10.4/atom.h~ xblast-2.10.4/atom.h +--- xblast-2.10.4/atom.h~ 2006-02-09 22:21:22.000000000 +0100 ++++ xblast-2.10.4/atom.h 2022-07-16 17:36:05.687320493 +0200 +@@ -163,6 +163,7 @@ extern XBAtom atomRight; + extern XBAtom atomRightKeyboard; + extern XBAtom atomScrambleDel; + extern XBAtom atomScrambleDraw; ++extern XBAtom atomSDL; + extern XBAtom atomSelect; + extern XBAtom atomServer; + extern XBAtom atomShape; +diff -up xblast-2.10.4/sdl_config.c~ xblast-2.10.4/sdl_config.c +--- xblast-2.10.4/sdl_config.c~ 2006-02-09 22:21:24.000000000 +0100 ++++ xblast-2.10.4/sdl_config.c 2022-07-16 17:36:30.294228033 +0200 +@@ -149,7 +149,7 @@ GetColorConfig (void) + void + GUI_LoadConfig (void) + { +- dbGui = DB_Create (DT_Config, atomX11); ++ dbGui = DB_Create (DT_Config, atomSDL); + assert (dbGui != NULL); + if (DB_Load (dbGui)) { + return; +diff -up xblast-2.10.4/x11_config.c~ xblast-2.10.4/x11_config.c +--- xblast-2.10.4/x11_config.c~ 2006-02-09 22:21:25.000000000 +0100 ++++ xblast-2.10.4/x11_config.c 2022-07-16 17:33:34.640897215 +0200 +@@ -101,6 +101,16 @@ GetFontConfig (void) + DB_GetEntryString (section, atomSmall, &cfgFont.small); + DB_GetEntryString (section, atomMedium, &cfgFont.medium); + DB_GetEntryString (section, atomLarge, &cfgFont.large); ++ /* ++ * detect old SDL version which saved its settings (which ++ * are invalid for x11) to x11.cfg, in this case fall back ++ * to the default font settings. ++ */ ++ if (!strcmp (cfgFont.small, "14")) { ++ memcpy (&cfgFont, &defaultFontConfig, sizeof (CFGFont)); ++ StoreFontConfig (&cfgFont); ++ DB_Store (dbGui); ++ } + } + return &cfgFont; + } /* GetFontConfig */ diff --git a/xblast.spec b/xblast.spec index b017e29..9591a1b 100644 --- a/xblast.spec +++ b/xblast.spec @@ -1,6 +1,6 @@ Name: xblast Version: 2.10.4 -Release: 34%{?dist} +Release: 35%{?dist} Summary: Lay bombs and Blast the other players of the field (SDL version) License: GPLv2+ URL: http://xblast.sourceforge.net @@ -14,8 +14,8 @@ Source6: xblast.appdata.xml Patch0: xblast-2.10.4-sdl-fixes.patch Patch1: xblast-2.10.4-manpage.patch Patch2: xblast-2.10.4-fcommon-fix.patch -BuildRequires: make -BuildRequires: gcc +Patch3: xblast-2.10.4-font-config-fix.patch +BuildRequires: gcc make BuildRequires: libXt-devel gettext gawk desktop-file-utils SDL_gfx-devel BuildRequires: SDL_image-devel SDL_ttf-devel SDL_mixer-devel SDL_net-devel BuildRequires: libappstream-glib @@ -119,6 +119,9 @@ appstream-util validate-relax --nonet \ %changelog +* Sat Jul 16 2022 Hans de Goede - 2.10.4-35 +- Fix xblast-x11 crashing with BadFont error after using xblast-sdl (#2107144) + * Sat Jan 22 2022 Fedora Release Engineering - 2.10.4-34 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From f0c87d38c02889dbf683079cd743b0d962d227bc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:49:13 +0000 Subject: [PATCH 04/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xblast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xblast.spec b/xblast.spec index 9591a1b..e956d81 100644 --- a/xblast.spec +++ b/xblast.spec @@ -1,6 +1,6 @@ Name: xblast Version: 2.10.4 -Release: 35%{?dist} +Release: 36%{?dist} Summary: Lay bombs and Blast the other players of the field (SDL version) License: GPLv2+ URL: http://xblast.sourceforge.net @@ -119,6 +119,9 @@ appstream-util validate-relax --nonet \ %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 2.10.4-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jul 16 2022 Hans de Goede - 2.10.4-35 - Fix xblast-x11 crashing with BadFont error after using xblast-sdl (#2107144) From 46fc8fad2e7fe7af4eaf6a82e972132d3e828c91 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:10:52 +0000 Subject: [PATCH 05/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xblast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xblast.spec b/xblast.spec index e956d81..fa9b9e8 100644 --- a/xblast.spec +++ b/xblast.spec @@ -1,6 +1,6 @@ Name: xblast Version: 2.10.4 -Release: 36%{?dist} +Release: 37%{?dist} Summary: Lay bombs and Blast the other players of the field (SDL version) License: GPLv2+ URL: http://xblast.sourceforge.net @@ -119,6 +119,9 @@ appstream-util validate-relax --nonet \ %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 2.10.4-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 2.10.4-36 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 502fa1e811941e73d369f6deb813c824ffac8d04 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:33:06 +0000 Subject: [PATCH 06/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xblast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xblast.spec b/xblast.spec index fa9b9e8..eeb0fa4 100644 --- a/xblast.spec +++ b/xblast.spec @@ -1,6 +1,6 @@ Name: xblast Version: 2.10.4 -Release: 37%{?dist} +Release: 38%{?dist} Summary: Lay bombs and Blast the other players of the field (SDL version) License: GPLv2+ URL: http://xblast.sourceforge.net @@ -119,6 +119,9 @@ appstream-util validate-relax --nonet \ %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 2.10.4-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 2.10.4-37 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 013b49b06d4df79ad5492867aa879ddf344ef1bd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:21:37 +0000 Subject: [PATCH 07/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xblast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xblast.spec b/xblast.spec index eeb0fa4..78a6bdc 100644 --- a/xblast.spec +++ b/xblast.spec @@ -1,6 +1,6 @@ Name: xblast Version: 2.10.4 -Release: 38%{?dist} +Release: 39%{?dist} Summary: Lay bombs and Blast the other players of the field (SDL version) License: GPLv2+ URL: http://xblast.sourceforge.net @@ -119,6 +119,9 @@ appstream-util validate-relax --nonet \ %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 2.10.4-39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 2.10.4-38 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 992260e3d02f796cb5c5838fbd142d672d229c62 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:44:47 +0000 Subject: [PATCH 08/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xblast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xblast.spec b/xblast.spec index 78a6bdc..1bdbd8f 100644 --- a/xblast.spec +++ b/xblast.spec @@ -1,6 +1,6 @@ Name: xblast Version: 2.10.4 -Release: 39%{?dist} +Release: 40%{?dist} Summary: Lay bombs and Blast the other players of the field (SDL version) License: GPLv2+ URL: http://xblast.sourceforge.net @@ -119,6 +119,9 @@ appstream-util validate-relax --nonet \ %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 2.10.4-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 2.10.4-39 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From f10b689a0cff3d0e2770bb2ec452abe93d305c8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 03:46:04 +0200 Subject: [PATCH 09/11] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- xblast.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xblast.spec b/xblast.spec index 1bdbd8f..70c8d1a 100644 --- a/xblast.spec +++ b/xblast.spec @@ -1,8 +1,9 @@ Name: xblast Version: 2.10.4 -Release: 40%{?dist} +Release: 41%{?dist} Summary: Lay bombs and Blast the other players of the field (SDL version) -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://xblast.sourceforge.net Source0: http://downloads.sourceforge.net/xblast/xblast-%{version}.tar.gz Source1: xblast.sh @@ -119,6 +120,9 @@ appstream-util validate-relax --nonet \ %changelog +* Fri Jul 26 2024 Miroslav Suchý - 2.10.4-41 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 2.10.4-40 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 4162410a93c355ec720533c485428433867d59e2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:27:53 +0000 Subject: [PATCH 10/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- xblast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xblast.spec b/xblast.spec index 70c8d1a..1d38cb0 100644 --- a/xblast.spec +++ b/xblast.spec @@ -1,6 +1,6 @@ Name: xblast Version: 2.10.4 -Release: 41%{?dist} +Release: 42%{?dist} Summary: Lay bombs and Blast the other players of the field (SDL version) # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -120,6 +120,9 @@ appstream-util validate-relax --nonet \ %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 2.10.4-42 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 26 2024 Miroslav Suchý - 2.10.4-41 - convert license to SPDX From c2cbdd90c225d41b1eb64c81cdea3c96f55bd4c9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:38:49 +0000 Subject: [PATCH 11/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- xblast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xblast.spec b/xblast.spec index 1d38cb0..2f8cc13 100644 --- a/xblast.spec +++ b/xblast.spec @@ -1,6 +1,6 @@ Name: xblast Version: 2.10.4 -Release: 42%{?dist} +Release: 43%{?dist} Summary: Lay bombs and Blast the other players of the field (SDL version) # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -120,6 +120,9 @@ appstream-util validate-relax --nonet \ %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2.10.4-43 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 2.10.4-42 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild