From c1fcce7e80523259d653eeb61b5cfc4693dc1afe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:42:00 +0000 Subject: [PATCH 01/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xonotic.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xonotic.spec b/xonotic.spec index 464b66d..fe92d7d 100644 --- a/xonotic.spec +++ b/xonotic.spec @@ -7,7 +7,7 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: xonotic Version: 0.8.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and LGPLv2+ and BSD URL: http://www.xonotic.org/ # Custom tarball: @@ -272,6 +272,9 @@ EOF %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 0.8.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sun Jul 31 2022 Gwyn Ciesla - 0.8.5-2 - Correct date. From 7b389d10d134fa39a1ee1ecbac3a1debbd64ad6d Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 1 Mar 2023 16:02:30 -0600 Subject: [PATCH 02/10] SPDX license --- xonotic.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xonotic.spec b/xonotic.spec index fe92d7d..4f9683c 100644 --- a/xonotic.spec +++ b/xonotic.spec @@ -7,8 +7,8 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: xonotic Version: 0.8.5 -Release: 3%{?dist} -License: GPLv2+ and LGPLv2+ and BSD +Release: 4%{?dist} +License: GPL-2.0-or-later and LGPL-2.0-or-later URL: http://www.xonotic.org/ # Custom tarball: # wget http://dl.xonotic.org/xonotic-%{version}.zip @@ -272,6 +272,9 @@ EOF %changelog +* Wed Mar 01 2023 Gwyn Ciesla - 0.8.5-4 +- migrated to SPDX license + * Sat Jan 21 2023 Fedora Release Engineering - 0.8.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 28847dfa81c808192f759557db6aba297a81c0e1 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 20 Jun 2023 14:41:58 -0500 Subject: [PATCH 03/10] 0.8.6 --- .gitignore | 1 + sources | 2 +- xonotic.spec | 15 ++++++++------- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 118820c..bc059e5 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /d0_blind_id-0.8.2.tar.xz /darkplaces-0.8.2.tar.xz /darkplaces-0.8.5.tar.xz +/darkplaces-0.8.6.tar.xz diff --git a/sources b/sources index bee71f3..ad0ac6c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (darkplaces-0.8.5.tar.xz) = 03786c682036aa65dc39dcfcbd530cddc778a846df7a98c563396b5129d3eed0168fa47c1079cf4c06c0c1cd60c9e3924ee41ba8b9292835042eaf832c434fd4 +SHA512 (darkplaces-0.8.6.tar.xz) = 4aaaa70891c499f25d4fddeaa9923fef1408f670fc34a0595a38d7eaae03e47fbcd3da8e7c2b035fcc8c1dd417e0369778b596fd8745198fe6f33feea1b6b64c diff --git a/xonotic.spec b/xonotic.spec index 4f9683c..2b6b369 100644 --- a/xonotic.spec +++ b/xonotic.spec @@ -1,13 +1,13 @@ %global _hardened_build 1 -%global dpver 20220627 +%global dpver 20230620 %global dqmirror1 http://distcache.freebsd.org/ports-distfiles/quake-data/quakesw-1.0.6.tar.gz %global dqmirror2 https://www.libsdl.org/projects/quake/data/quakesw-1.0.6.tar.gz Summary: Multiplayer, deathmatch oriented first person shooter Name: xonotic -Version: 0.8.5 -Release: 4%{?dist} +Version: 0.8.6 +Release: 1%{?dist} License: GPL-2.0-or-later and LGPL-2.0-or-later URL: http://www.xonotic.org/ # Custom tarball: @@ -15,7 +15,7 @@ URL: http://www.xonotic.org/ # unzip xonotic-%{version}.zip # cd Xonotic/source/ # cp ../misc/logos/icons_png/xonotic_256.png darkplaces/ -# tar -czf darkplaces-%{version}.tar.xz darkplaces/ +# tar -cJf darkplaces-%{version}.tar.xz darkplaces/ Source0: darkplaces-%{version}.tar.xz Source1: %{name}.desktop Source10: darkplaces-quake.sh @@ -52,8 +52,6 @@ focused on providing basic, old style deathmatches. Summary: Dedicated server for the Xonotic first person shooter Requires: xonotic-data = %{version} Requires: darkplaces-server = %{dpver}-%{release} -Obsoletes: nexuiz-server <= 2.5.2 -Provides: nexuiz-server = %{name}-%{version} %description server @@ -116,7 +114,7 @@ sed -i 's/\r//' darkplaces.txt sed -i 's,/usr/X11R6/,/usr/,g' makefile makefile.inc sed -i 's/nexuiz/xonotic/g' makefile makefile.inc -%patch0 -p2 +%patch -P 0 -p2 %build export DP_FS_BASEDIR=%{_datadir}/xonotic @@ -272,6 +270,9 @@ EOF %changelog +* Tue Jun 20 2023 Gwyn Ciesla - 0.8.6-1 +- 0.8.6 + * Wed Mar 01 2023 Gwyn Ciesla - 0.8.5-4 - migrated to SPDX license From 6e8d9ad79afd968e63d2b528d04e2ffa26c4d506 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:06:03 +0000 Subject: [PATCH 04/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xonotic.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xonotic.spec b/xonotic.spec index 2b6b369..1adc977 100644 --- a/xonotic.spec +++ b/xonotic.spec @@ -7,7 +7,7 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: xonotic Version: 0.8.6 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-or-later and LGPL-2.0-or-later URL: http://www.xonotic.org/ # Custom tarball: @@ -270,6 +270,9 @@ EOF %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0.8.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jun 20 2023 Gwyn Ciesla - 0.8.6-1 - 0.8.6 From 71c292e2101a7fc7f7d42609510e2deaa04cb794 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:56:51 +0000 Subject: [PATCH 05/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xonotic.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xonotic.spec b/xonotic.spec index 1adc977..5e98d2a 100644 --- a/xonotic.spec +++ b/xonotic.spec @@ -7,7 +7,7 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: xonotic Version: 0.8.6 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL-2.0-or-later and LGPL-2.0-or-later URL: http://www.xonotic.org/ # Custom tarball: @@ -270,6 +270,9 @@ EOF %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 0.8.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 0.8.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 9d0b414337644fd980691d053c98bcb9061dfa9b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:17:45 +0000 Subject: [PATCH 06/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xonotic.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xonotic.spec b/xonotic.spec index 5e98d2a..c8bf615 100644 --- a/xonotic.spec +++ b/xonotic.spec @@ -7,7 +7,7 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: xonotic Version: 0.8.6 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL-2.0-or-later and LGPL-2.0-or-later URL: http://www.xonotic.org/ # Custom tarball: @@ -270,6 +270,9 @@ EOF %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 0.8.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 0.8.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 5acf9c3c62da0d7f6414b2809a43089c17f6a4e9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:06:23 +0000 Subject: [PATCH 07/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- xonotic.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xonotic.spec b/xonotic.spec index c8bf615..fadbdb5 100644 --- a/xonotic.spec +++ b/xonotic.spec @@ -7,7 +7,7 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: xonotic Version: 0.8.6 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL-2.0-or-later and LGPL-2.0-or-later URL: http://www.xonotic.org/ # Custom tarball: @@ -270,6 +270,9 @@ EOF %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 0.8.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering - 0.8.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From b50b6a2874531c23d04fce600c03957e896a811f Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 3 Feb 2025 16:27:24 -0600 Subject: [PATCH 08/10] Fix FTBFS --- xonotic.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xonotic.spec b/xonotic.spec index fadbdb5..359b2ca 100644 --- a/xonotic.spec +++ b/xonotic.spec @@ -120,10 +120,10 @@ sed -i 's/nexuiz/xonotic/g' makefile makefile.inc export DP_FS_BASEDIR=%{_datadir}/xonotic #export DP_CRYPTO_STATIC_LIBDIR="." #export DP_CRYPTO_RIJNDAEL_STATIC_LIBDIR="." -make release OPTIM_RELEASE="$RPM_OPT_FLAGS" STRIP=: -make cl-xonotic OPTIM_RELEASE="$RPM_OPT_FLAGS" STRIP=: -make sdl-xonotic OPTIM_RELEASE="$RPM_OPT_FLAGS" STRIP=: -make sv-xonotic OPTIM_RELEASE="$RPM_OPT_FLAGS" STRIP=: +make release OPTIM_RELEASE="$RPM_OPT_FLAGS -std=gnu17" STRIP=: +make cl-xonotic OPTIM_RELEASE="$RPM_OPT_FLAGS -std=gnu17" STRIP=: +make sdl-xonotic OPTIM_RELEASE="$RPM_OPT_FLAGS -std=gnu17" STRIP=: +make sv-xonotic OPTIM_RELEASE="$RPM_OPT_FLAGS -std=gnu17" STRIP=: %install rm -rf %{buildroot} From eca22baae61b51566cbcbc202a2d59c640ddbb59 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 17 Feb 2025 11:13:34 -0600 Subject: [PATCH 09/10] Set PrefersNonDefaultGPU to false, BZ 2345949 --- xonotic.desktop | 1 - xonotic.spec | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xonotic.desktop b/xonotic.desktop index 70f4b2a..233223c 100644 --- a/xonotic.desktop +++ b/xonotic.desktop @@ -7,4 +7,3 @@ Exec=xonotic-sdl-wrapper Terminal=false Type=Application Categories=Game;ActionGame; -PrefersNonDefaultGPU=true diff --git a/xonotic.spec b/xonotic.spec index 359b2ca..23f55bc 100644 --- a/xonotic.spec +++ b/xonotic.spec @@ -7,7 +7,7 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: xonotic Version: 0.8.6 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL-2.0-or-later and LGPL-2.0-or-later URL: http://www.xonotic.org/ # Custom tarball: @@ -270,6 +270,9 @@ EOF %changelog +* Mon Feb 17 2025 Gwyn Ciesla - 0.8.6-6 +- Set PrefersNonDefaultGPU to false, BZ 2345949. + * Sun Jan 19 2025 Fedora Release Engineering - 0.8.6-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From ffa977e0e2dd3a90d78dfbaec1fc03476ef4067c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:58:42 +0000 Subject: [PATCH 10/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- xonotic.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xonotic.spec b/xonotic.spec index 23f55bc..e8b3e03 100644 --- a/xonotic.spec +++ b/xonotic.spec @@ -7,7 +7,7 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: xonotic Version: 0.8.6 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL-2.0-or-later and LGPL-2.0-or-later URL: http://www.xonotic.org/ # Custom tarball: @@ -270,6 +270,9 @@ EOF %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.8.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Feb 17 2025 Gwyn Ciesla - 0.8.6-6 - Set PrefersNonDefaultGPU to false, BZ 2345949.