Hello community, here is the log from the commit of package xonotic for openSUSE:Factory checked in at 2017-05-22 10:46:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xonotic (Old) and /work/SRC/openSUSE:Factory/.xonotic.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xonotic" Mon May 22 10:46:52 2017 rev:2 rq:495728 version:0.8.2 Changes: -------- --- /work/SRC/openSUSE:Factory/xonotic/xonotic.changes 2016-10-04 15:58:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xonotic.new/xonotic.changes 2017-05-22 10:47:52.877549923 +0200 @@ -1,0 +2,13 @@ +Mon May 8 13:25:10 UTC 2017 - [email protected] + +- Dropped upstream merged xonotic-makefile-multiarch.patch +- Cleanup of spec file, use bcond, removed parts for deprecated + openSUSE versions. + +------------------------------------------------------------------- +Thu May 4 02:13:05 UTC 2017 - [email protected] + +- Updated Xonotic to 0.8.2 + * see http://xonotic.org/posts/2017/xonotic-0-8-2-release/ + +------------------------------------------------------------------- Old: ---- xonotic-0.8.1.zip xonotic-makefile-multiarch.patch New: ---- xonotic-0.8.2.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xonotic.spec ++++++ --- /var/tmp/diff_new_pack.t6fUeQ/_old 2017-05-22 10:48:23.625216192 +0200 +++ /var/tmp/diff_new_pack.t6fUeQ/_new 2017-05-22 10:48:23.629215628 +0200 @@ -1,7 +1,7 @@ # # spec file for package xonotic # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,14 +16,9 @@ # -#define systemd for the new OpenSUSE only: -%if 0%{?suse_version} >= 1310 - %define with_systemd 1 -%else - %define with_systemd 0 -%endif +%bcond_without systemd Name: xonotic -Version: 0.8.1 +Version: 0.8.2 Release: 0 Summary: Fast-paced first person shooter License: GPL-2.0+ @@ -34,27 +29,21 @@ Source2: xonotic.service Source3: xonotic.init Source4: %{name}.changes -# PATCH-FEATURE-UPSTREAM xonotic-makefile-multiarch.patch -Patch0: xonotic-makefile-multiarch.patch BuildRequires: SDL2-devel BuildRequires: alsa-devel BuildRequires: d0_blind_id-devel +BuildRequires: libXpm-devel BuildRequires: libcurl-devel BuildRequires: libjpeg-devel BuildRequires: unzip +BuildRequires: update-desktop-files BuildRequires: xorg-x11-libXpm BuildRequires: xorg-x11-proto-devel BuildRequires: zlib-devel Requires: logrotate Requires: xonotic-data = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} -BuildRequires: update-desktop-files -%endif -%if 0%{?suse_version} >= 1140 -BuildRequires: libXpm-devel -%endif -%if %{with_systemd} +%if %{with systemd} BuildRequires: systemd-rpm-macros %endif @@ -66,7 +55,7 @@ Group: Amusements/Games/3D/Shoot Requires(pre): shadow Requires: xonotic-data = %{version} -%if %{with_systemd} +%if %{with systemd} %{?systemd_requires} %endif @@ -79,9 +68,7 @@ %package data Summary: Data for the xonotic first person shooter Group: Amusements/Games/3D/Shoot -%if 0%{?suse_version} >= 1220 BuildArch: noarch -%endif %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. @@ -90,7 +77,6 @@ %prep %setup -q -n Xonotic -%patch0 -p1 rm -rf misc/buildfiles/ # use system libs sed -i \ -e "/^EXE_/s:darkplaces:%{name}-%{version}:" \ @@ -112,7 +98,7 @@ -C source/darkplaces \ sv-release \ cl-release \ - sdl2-release + sdl-release %install mkdir -p %{buildroot}%{_bindir} @@ -136,7 +122,7 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/%{name} -%if %{with_systemd} +%if %{with systemd} install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}-server.service mkdir %{buildroot}%{_sbindir} ln -sv %{_unitdir}/%{name}-server.service %{buildroot}/%{_sbindir}/rc%{name}-server @@ -151,7 +137,7 @@ %endif %pre -n %{name}-server -%if %{with_systemd} +%if %{with systemd} %service_add_pre %{name}-server.service %endif @@ -163,21 +149,21 @@ # only 13.1 is able to work with service* commands: %post -n %{name}-server -%if %{with_systemd} +%if %{with systemd} %service_add_post %{name}-server.service %else %{fillup_and_insserv -n %{name}-server } %endif %preun -n %{name}-server -%if %{with_systemd} +%if %{with systemd} %service_del_preun %{name}-server.service %else %stop_on_removal %{name}-server %endif %postun -n %{name}-server -%if %{with_systemd} +%if %{with systemd} %service_del_postun %{name}-server.service %else %restart_on_update %{name}-server @@ -205,7 +191,7 @@ %files server %defattr(-,root,root,-) %attr(755,root,root) %{_bindir}/%{name}-dedicated -%if %{with_systemd} +%if %{with systemd} %{_unitdir}/%{name}-server.service %else %attr(755,root,root) /%{_initddir}/%{name}-server
