From 050691e97424681bfafd85330d762c3481dde997 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 02:48:45 +0000 Subject: [PATCH 01/26] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vavoom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vavoom.spec b/vavoom.spec index edfc117..58ef7b9 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -1,6 +1,6 @@ Name: vavoom Version: 1.33 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port - meta package Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -250,6 +250,9 @@ install -p -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_mandir}/man6 %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 1.33-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 1.33-28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 6cad58b3621e9c950bab7b0f1fbac92ace21e35f Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Fri, 17 Jan 2020 15:50:25 -0700 Subject: [PATCH 02/26] - Make linespec explicitly to ensure it's built early enough as the generated Makefiles are missing dependencies --- vavoom.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/vavoom.spec b/vavoom.spec index 58ef7b9..881dfcc 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -1,6 +1,6 @@ Name: vavoom Version: 1.33 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port - meta package Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -165,6 +165,7 @@ sed -i "s|#define CONFIG_FILE.*|#define CONFIG_FILE \"%{_sysconfdir}/timidity.cf # source/CMakeLists.txt lacks dependencies to generate svnrev.h, force it make -C source revision_check +make linespec # no -j# because there are more dependency issues in source/CMakeLists.txt make VERBOSE=1 @@ -250,6 +251,10 @@ install -p -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_mandir}/man6 %changelog +* Fri Jan 17 2020 Jeff Law - 1.33-30 +- Make linespec explicitly to ensure it's built early enough + as the generated Makefiles are missing dependencies + * Sat Jul 27 2019 Fedora Release Engineering - 1.33-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 4b13e8247ff97002f4db3906e8db45f9d2f9e0d0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 02:57:29 +0000 Subject: [PATCH 03/26] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vavoom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vavoom.spec b/vavoom.spec index 881dfcc..59e736b 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -1,6 +1,6 @@ Name: vavoom Version: 1.33 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port - meta package Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -251,6 +251,9 @@ install -p -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_mandir}/man6 %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 1.33-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jan 17 2020 Jeff Law - 1.33-30 - Make linespec explicitly to ensure it's built early enough as the generated Makefiles are missing dependencies From 9b8a65d3890206faa6410b75b14451bf78474b63 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:33:55 +0000 Subject: [PATCH 04/26] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vavoom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vavoom.spec b/vavoom.spec index 59e736b..42632c5 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -1,6 +1,6 @@ Name: vavoom Version: 1.33 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port - meta package Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -251,6 +251,9 @@ install -p -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_mandir}/man6 %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1.33-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering - 1.33-31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 2c9993d21bee7bb90cba1fa1655521ef47c7b032 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 09:35:04 +0000 Subject: [PATCH 05/26] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vavoom.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vavoom.spec b/vavoom.spec index 42632c5..537b8f5 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -1,6 +1,6 @@ Name: vavoom Version: 1.33 -Release: 32%{?dist} +Release: 33%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port - meta package Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -251,6 +251,10 @@ install -p -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_mandir}/man6 %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 1.33-33 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 1.33-32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 324ae9e8d4f8218f18bf5b3ad16838590d12b4d7 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 24 Aug 2020 16:10:17 +0200 Subject: [PATCH 06/26] Fix FTBFS (rhbz#1865603) --- vavoom.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/vavoom.spec b/vavoom.spec index 537b8f5..cd24fae 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -1,6 +1,9 @@ +# vavoom's CMakefiles are a mess, force in-source building +%global _vpath_builddir . + Name: vavoom Version: 1.33 -Release: 33%{?dist} +Release: 34%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port - meta package Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -251,6 +254,9 @@ install -p -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_mandir}/man6 %changelog +* Mon Aug 24 2020 Hans de Goede - 1.33-34 +- Fix FTBFS (rhbz#1865603) + * Sat Aug 01 2020 Fedora Release Engineering - 1.33-33 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 7425b38a985ebd842c7917a10a9fc9ba438674e7 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 00:35:07 +0000 Subject: [PATCH 07/26] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- vavoom.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vavoom.spec b/vavoom.spec index cd24fae..aae030e 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -42,6 +42,7 @@ Patch8: vavoom-1.33-crash-on-exit.patch Patch9: vavoom-1.33-wxwidgets3.0.patch URL: http://vavoom-engine.com/ License: GPLv2+ +BuildRequires: make BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: SDL_mixer-devel SDL_net-devel libpng-devel libjpeg-devel From 581a93d908239124b885b0ed5425d23ff3492cf9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 22:55:29 +0000 Subject: [PATCH 08/26] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vavoom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vavoom.spec b/vavoom.spec index aae030e..1493b04 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -3,7 +3,7 @@ Name: vavoom Version: 1.33 -Release: 34%{?dist} +Release: 35%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port - meta package Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -255,6 +255,9 @@ install -p -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_mandir}/man6 %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.33-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Aug 24 2020 Hans de Goede - 1.33-34 - Fix FTBFS (rhbz#1865603) From d5f4421b3dbb10b5ae46c5aafc9dd7f9d3e343e5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:19:22 +0000 Subject: [PATCH 09/26] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vavoom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vavoom.spec b/vavoom.spec index 1493b04..e366d1d 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -3,7 +3,7 @@ Name: vavoom Version: 1.33 -Release: 35%{?dist} +Release: 36%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port - meta package Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -255,6 +255,9 @@ install -p -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_mandir}/man6 %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.33-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 1.33-35 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 64b5f0fbf82c74eb3e465876faf8d373387ba31b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:48:40 +0000 Subject: [PATCH 10/26] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vavoom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vavoom.spec b/vavoom.spec index e366d1d..9986e95 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -3,7 +3,7 @@ Name: vavoom Version: 1.33 -Release: 36%{?dist} +Release: 37%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port - meta package Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -255,6 +255,9 @@ install -p -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_mandir}/man6 %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1.33-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 1.33-36 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 98a696b6e9e983999206dcdf9457f8913ea11f03 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:42:10 +0000 Subject: [PATCH 11/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vavoom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vavoom.spec b/vavoom.spec index 9986e95..5082793 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -3,7 +3,7 @@ Name: vavoom Version: 1.33 -Release: 37%{?dist} +Release: 38%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port - meta package Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -255,6 +255,9 @@ install -p -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_mandir}/man6 %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.33-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 1.33-37 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From d45587682499938f2ed373bc80775d213d7cb4ef Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Thu, 4 Aug 2022 14:21:10 -0400 Subject: [PATCH 12/26] Rebuild with wxWidgets 3.2 --- vavoom.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vavoom.spec b/vavoom.spec index 5082793..193cd29 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -3,7 +3,7 @@ Name: vavoom Version: 1.33 -Release: 38%{?dist} +Release: 39%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port - meta package Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -47,7 +47,7 @@ BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: SDL_mixer-devel SDL_net-devel libpng-devel libjpeg-devel BuildRequires: libvorbis-devel mikmod-devel flac-devel openal-soft-devel -BuildRequires: libGLU-devel wxGTK3-devel desktop-file-utils cmake +BuildRequires: libGLU-devel wxGTK-devel desktop-file-utils cmake BuildRequires: libappstream-glib Requires: %{name}-engine = %{version}-%{release} Requires: %{name}-doom-shareware = %{version}-%{release} @@ -255,6 +255,9 @@ install -p -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_mandir}/man6 %changelog +* Thu Aug 04 2022 Scott Talbert - 1.33-39 +- Rebuild with wxWidgets 3.2 + * Sat Jul 23 2022 Fedora Release Engineering - 1.33-38 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 71adff22e7b56754ce38e6d2b6ea289ef8240b79 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Wed, 14 Sep 2022 17:24:10 -0500 Subject: [PATCH 13/26] Rebuilt for flac 1.4.0 Signed-off-by: Michel Alexandre Salim --- vavoom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vavoom.spec b/vavoom.spec index 193cd29..5e9632c 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -3,7 +3,7 @@ Name: vavoom Version: 1.33 -Release: 39%{?dist} +Release: 40%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port - meta package Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -255,6 +255,9 @@ install -p -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_mandir}/man6 %changelog +* Wed Sep 14 2022 Michel Alexandre Salim - 1.33-40 +- Rebuilt for flac 1.4.0 + * Thu Aug 04 2022 Scott Talbert - 1.33-39 - Rebuild with wxWidgets 3.2 From ec51a03b8ae298b03999ec69393e695a936836c2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:07:27 +0000 Subject: [PATCH 14/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vavoom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vavoom.spec b/vavoom.spec index 5e9632c..5ca2638 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -3,7 +3,7 @@ Name: vavoom Version: 1.33 -Release: 40%{?dist} +Release: 41%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port - meta package Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -255,6 +255,9 @@ install -p -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_mandir}/man6 %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1.33-41 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Sep 14 2022 Michel Alexandre Salim - 1.33-40 - Rebuilt for flac 1.4.0 From 2e3c3dfdb01a36645a5dd0bf462910259cbd876c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:26:09 +0000 Subject: [PATCH 15/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vavoom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vavoom.spec b/vavoom.spec index 5ca2638..ffe6e8e 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -3,7 +3,7 @@ Name: vavoom Version: 1.33 -Release: 41%{?dist} +Release: 42%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port - meta package Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -255,6 +255,9 @@ install -p -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_mandir}/man6 %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1.33-42 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 1.33-41 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 38f2219b5470a957f5ce0a14d00f01edb810e805 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:31:33 +0000 Subject: [PATCH 16/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- vavoom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vavoom.spec b/vavoom.spec index ffe6e8e..f0eb4fa 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -3,7 +3,7 @@ Name: vavoom Version: 1.33 -Release: 42%{?dist} +Release: 43%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port - meta package Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -255,6 +255,9 @@ install -p -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_mandir}/man6 %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 1.33-43 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 1.33-42 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From ea93dda5ceb67562a3a905286be9863cb98ff48d Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:49 +0200 Subject: [PATCH 17/26] Eliminate use of obsolete %patchN syntax (#2283636) --- vavoom.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/vavoom.spec b/vavoom.spec index f0eb4fa..ddee718 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -146,14 +146,14 @@ datafiles for you. %prep %setup -q -%patch0 -p1 -b .datadir -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch9 -p1 +%patch -P0 -p1 -b .datadir +%patch -P1 -p1 +%patch -P2 -p1 +%patch -P3 -p1 +%patch -P4 -p1 +%patch -P5 -p1 +%patch -P6 -p1 +%patch -P9 -p1 %build From 10b7fe1a32862c326df1297be80370bd0ea434a3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:35:23 +0000 Subject: [PATCH 18/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- vavoom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vavoom.spec b/vavoom.spec index ddee718..c6f5b4a 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -3,7 +3,7 @@ Name: vavoom Version: 1.33 -Release: 43%{?dist} +Release: 44%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port - meta package Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -255,6 +255,9 @@ install -p -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_mandir}/man6 %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1.33-44 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 1.33-43 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 3f74928682d8b4580122bacb2d62e10d9ab2cbab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 03:30:20 +0200 Subject: [PATCH 19/26] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- vavoom.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/vavoom.spec b/vavoom.spec index c6f5b4a..cc20d27 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -3,7 +3,7 @@ Name: vavoom Version: 1.33 -Release: 44%{?dist} +Release: 45%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port - meta package Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -41,7 +41,8 @@ Patch7: vavoom-1.33-cx11.patch Patch8: vavoom-1.33-crash-on-exit.patch Patch9: vavoom-1.33-wxwidgets3.0.patch URL: http://vavoom-engine.com/ -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later BuildRequires: make BuildRequires: gcc BuildRequires: gcc-c++ @@ -255,6 +256,9 @@ install -p -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_mandir}/man6 %changelog +* Fri Jul 26 2024 Miroslav Suchý - 1.33-45 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 1.33-44 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From c15f60433877b0dd2d2cfe4157416d77792ebbc0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:07:52 +0000 Subject: [PATCH 20/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- vavoom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vavoom.spec b/vavoom.spec index cc20d27..c134971 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -3,7 +3,7 @@ Name: vavoom Version: 1.33 -Release: 45%{?dist} +Release: 46%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port - meta package Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -256,6 +256,9 @@ install -p -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_mandir}/man6 %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1.33-46 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 26 2024 Miroslav Suchý - 1.33-45 - convert license to SPDX From 71965d34fca769d77e4bf52f8bfc9360235e2258 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 27 May 2025 17:30:51 +0200 Subject: [PATCH 21/26] Rebuilt for flac 1.5.0 --- vavoom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vavoom.spec b/vavoom.spec index c134971..dccb64b 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -3,7 +3,7 @@ Name: vavoom Version: 1.33 -Release: 46%{?dist} +Release: 47%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port - meta package Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -256,6 +256,9 @@ install -p -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_mandir}/man6 %changelog +* Tue May 27 2025 Jitka Plesnikova - 1.33-47 +- Rebuilt for flac 1.5.0 + * Sun Jan 19 2025 Fedora Release Engineering - 1.33-46 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 79cb848de45dab778946f7f9fa20983541ef1227 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:58:41 +0000 Subject: [PATCH 22/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- vavoom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vavoom.spec b/vavoom.spec index dccb64b..e15caf7 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -3,7 +3,7 @@ Name: vavoom Version: 1.33 -Release: 47%{?dist} +Release: 48%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port - meta package Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -256,6 +256,9 @@ install -p -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_mandir}/man6 %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.33-48 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue May 27 2025 Jitka Plesnikova - 1.33-47 - Rebuilt for flac 1.5.0 From f8e2205d1ce7d137491c89f5b08ef7cec9deb19e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:47:58 +0000 Subject: [PATCH 23/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- vavoom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vavoom.spec b/vavoom.spec index e15caf7..2c67f05 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -3,7 +3,7 @@ Name: vavoom Version: 1.33 -Release: 48%{?dist} +Release: 49%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port - meta package Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -256,6 +256,9 @@ install -p -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_mandir}/man6 %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 1.33-49 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 1.33-48 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From a124fbff3162ea96396d938a980e5b593e829126 Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Fri, 13 Feb 2026 15:54:59 +0100 Subject: [PATCH 24/26] Allow to build with CMake 4.0 (rhbz#2381629) - Force using Makefile generator (rhbz#2381152) --- vavoom.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/vavoom.spec b/vavoom.spec index 2c67f05..8c73905 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -3,7 +3,7 @@ Name: vavoom Version: 1.33 -Release: 49%{?dist} +Release: 50%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port - meta package Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -158,6 +158,11 @@ datafiles for you. %build +# Allow for CMake 4.0 +export CMAKE_POLICY_VERSION_MINIMUM=3.5 +# Build looks too complicated to allow building with Ninja +# Keep on using Makefile + %global _cmake_generator "Unix Makefiles" # Build with -std=gnu++98, c++11 causes issues on exit, likely due to # bad interactions with the new / delete overloading in vc_object.cpp export CXXFLAGS="$RPM_OPT_FLAGS -std=gnu++98 -fno-strict-aliasing -Wno-unused -Wno-unused-but-set-variable -Wno-unused-result -Wno-sign-compare -Wno-reorder" @@ -256,6 +261,10 @@ install -p -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_mandir}/man6 %changelog +* Fri Feb 13 2026 Cristian Le - 1.33-50 +- Allow to build with CMake 4.0 (rhbz#2381629) +- Force using Makefile generator (rhbz#2381152) + * Sat Jan 17 2026 Fedora Release Engineering - 1.33-49 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 72e3838ced798532ff29db18a65a7a5177bf2ce9 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 13 Feb 2026 16:47:46 +0100 Subject: [PATCH 25/26] Really fix build with cmake4 --- vavoom-1.33-cmake4.patch | 35 +++++++++++++++++++++++++++++++++++ vavoom.spec | 17 +++++------------ 2 files changed, 40 insertions(+), 12 deletions(-) create mode 100644 vavoom-1.33-cmake4.patch diff --git a/vavoom-1.33-cmake4.patch b/vavoom-1.33-cmake4.patch new file mode 100644 index 0000000..ac4e123 --- /dev/null +++ b/vavoom-1.33-cmake4.patch @@ -0,0 +1,35 @@ +diff -up vavoom-1.33/CMakeLists.txt~ vavoom-1.33/CMakeLists.txt +--- vavoom-1.33/CMakeLists.txt~ 2010-12-13 22:58:25.000000000 +0100 ++++ vavoom-1.33/CMakeLists.txt 2026-02-13 16:38:52.528113329 +0100 +@@ -2,10 +2,7 @@ project(vavoom) + + option(ENABLE_ZONE_DEBUG "Enable memory allocation debuging") + +-cmake_minimum_required(VERSION 2.4) +-if(COMMAND cmake_policy) +- cmake_policy(SET CMP0003 NEW) +-endif(COMMAND cmake_policy) ++cmake_minimum_required(VERSION 3.5) + + if(NOT DEFINED DATADIR) + set(DATADIR share/vavoom) +diff -up vavoom-1.33/basev/CMakeLists.txt~ vavoom-1.33/basev/CMakeLists.txt +--- vavoom-1.33/basev/CMakeLists.txt~ 2009-11-13 22:42:38.000000000 +0100 ++++ vavoom-1.33/basev/CMakeLists.txt 2026-02-13 16:38:00.031421478 +0100 +@@ -1,5 +1,5 @@ +-get_target_property(VLUMPY vlumpy LOCATION) +-get_target_property(ACC acc LOCATION) ++set (VLUMPY $) ++set (ACC $) + + add_subdirectory(common) + add_subdirectory(doom) +diff -up vavoom-1.33/progs/CMakeLists.txt~ vavoom-1.33/progs/CMakeLists.txt +--- vavoom-1.33/progs/CMakeLists.txt~ 2008-09-11 22:10:51.000000000 +0200 ++++ vavoom-1.33/progs/CMakeLists.txt 2026-02-13 16:36:57.736787137 +0100 +@@ -1,4 +1,4 @@ +-get_target_property(VCC vcc LOCATION) ++set (VCC $) + + add_subdirectory(common) + add_subdirectory(doom) diff --git a/vavoom.spec b/vavoom.spec index 8c73905..3c89aaf 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -36,10 +36,11 @@ Patch4: vavoom-1.33-default-iwaddir.patch Patch5: vavoom-1.33-gcc6.patch Patch6: vavoom-1.33-misc-fixes.patch # Incomplete patch to build with -std=c++11 not used as this crashes on exit -Patch7: vavoom-1.33-cx11.patch +#Patch7: vavoom-1.33-cx11.patch # Hack for crash on exit when building with -std=c++11, not used -Patch8: vavoom-1.33-crash-on-exit.patch +#Patch8: vavoom-1.33-crash-on-exit.patch Patch9: vavoom-1.33-wxwidgets3.0.patch +Patch10: vavoom-1.33-cmake4.patch URL: http://vavoom-engine.com/ # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -146,15 +147,7 @@ datafiles for you. %prep -%setup -q -%patch -P0 -p1 -b .datadir -%patch -P1 -p1 -%patch -P2 -p1 -%patch -P3 -p1 -%patch -P4 -p1 -%patch -P5 -p1 -%patch -P6 -p1 -%patch -P9 -p1 +%autosetup -p1 %build @@ -162,7 +155,7 @@ datafiles for you. export CMAKE_POLICY_VERSION_MINIMUM=3.5 # Build looks too complicated to allow building with Ninja # Keep on using Makefile - %global _cmake_generator "Unix Makefiles" +%global _cmake_generator "Unix Makefiles" # Build with -std=gnu++98, c++11 causes issues on exit, likely due to # bad interactions with the new / delete overloading in vc_object.cpp export CXXFLAGS="$RPM_OPT_FLAGS -std=gnu++98 -fno-strict-aliasing -Wno-unused -Wno-unused-but-set-variable -Wno-unused-result -Wno-sign-compare -Wno-reorder" From f79babc0733aa61c61884b09a6241aeacbd74e7e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:22:45 +0000 Subject: [PATCH 26/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- vavoom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vavoom.spec b/vavoom.spec index 3c89aaf..1085408 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -3,7 +3,7 @@ Name: vavoom Version: 1.33 -Release: 50%{?dist} +Release: 51%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port - meta package Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -254,6 +254,9 @@ install -p -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_mandir}/man6 %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 1.33-51 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Fri Feb 13 2026 Cristian Le - 1.33-50 - Allow to build with CMake 4.0 (rhbz#2381629) - Force using Makefile generator (rhbz#2381152)