From 6542641cf8eb82a44ddbb5a64aad274b71eb82e4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 12:38:15 +0000 Subject: [PATCH 01/25] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_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 499061d..add0053 100644 --- a/xonotic.spec +++ b/xonotic.spec @@ -7,7 +7,7 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: xonotic Version: 0.8.2 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ and LGPLv2+ and BSD URL: http://www.xonotic.org/ # Custom tarball: @@ -284,6 +284,9 @@ EOF %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 0.8.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 0.8.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From ecb0c7de3e82d68fa34518904ca337b3ee60100a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 04:25:55 +0000 Subject: [PATCH 02/25] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_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 add0053..5d56f1a 100644 --- a/xonotic.spec +++ b/xonotic.spec @@ -7,7 +7,7 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: xonotic Version: 0.8.2 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ and LGPLv2+ and BSD URL: http://www.xonotic.org/ # Custom tarball: @@ -284,6 +284,9 @@ EOF %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 0.8.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 0.8.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From c9349c92f9dc152956df3bd271c9dba83e61aeef Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 04:41:02 +0000 Subject: [PATCH 03/25] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_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 5d56f1a..9e322f5 100644 --- a/xonotic.spec +++ b/xonotic.spec @@ -7,7 +7,7 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: xonotic Version: 0.8.2 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ and LGPLv2+ and BSD URL: http://www.xonotic.org/ # Custom tarball: @@ -284,6 +284,9 @@ EOF %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 0.8.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 0.8.2-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From cd2c6acac984a34cb31aadf283b73d21d0e53e40 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:54:05 +0000 Subject: [PATCH 04/25] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_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 9e322f5..4928d6b 100644 --- a/xonotic.spec +++ b/xonotic.spec @@ -7,7 +7,7 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: xonotic Version: 0.8.2 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2+ and LGPLv2+ and BSD URL: http://www.xonotic.org/ # Custom tarball: @@ -284,6 +284,9 @@ EOF %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 0.8.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering - 0.8.2-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From e31d44923453bc84b836c28a2e13050435c6a705 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Tue, 8 Dec 2020 17:02:06 -0700 Subject: [PATCH 05/25] Fix alignment vs size diagnostic for gcc-11 --- xonotic-gcc11.patch | 28 ++++++++++++++++++++++++++++ xonotic.spec | 7 ++++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 xonotic-gcc11.patch diff --git a/xonotic-gcc11.patch b/xonotic-gcc11.patch new file mode 100644 index 0000000..04f5509 --- /dev/null +++ b/xonotic-gcc11.patch @@ -0,0 +1,28 @@ +diff --git a/dpsoftrast.c b/dpsoftrast.c +index 7f13246..35bf59d 100644 +--- a/darkplaces/dpsoftrast.c ++++ b/darkplaces/dpsoftrast.c +@@ -198,6 +198,14 @@ DPSOFTRAST_State_Triangle); + + #define DPSOFTRAST_DRAW_MAXSUBSPAN 16 + ++/* This structure is 16 byte aligned. We need its size suitably aligned as ++ well since we build arrays of this object. The easiest way to do that it ++ force alignment on a key field. That way we don't have to introduce ++ manual padding and compute the right amount. ++ ++ An even better solution would be to move the pointer to be the first ++ field, then ensure suitable alignment on startx. But I don't know ++ the code well enough to know if that's safe. */ + typedef ALIGN(struct DPSOFTRAST_State_Span_s + { + int triangle; // triangle this span was generated by +@@ -205,7 +213,7 @@ typedef ALIGN(struct DPSOFTRAST_State_Span_s + int y; // framebuffer y coord + int startx; // usable range (according to pixelmask) + int endx; // usable range (according to pixelmask) +- unsigned char *pixelmask; // true for pixels that passed depth test, false for others ++ __attribute__ ((aligned (16))) unsigned char *pixelmask; // true for pixels that passed depth test, false for others + int depthbase; // depthbuffer value at x (add depthslope*startx to get first pixel's depthbuffer value) + int depthslope; // depthbuffer value pixel delta + } diff --git a/xonotic.spec b/xonotic.spec index 4928d6b..5995701 100644 --- a/xonotic.spec +++ b/xonotic.spec @@ -7,7 +7,7 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: xonotic Version: 0.8.2 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2+ and LGPLv2+ and BSD URL: http://www.xonotic.org/ # Custom tarball: @@ -24,6 +24,7 @@ Source10: darkplaces-quake.sh Source11: darkplaces-quake.autodlrc Source12: darkplaces-quake.desktop Patch0: darkplaces-crypto.patch +Patch1: %{name}-gcc11.patch BuildRequires: gcc BuildRequires: alsa-lib-devel BuildRequires: desktop-file-utils @@ -121,6 +122,7 @@ cd .. tar -C darkplaces/ -xvf %{SOURCE2} %patch0 -p0 +%patch1 -p1 %build @@ -284,6 +286,9 @@ EOF %changelog +* Tue Dec 08 2020 Jeff Law - 0.8.2-12 +- Fix alignment vs size diagnostic for gcc-11 + * Wed Jul 29 2020 Fedora Release Engineering - 0.8.2-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 809d55f35e3b2b2b904aca6fc2fb003470e27000 Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Wed, 30 Dec 2020 19:51:40 +0100 Subject: [PATCH 06/25] Recommend d0_blind_id Signed-off-by: Igor Raits --- darkplaces-crypto.patch | 23 ----------------------- sources | 1 - xonotic.spec | 24 +++++++----------------- 3 files changed, 7 insertions(+), 41 deletions(-) delete mode 100644 darkplaces-crypto.patch diff --git a/darkplaces-crypto.patch b/darkplaces-crypto.patch deleted file mode 100644 index 4b55816..0000000 --- a/darkplaces-crypto.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -uNr darkplaces.orig/crypto.c darkplaces/crypto.c ---- darkplaces.orig/crypto.c 2015-01-13 19:56:14.000000000 +0300 -+++ darkplaces/crypto.c 2015-01-17 21:41:25.746541231 +0300 -@@ -103,7 +103,7 @@ - - #ifdef LINK_TO_CRYPTO - --#include -+#include "d0_blind_id/d0_blind_id.h" - - #define d0_blind_id_dll 1 - #define Crypto_OpenLibrary() true -diff -uNr darkplaces.orig/crypto-keygen-standalone.c darkplaces/crypto-keygen-standalone.c ---- darkplaces.orig/crypto-keygen-standalone.c 2015-01-13 19:56:14.000000000 +0300 -+++ darkplaces/crypto-keygen-standalone.c 2015-01-17 21:42:21.623844788 +0300 -@@ -1,6 +1,6 @@ - #define _GNU_SOURCE - --#include -+#include "d0_blind_id/d0_blind_id.h" - - #include - #include diff --git a/sources b/sources index d08e3f7..1079921 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (d0_blind_id-0.8.2.tar.xz) = ec167e1cde8eb888fe39fb2154de263c655e46e3e67efec9b4c224b0c413468610432867a7061385ad5e0ae3ecb3de7e0435642915c683d1164913b40a704095 SHA512 (darkplaces-0.8.2.tar.xz) = d94c98f05785d5c568e4890aa1030d23d35ed92c03067388bdaac5ff0febe12deae54c4e1b700bcbe84873a532053df8ccbdc8bad1d070c7091dae565d705682 diff --git a/xonotic.spec b/xonotic.spec index 5995701..69f69fd 100644 --- a/xonotic.spec +++ b/xonotic.spec @@ -7,7 +7,7 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: xonotic Version: 0.8.2 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2+ and LGPLv2+ and BSD URL: http://www.xonotic.org/ # Custom tarball: @@ -16,15 +16,12 @@ URL: http://www.xonotic.org/ # cd Xonotic/source/ # cp ../misc/logos/icons_png/xonotic_256.png darkplaces/ # tar -cf darkplaces-%{version}.tar.xz darkplaces/ -# tar -cf d0_blind_id-%{version}.tar.xz d0_blind_id/ Source0: darkplaces-%{version}.tar.xz Source1: %{name}.desktop -Source2: d0_blind_id-%{version}.tar.xz Source10: darkplaces-quake.sh Source11: darkplaces-quake.autodlrc Source12: darkplaces-quake.desktop -Patch0: darkplaces-crypto.patch -Patch1: %{name}-gcc11.patch +Patch0: %{name}-gcc11.patch BuildRequires: gcc BuildRequires: alsa-lib-devel BuildRequires: desktop-file-utils @@ -72,6 +69,7 @@ Version: %{dpver} # This is necessary as these libraries are loaded during runtime # and therefore it isn't picked up by RPM during build Requires: zlib libvorbis libjpeg curl +Recommends: d0_blind_id %description -n darkplaces DarkPlaces is a modified Quake engine. @@ -118,19 +116,10 @@ sed -i 's,MIRROR2,%{dqmirror2},g' $(basename %{SOURCE11}) 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 -cd .. -tar -C darkplaces/ -xvf %{SOURCE2} -%patch0 -p0 -%patch1 -p1 +%patch0 -p2 %build - -#pushd d0_blind_id -#%%configure --disable-rijndael --without-openssl -#make -#popd - export DP_FS_BASEDIR=%{_datadir}/xonotic #export DP_CRYPTO_STATIC_LIBDIR="." #export DP_CRYPTO_RIJNDAEL_STATIC_LIBDIR="." @@ -176,8 +165,6 @@ done install -Dpm 644 $(basename %{SOURCE11}) %{buildroot}%{_datadir}/darkplaces/quake.autodlrc -#install -Dpm 755 d0_blind_id/blind_id %{buildroot}%{_bindir}/blind_id - # Register as an application to be visible in the software center # # NOTE: It would be *awesome* if this file was maintained by the upstream @@ -286,6 +273,9 @@ EOF %changelog +* Wed Dec 30 2020 Igor Raits - 0.8.2-13 +- Implement support for generating & sending UUID + * Tue Dec 08 2020 Jeff Law - 0.8.2-12 - Fix alignment vs size diagnostic for gcc-11 From 4182b7baef6b625e445e8e0b8d7b5f003fb7ec9e Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 01:34:39 +0000 Subject: [PATCH 07/25] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- xonotic.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xonotic.spec b/xonotic.spec index 69f69fd..e49352f 100644 --- a/xonotic.spec +++ b/xonotic.spec @@ -22,6 +22,7 @@ Source10: darkplaces-quake.sh Source11: darkplaces-quake.autodlrc Source12: darkplaces-quake.desktop Patch0: %{name}-gcc11.patch +BuildRequires: make BuildRequires: gcc BuildRequires: alsa-lib-devel BuildRequires: desktop-file-utils From 7b3d1854604d9783d7b86484799edec420055796 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:13:29 +0000 Subject: [PATCH 08/25] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_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 e49352f..66e7530 100644 --- a/xonotic.spec +++ b/xonotic.spec @@ -7,7 +7,7 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: xonotic Version: 0.8.2 -Release: 13%{?dist} +Release: 14%{?dist} License: GPLv2+ and LGPLv2+ and BSD URL: http://www.xonotic.org/ # Custom tarball: @@ -274,6 +274,9 @@ EOF %changelog +* Thu Jan 28 2021 Fedora Release Engineering - 0.8.2-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Dec 30 2020 Igor Raits - 0.8.2-13 - Implement support for generating & sending UUID From bce6839680f18a8335073b4929772202e8ac5e29 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:46:41 +0000 Subject: [PATCH 09/25] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_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 66e7530..bf1d777 100644 --- a/xonotic.spec +++ b/xonotic.spec @@ -7,7 +7,7 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: xonotic Version: 0.8.2 -Release: 14%{?dist} +Release: 15%{?dist} License: GPLv2+ and LGPLv2+ and BSD URL: http://www.xonotic.org/ # Custom tarball: @@ -274,6 +274,9 @@ EOF %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 0.8.2-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jan 28 2021 Fedora Release Engineering - 0.8.2-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 0463f5d78754797db2b9fe291a8fe395e6ccb6b2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:19:36 +0000 Subject: [PATCH 10/25] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_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 bf1d777..f1e7aa9 100644 --- a/xonotic.spec +++ b/xonotic.spec @@ -7,7 +7,7 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: xonotic Version: 0.8.2 -Release: 15%{?dist} +Release: 16%{?dist} License: GPLv2+ and LGPLv2+ and BSD URL: http://www.xonotic.org/ # Custom tarball: @@ -274,6 +274,9 @@ EOF %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 0.8.2-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 0.8.2-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 4ea048b4c67e40783a099af6c3d8d1f5d16aa341 Mon Sep 17 00:00:00 2001 From: Daniel Rusek Date: Wed, 16 Feb 2022 21:26:23 +0000 Subject: [PATCH 11/25] Set PrefersNonDefaultGPU to true --- xonotic.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/xonotic.desktop b/xonotic.desktop index 233223c..70f4b2a 100644 --- a/xonotic.desktop +++ b/xonotic.desktop @@ -7,3 +7,4 @@ Exec=xonotic-sdl-wrapper Terminal=false Type=Application Categories=Game;ActionGame; +PrefersNonDefaultGPU=true From 9c07fc49b6ac9b00bf4d96af2296af6931838c5f Mon Sep 17 00:00:00 2001 From: Daniel Rusek Date: Thu, 24 Feb 2022 13:12:08 +0000 Subject: [PATCH 12/25] Add changelog entry for my previous commit --- xonotic.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xonotic.spec b/xonotic.spec index f1e7aa9..84861a8 100644 --- a/xonotic.spec +++ b/xonotic.spec @@ -7,7 +7,7 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: xonotic Version: 0.8.2 -Release: 16%{?dist} +Release: 17%{?dist} License: GPLv2+ and LGPLv2+ and BSD URL: http://www.xonotic.org/ # Custom tarball: @@ -274,6 +274,9 @@ EOF %changelog +* Thu Feb 24 2022 Daniel Rusek - 0.8.2-17 +- Set PrefersNonDefaultGPU to true + * Sat Jan 22 2022 Fedora Release Engineering - 0.8.2-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From b771161fa797b94b98f344786e7ba77d64cd0e83 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:21:42 +0000 Subject: [PATCH 13/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_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 84861a8..3c41a0b 100644 --- a/xonotic.spec +++ b/xonotic.spec @@ -7,7 +7,7 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: xonotic Version: 0.8.2 -Release: 17%{?dist} +Release: 18%{?dist} License: GPLv2+ and LGPLv2+ and BSD URL: http://www.xonotic.org/ # Custom tarball: @@ -274,6 +274,9 @@ EOF %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 0.8.2-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Feb 24 2022 Daniel Rusek - 0.8.2-17 - Set PrefersNonDefaultGPU to true From f01e647edace11fba2b25e67d6b81b10694de92b Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 29 Jul 2022 11:14:19 -0500 Subject: [PATCH 14/25] 0.8.5 --- .gitignore | 1 + sources | 2 +- xonotic.spec | 11 ++++++----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index f967ea1..118820c 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /darkplaces-0.8.1.tar.xz /d0_blind_id-0.8.2.tar.xz /darkplaces-0.8.2.tar.xz +/darkplaces-0.8.5.tar.xz diff --git a/sources b/sources index 1079921..bee71f3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (darkplaces-0.8.2.tar.xz) = d94c98f05785d5c568e4890aa1030d23d35ed92c03067388bdaac5ff0febe12deae54c4e1b700bcbe84873a532053df8ccbdc8bad1d070c7091dae565d705682 +SHA512 (darkplaces-0.8.5.tar.xz) = 03786c682036aa65dc39dcfcbd530cddc778a846df7a98c563396b5129d3eed0168fa47c1079cf4c06c0c1cd60c9e3924ee41ba8b9292835042eaf832c434fd4 diff --git a/xonotic.spec b/xonotic.spec index 3c41a0b..fdda6dd 100644 --- a/xonotic.spec +++ b/xonotic.spec @@ -6,8 +6,8 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: xonotic -Version: 0.8.2 -Release: 18%{?dist} +Version: 0.8.5 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ and BSD 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 -cf darkplaces-%{version}.tar.xz darkplaces/ +# tar -czf darkplaces-%{version}.tar.xz darkplaces/ Source0: darkplaces-%{version}.tar.xz Source1: %{name}.desktop Source10: darkplaces-quake.sh @@ -43,8 +43,6 @@ BuildRequires: zlib-devel Requires: xonotic-data = %{version} Requires: darkplaces = %{dpver}-%{release} Requires: opengl-games-utils -Obsoletes: nexuiz <= 2.5.2 -Provides: nexuiz = %{name}-%{version} %description Xonotic is a fast-paced, chaotic, and intense multiplayer first person shooter, @@ -274,6 +272,9 @@ EOF %changelog +* Fri Jul 29 2022 Gwyn Ciesla - 0.8.5-1 +- 0.8.5 + * Sat Jul 23 2022 Fedora Release Engineering - 0.8.2-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From d343c6244a93675a0ee2e9add3d79aed5cf78022 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 1 Aug 2022 08:47:05 -0500 Subject: [PATCH 15/25] Correct date --- xonotic.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xonotic.spec b/xonotic.spec index fdda6dd..464b66d 100644 --- a/xonotic.spec +++ b/xonotic.spec @@ -1,5 +1,5 @@ %global _hardened_build 1 -%global dpver 20170401 +%global dpver 20220627 %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 @@ -7,7 +7,7 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: xonotic Version: 0.8.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and LGPLv2+ and BSD URL: http://www.xonotic.org/ # Custom tarball: @@ -272,6 +272,9 @@ EOF %changelog +* Sun Jul 31 2022 Gwyn Ciesla - 0.8.5-2 +- Correct date. + * Fri Jul 29 2022 Gwyn Ciesla - 0.8.5-1 - 0.8.5 From c1fcce7e80523259d653eeb61b5cfc4693dc1afe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:42:00 +0000 Subject: [PATCH 16/25] 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 17/25] 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 18/25] 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 19/25] 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 20/25] 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 21/25] 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 22/25] 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 23/25] 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 24/25] 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 25/25] 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.