Architecture specific change in rpms/quake2.git

The package rpms/quake2.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/quake2.git/commit/?id=1dabfd6f960131....

Change:
-ExcludeArch:    armv7hl

Thanks.

Full change:
============

commit 1dabfd6f9601318c9f8cb05b400ccadde860a296
Author: Kalev Lember 
Date:   Mon Aug 29 00:57:20 2022 +0200

Drop armv7hl excludearch

The latest release builds just fine on arm.

diff --git a/quake2.spec b/quake2.spec
index 1e2c27a..aba22d7 100644
--- a/quake2.spec
+++ b/quake2.spec
@@ -20,7 +20,6 @@ BuildRequires:  mesa-libGL-devel
 BuildRequires:  openal-soft-devel
 BuildRequires:  SDL2-devel
 BuildRequires:  zlib-devel
-ExcludeArch:    armv7hl

%description
 This package contains the enhanced GPL YamagiQuake2 version of the Quake 2 
@@ -129,6 +128,7 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
 %changelog
 * Sun Aug 28 2022 Kalev Lember  - 8.10-1
 - Update to 8.10
+- Drop armv7hl excludearch

* Sat Jul 23 2022 Fedora Release Engineering  - 6.00-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

commit 7df1ea972969ccb3fba7a058a6860b8c4804d529
Author: Kalev Lember 
Date:   Mon Aug 29 00:52:42 2022 +0200

Sort BuildRequires one per line

diff --git a/quake2.spec b/quake2.spec
index 7bddeae..1e2c27a 100644
--- a/quake2.spec
+++ b/quake2.spec
@@ -10,10 +10,16 @@ URL:            http://www.yamagi.org/quake2
 Source0:        https://github.com/yquake2/yquake2/archive/QUAKE2_%%7Bver%7D.tar.gz
 Source1:        %{name}.desktop

+BuildRequires:  desktop-file-utils
 BuildRequires:  gcc
+BuildRequires:  libcurl-devel
+BuildRequires:  libogg-devel
+BuildRequires:  libvorbis-devel
 BuildRequires:  make
-BuildRequires:  mesa-libGL-devel,SDL2-devel,libogg-devel,libvorbis-devel
-BuildRequires:  openal-soft-devel,zlib-devel,desktop-file-utils,libcurl-devel
+BuildRequires:  mesa-libGL-devel
+BuildRequires:  openal-soft-devel
+BuildRequires:  SDL2-devel
+BuildRequires:  zlib-devel
 ExcludeArch:    armv7hl

%description

commit 0738b681f9a3ee97b11f286fdae56a140d2b3ab7
Author: Kalev Lember 
Date:   Mon Aug 29 00:51:48 2022 +0200

Trivial whitespace cleanup

diff --git a/quake2.spec b/quake2.spec
index 9c0c583..7bddeae 100644
--- a/quake2.spec
+++ b/quake2.spec
@@ -1,14 +1,17 @@
 %define ver 8_10
+
 Name:           quake2
 Version:        8.10
 Release:        1%{?dist}
 Summary:        Quake II (Yamagi version)
+
 License:        GPLv2 
 URL:            http://www.yamagi.org/quake2 
 Source0:        https://github.com/yquake2/yquake2/archive/QUAKE2_%%7Bver%7D.tar.gz
 Source1:        %{name}.desktop
-BuildRequires: make
+
 BuildRequires:  gcc
+BuildRequires:  make
 BuildRequires:  mesa-libGL-devel,SDL2-devel,libogg-devel,libvorbis-devel
 BuildRequires:  openal-soft-devel,zlib-devel,desktop-file-utils,libcurl-devel
 ExcludeArch:    armv7hl
@@ -66,6 +69,8 @@ rogue/gamex86.dll
 Copy the pak0.pak file and the video/ sub-directory from your Quake II 
 distribution (CD, Steam download, etc) into the baseq2/ sub-directory 
 of the extracted patch.
+
+
 %prep
 %autosetup -n yquake2-QUAKE2_%{ver}

@@ -76,8 +81,8 @@ of the extracted patch.
     WITH_SYSTEMWIDE=yes \
     WITH_SYSTEMDIR='%{_libdir}/games/%{name}'

-%install

+%install
 mkdir -p %{buildroot}%{_bindir}
 ln -rs %{_libdir}/games/%{name}/quake2 %{buildroot}%{_bindir}/quake2
 ln -rs %{_libdir}/games/%{name}/q2ded %{buildroot}%{_bindir}/q2ded
@@ -104,6 +109,7 @@ ln -rs %{_libdir}/games/%{name}/q2ded %{buildroot}%{_bindir}/q2ded
     %{buildroot}%{_defaultdocdir}/%{name}/examples/cdripper.sh
 desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}

+
 %files
 %license LICENSE
 %doc CHANGELOG README.md
@@ -113,6 +119,7 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
 %{_datadir}/applications/* 
 %{_defaultdocdir}/%{name}/*

+
 %changelog
 * Sun Aug 28 2022 Kalev Lember  - 8.10-1
 - Update to 8.10

commit 6ee5f5d2d31fe6ecb0e7d0225c74a2db5b5eb937
Author: Kalev Lember 
Date:   Mon Aug 29 00:33:51 2022 +0200

Update to 8.10

diff --git a/.gitignore b/.gitignore
index c51b085..4a57860 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /QUAKE2_5_34.tar.gz
 /QUAKE2_6_00.tar.gz
+/QUAKE2_8_10.tar.gz
diff --git a/allow-custom-cflags.patch b/allow-custom-cflags.patch
deleted file mode 100644
index c7826f1..0000000
--- a/allow-custom-cflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur yquake2-QUAKE2_5_34/Makefile new/Makefile
---- yquake2-QUAKE2_5_34/Makefile	2016-06-25 10:28:42.000000000 +0200
-+++ new/Makefile	2016-07-19 11:18:06.896494476 +0200
-@@ -154,7 +154,7 @@
- 		  -Wall -pipe -g -fwrapv
- CFLAGS += $(OSX_ARCH)
- else
--CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \
-+CFLAGS := $(CFLAGS) -O2 -fno-strict-aliasing -fomit-frame-pointer \
- 		  -Wall -pipe -g -ggdb -MMD -fwrapv
- endif
- 
diff --git a/quake2.spec b/quake2.spec
index 70352fa..9c0c583 100644
--- a/quake2.spec
+++ b/quake2.spec
@@ -1,19 +1,16 @@
-%define _legacy_common_support 1
-%define ver 6_00
+%define ver 8_10
 Name:           quake2
-Version:        6.00
-Release:        20%{?dist}
+Version:        8.10
+Release:        1%{?dist}
 Summary:        Quake II (Yamagi version)
 License:        GPLv2 
 URL:            http://www.yamagi.org/quake2 
 Source0:        https://github.com/yquake2/yquake2/archive/QUAKE2_%%7Bver%7D.tar.gz
 Source1:        %{name}.desktop
-Patch0:         allow-custom-cflags.patch
-Patch1:         remove-rpaths.patch
 BuildRequires: make
 BuildRequires:  gcc
 BuildRequires:  mesa-libGL-devel,SDL2-devel,libogg-devel,libvorbis-devel
-BuildRequires:  openal-soft-devel,zlib-devel,desktop-file-utils
+BuildRequires:  openal-soft-devel,zlib-devel,desktop-file-utils,libcurl-devel
 ExcludeArch:    armv7hl

%description
@@ -75,13 +72,28 @@ of the extracted patch.

%build
 %make_build \
+    WITH_RPATH=no \
     WITH_SYSTEMWIDE=yes \
     WITH_SYSTEMDIR='%{_libdir}/games/%{name}'

%install

-%{__install} -D -p -m 755 release/quake2 %{buildroot}%{_bindir}/quake2
-%{__install} -D -p -m 755 release/q2ded %{buildroot}%{_bindir}/q2ded
+mkdir -p %{buildroot}%{_bindir}
+ln -rs %{_libdir}/games/%{name}/quake2 %{buildroot}%{_bindir}/quake2
+ln -rs %{_libdir}/games/%{name}/q2ded %{buildroot}%{_bindir}/q2ded
+
+%{__install} -D -p -m 755 release/quake2 \
+    %{buildroot}%{_libdir}/games/%{name}/quake2
+%{__install} -D -p -m 755 release/q2ded \
+    %{buildroot}%{_libdir}/games/%{name}/q2ded
+%{__install} -D -p -m 755 release/ref_gl1.so \
+    %{buildroot}%{_libdir}/games/%{name}/ref_gl1.so
+%{__install} -D -p -m 755 release/ref_gl3.so \
+    %{buildroot}%{_libdir}/games/%{name}/ref_gl3.so
+%{__install} -D -p -m 755 release/ref_gles3.so \
+    %{buildroot}%{_libdir}/games/%{name}/ref_gles3.so
+%{__install} -D -p -m 755 release/ref_soft.so \
+    %{buildroot}%{_libdir}/games/%{name}/ref_soft.so
 %{__install} -D -p -m 755 release/baseq2/game.so \
     %{buildroot}%{_libdir}/games/%{name}/baseq2/game.so
 %{__install} -D -p -m 644 stuff/yq2.cfg \
@@ -94,7 +106,7 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}

%files
 %license LICENSE
-%doc CHANGELOG CONTRIBUTE README.md
+%doc CHANGELOG README.md
 %{_bindir}/*
 %{_libdir}/games/*
 %{_datadir}/icons/hicolor/512x512/apps/*
@@ -102,6 +114,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
 %{_defaultdocdir}/%{name}/*

%changelog
+* Sun Aug 28 2022 Kalev Lember  - 8.10-1
+- Update to 8.10
+
 * Sat Jul 23 2022 Fedora Release Engineering  - 6.00-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

diff --git a/remove-rpaths.patch b/remove-rpaths.patch
deleted file mode 100644
index f12bfb0..0000000
--- a/remove-rpaths.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- yquake2-QUAKE2_6_00/Makefile	2016-12-02 13:53:30.000000000 -0200
-+++ yquake2-QUAKE2_6_00/Makefile-fred	2017-02-04 16:25:54.997667308 -0200
-@@ -447,7 +447,7 @@
- ifeq ($(OSTYPE), FreeBSD)
- release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$$ORIGIN/lib'
- else ifeq ($(OSTYPE), Linux)
--release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$$ORIGIN/lib'
-+#release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$$ORIGIN/lib'
- endif
- 
- ifeq ($(WITH_SYSTEMWIDE),yes)
-@@ -455,13 +455,13 @@
- ifeq ($(OSTYPE), FreeBSD)
- release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$(WITH_SYSTEMDIR)/lib'
- else ifeq ($(OSTYPE), Linux)
--release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$(WITH_SYSTEMDIR)/lib'
-+#release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$(WITH_SYSTEMDIR)/lib'
- endif
- else
- ifeq ($(OSTYPE), FreeBSD)
- release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='/usr/share/games/quake2/lib'
- else ifeq ($(OSTYPE), Linux)
--release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='/usr/share/games/quake2/lib'
-+#release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='/usr/share/games/quake2/lib'
- endif
- endif
- endif
diff --git a/sources b/sources
index a372f1c..5f49e8e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (QUAKE2_6_00.tar.gz) = 3a129613f91ec069c6ea565ff9bbe49e5e117c1f026a6822eb1d085c14be7452daedb2ce8be41dbabe8f6e9b07dca47867a3dd9984c617e3bbf73498dc9a49d0
+SHA512 (QUAKE2_8_10.tar.gz) = 81a73bb2db04b99ef360b7281474c6dc6d0ca1ac49b415528e22c54fd334cc8ca82dfb2f6a1cafcc848ed6851a5fa02835cea64be139ecef352cd24e09b003f5

commit 5aa5f2c5b8f46add2082c664038725ed91420781
Author: Kalev Lember 
Date:   Mon Aug 29 00:42:45 2022 +0200

Rely on the build system automatically setting CFLAGS/LDFLAGS

https://fedoraproject.org/wiki/Changes/SetBuildFlagsBuildCheck

diff --git a/quake2.spec b/quake2.spec
index 4660744..70352fa 100644
--- a/quake2.spec
+++ b/quake2.spec
@@ -74,7 +74,7 @@ of the extracted patch.

%build
-CFLAGS="%{optflags}" %make_build \
+%make_build \
     WITH_SYSTEMWIDE=yes \
     WITH_SYSTEMDIR='%{_libdir}/games/%{name}'

commit 596cfc7b256da87bc2555dabbb8ddcc020ba0713
Author: Kalev Lember 
Date:   Mon Aug 29 00:40:54 2022 +0200

Drop duplicate %make_build invocation

diff --git a/quake2.spec b/quake2.spec
index b8b82c0..4660744 100644
--- a/quake2.spec
+++ b/quake2.spec
@@ -74,12 +74,10 @@ of the extracted patch.

%build
-CFLAGS="%{optflags}" make %{?_smp_mflags} \
+CFLAGS="%{optflags}" %make_build \
     WITH_SYSTEMWIDE=yes \
     WITH_SYSTEMDIR='%{_libdir}/games/%{name}'

-%make_build
-
 %install

%{__install} -D -p -m 755 release/quake2 %{buildroot}%{_bindir}/quake2

commit 88d21ce07c20e01586fb7ac8e96a835657791b49
Author: Fedora Release Engineering 
Date:   Sat Jul 23 00:18:37 2022 +0000

Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering

diff --git a/quake2.spec b/quake2.spec
index e0286cd..b8b82c0 100644
--- a/quake2.spec
+++ b/quake2.spec
@@ -2,7 +2,7 @@
 %define ver 6_00
 Name:           quake2
 Version:        6.00
-Release:        19%{?dist}
+Release:        20%{?dist}
 Summary:        Quake II (Yamagi version)
 License:        GPLv2 
 URL:            http://www.yamagi.org/quake2 
@@ -104,6 +104,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
 %{_defaultdocdir}/%{name}/*

%changelog
+* Sat Jul 23 2022 Fedora Release Engineering  - 6.00-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Fri Jan 21 2022 Fedora Release Engineering  - 6.00-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild