Accepting request 1291646 from games

OBS-URL: https://build.opensuse.org/request/show/1291646
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xonotic?expand=0&rev=14

xonotic.changes

@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Thu Jul 10 03:37:00 UTC 2025 - Carsten Ziepke <kieltux@gmail.com>
+
+- Force use of gcc13 for Leap 15.6, needed because the last change
+
+-------------------------------------------------------------------
+Thu Jul  3 09:24:52 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
+
+- Explicitly set -std=gnu17. (GCC15 switch to C23 by default,
+  which the code does not support.)
+
+-------------------------------------------------------------------
+Thu Mar 13 18:06:47 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
+
+- Replace old package names BuildRequires (we have not had
+  xorg-x11-libX* in a long time)
+
+-------------------------------------------------------------------
+Wed Feb  5 13:45:03 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
+
+- removed unneeded xorg-x11-proto-devel BuildRequires (bsc#1236804)
+
 -------------------------------------------------------------------
 Tue Feb  6 16:24:34 UTC 2024 - Carsten Ziepke <kieltux@gmail.com>
 

xonotic.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package xonotic
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,6 +16,11 @@
 #
 
 
+# Because "-std=gnu17" we need a c++17 compiler at least
+%if 0%{?sle_version} && 0%{?sle_version} < 160000
+%global force_gcc_version 13
+%endif
+
 %bcond_without systemd
 Name:           xonotic
 Version:        0.8.6
@@ -30,19 +35,19 @@ Source2:        xonotic.service
 Source3:        xonotic.init
 Source4:        %{name}.changes
 Source100:      xonotic.appdata.xml
-BuildRequires:  SDL2-devel
-BuildRequires:  alsa-devel
-BuildRequires:  d0_blind_id-devel
-BuildRequires:  libXpm-devel
-BuildRequires:  libXxf86vm-devel
+BuildRequires:  gcc%{?force_gcc_version}-c++
 BuildRequires:  libcurl-devel
-BuildRequires:  libjpeg-devel
 BuildRequires:  unzip
 BuildRequires:  update-desktop-files
-BuildRequires:  xorg-x11-libXext-devel
-BuildRequires:  xorg-x11-libXpm
-BuildRequires:  xorg-x11-proto-devel
-BuildRequires:  zlib-devel
+BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(d0_blind_id)
+BuildRequires:  pkgconfig(gl)
+BuildRequires:  pkgconfig(libjpeg)
+BuildRequires:  pkgconfig(sdl2)
+BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xpm)
+BuildRequires:  pkgconfig(xxf86vm)
+BuildRequires:  pkgconfig(zlib)
 Requires:       logrotate
 Requires:       xonotic-data = %{version}
 %if %{with systemd}
@@ -52,10 +57,11 @@ Provides:       group(%{name})
 Provides:       user(%{name})
 
 %description
-Fast-paced first-person shooter that works on Windows, OS X and Linux. The project is geared towards providing addictive arena shooter gameplay which is all spawned and driven by the community itself. Being a direct successor of the Nexuiz project with years of development between them, and it aims to become the best possible open-source FPS (first-person-shooter) of its kind.
+Fast-paced first-person shooter. It provides arena shooter gameplay
+and is a direct successor of the Nexuiz project.
 
 %package server
-Summary:        Dedicated xonotic server first person shooter
+Summary:        Dedicated server for the Xonotic first person shooter
 Group:          Amusements/Games/3D/Shoot
 Requires:       xonotic-data = %{version}
 Requires(pre):  shadow
@@ -64,10 +70,12 @@ Requires(pre):  shadow
 %endif
 
 %description server
-Xonotic is a free (GPL), fast-paced first-person shooter that works on Windows, OS X and Linux. The project is geared towards providing addictive arena shooter gameplay which is all spawned and driven by the community itself. Xonotic is a direct successor of the Nexuiz project with years of development between them, and it aims to become the best possible open-source FPS (first-person-shooter) of its kind.
+Fast-paced first-person shooter. It provides arena shooter gameplay
+and is a direct successor of the Nexuiz project.
 
-Server with dedicated xonotic running as services unter the specific user.
-service is handle via systemd or init - depends on your version.
+This subpackage contains the server with dedicated xonotic running as
+services unter the specific user. The service is handle via systemd or
+init, depending on your version.
 
 %package data
 Summary:        Data for the xonotic first person shooter
@@ -75,16 +83,18 @@ Group:          Amusements/Games/3D/Shoot
 BuildArch:      noarch
 
 %description data
-Xonotic is a free (GPL), fast-paced first-person shooter that works on Windows, OS X and Linux. The project is geared towards providing addictive arena shooter gameplay which is all spawned and driven by the community itself. Xonotic is a direct successor of the Nexuiz project with years of development between them, and it aims to become the best possible open-source FPS (first-person-shooter) of its kind.
+Fast-paced first-person shooter. It provides arena shooter gameplay
+and is a direct successor of the Nexuiz project.
 
-Data (textures, maps, sounds and models) required to play xonotic.
+This subpackage contains data (textures, maps, sounds and models)
+required to play xonotic.
 
 %prep
-%setup -q -n Xonotic
+%autosetup -n Xonotic -p1
 rm -rf misc/buildfiles/ # use system libs
 sed -i \
 		-e "/^EXE_/s:darkplaces:%{name}-%{version}:" \
-		-e "s:-O3:%{optflags}:" \
+		-e "s:-O3:%{optflags} -std=gnu17:" \
 		-e '/^STRIP/s/strip/true/' \
 		source/darkplaces/makefile.inc
 # do not include build time
@@ -94,8 +104,12 @@ TIME="\"$(date -d "${modified}" "+%%R")\""
 find .  -name '*.[ch]' | xargs sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g"
 
 %build
+%if 0%{?force_gcc_version}
+export CC="gcc-%{force_gcc_version}"
+export CXX="g++-%{force_gcc_version}"
+%endif
+
 %make_build \
-  %{?_smp_mflags} \
   DP_LINK_TO_LIBJPEG=1 \
   DP_LINK_CRYPTO=shared \
   DP_FS_BASEDIR="%{_datadir}/xonotic" \
@@ -140,7 +154,7 @@ mkdir -p  %{buildroot}%{_localstatedir}/lib/%{name}
  %suse_update_desktop_file -i %{name} Game ActionGame
 %endif
 
-%pre -n %{name}-server
+%pre server
 %if %{with systemd}
  %service_add_pre %{name}-server.service
 %endif
@@ -152,21 +166,21 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d %{_localstatedir}/l
 
 # only 13.1 is able to work with service* commands:
 
-%post -n %{name}-server
+%post server
 %if %{with systemd}
  %service_add_post %{name}-server.service
 %else
  %{fillup_and_insserv -n %{name}-server }
 %endif
 
-%preun -n %{name}-server
+%preun server
 %if %{with systemd}
  %service_del_preun %{name}-server.service
 %else
  %stop_on_removal %{name}-server
 %endif
 
-%postun -n %{name}-server
+%postun server
 %if %{with systemd}
  %service_del_postun %{name}-server.service
 %else