From 27dd067d53b633d44aacc43095f4def682a7da9e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 05:39:35 +0000 Subject: [PATCH 01/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- crossfire.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index 83c6303..b4d072e 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Server for hosting crossfire games Group: Amusements/Games # All files GPLv2+ except server/daemon.c which also has MIT attributions @@ -374,6 +374,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.71.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 1.71.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 1789536df12cf0a283cef296fdd5185161fac95a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 19:17:19 +0000 Subject: [PATCH 02/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- crossfire.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index b4d072e..cca4598 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Server for hosting crossfire games Group: Amusements/Games # All files GPLv2+ except server/daemon.c which also has MIT attributions @@ -374,6 +374,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 1.71.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1.71.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 48c7c22953de8b6021f8c2dd9072f06f51de6668 Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Fri, 15 Dec 2017 12:36:09 +0100 Subject: [PATCH 03/39] Update Python 2 dependency declarations to new packaging standards --- crossfire.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/crossfire.spec b/crossfire.spec index cca4598..7aedfa8 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Server for hosting crossfire games Group: Amusements/Games # All files GPLv2+ except server/daemon.c which also has MIT attributions @@ -35,7 +35,7 @@ BuildRequires: checkpolicy perl-generators selinux-policy-devel hardlink BuildRequires: libXt-devel BuildRequires: libXext-devel BuildRequires: libXaw-devel -BuildRequires: python-devel +BuildRequires: python2-devel BuildRequires: autoconf flex Requires: %{name}-plugins @@ -374,6 +374,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Dec 15 2017 Iryna Shcherbina - 1.71.0-5 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Wed Aug 02 2017 Fedora Release Engineering - 1.71.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From a8084727f105bebe41a4229ff3c92d7569d23933 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 20 Jan 2018 23:06:35 +0100 Subject: [PATCH 04/39] Rebuilt for switch to libxcrypt --- crossfire.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index 7aedfa8..70fac5a 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Server for hosting crossfire games Group: Amusements/Games # All files GPLv2+ except server/daemon.c which also has MIT attributions @@ -374,6 +374,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jan 20 2018 Björn Esser - 1.71.0-6 +- Rebuilt for switch to libxcrypt + * Fri Dec 15 2017 Iryna Shcherbina - 1.71.0-5 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) From cd6738b00ed100bbfc6aaeebfc8843789e150e35 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 05:56:24 +0000 Subject: [PATCH 05/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- crossfire.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index 70fac5a..3dd41ce 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Server for hosting crossfire games Group: Amusements/Games # All files GPLv2+ except server/daemon.c which also has MIT attributions @@ -374,6 +374,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.71.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sat Jan 20 2018 Björn Esser - 1.71.0-6 - Rebuilt for switch to libxcrypt From 11bcf72f7475b9b22cf2428a3dcb8bdfb803f627 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 13 Feb 2018 23:10:57 +0100 Subject: [PATCH 06/39] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- crossfire.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index 3dd41ce..bfc5e96 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -29,7 +29,6 @@ Source10: logwatch.serviceconf.crossfire #Patch0: crossfire-1.10.0-log-login.patch #Patch1: crossfire-1.11.0-curl.patch Patch2: crossfire-1.71.0-snprintf-formatting.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: crossfire-maps BuildRequires: checkpolicy perl-generators selinux-policy-devel hardlink BuildRequires: libXt-devel From a87a4d77cce76bddec083f7e6df574940522b6d1 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 07:56:19 +0100 Subject: [PATCH 07/39] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- crossfire.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/crossfire.spec b/crossfire.spec index bfc5e96..dd053fb 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -309,9 +309,6 @@ fi -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root,-) From 439790c90d18b5af63856ad17f2c28cf5a27b40d Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:43 +0200 Subject: [PATCH 08/39] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- crossfire.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/crossfire.spec b/crossfire.spec index dd053fb..5c672fb 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -30,6 +30,7 @@ Source10: logwatch.serviceconf.crossfire #Patch1: crossfire-1.11.0-curl.patch Patch2: crossfire-1.71.0-snprintf-formatting.patch Requires: crossfire-maps +BuildRequires: gcc BuildRequires: checkpolicy perl-generators selinux-policy-devel hardlink BuildRequires: libXt-devel BuildRequires: libXext-devel From fa0e585f224e588b7b8bf3be66911fb47ebffde3 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 00:34:20 -0500 Subject: [PATCH 09/39] Remove needless use of %defattr --- crossfire.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/crossfire.spec b/crossfire.spec index 5c672fb..6dcdc6e 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -312,7 +312,6 @@ fi %files -%defattr(-,root,root,-) #%%{_bindir}/crossedit #%%{_bindir}/crossfire %{_bindir}/crossfire-server @@ -342,7 +341,6 @@ fi %doc README NEWS AUTHORS COPYING %files doc -%defattr(-,root,root,-) %doc doc/Developers doc/playbook* doc/scripts doc/spell-docs doc/spoiler doc/spoiler-html doc/*.txt #%files devel @@ -351,20 +349,16 @@ fi #%doc doc/plugins %files plugins -%defattr(-,root,root,-) %{_libdir}/%{name}/plugins %files client-images -%defattr(-,root,root,-) %{_datadir}/%{name}-client %files selinux -%defattr(-,root,root,-) %doc SELinux/*.?? %{_datadir}/selinux/*/%{name}.pp %files logwatch -%defattr(-,root,root,-) %{logwatch_conf}/logfiles/%{name}.conf %{logwatch_conf}/services/%{name}.conf %{logwatch_scripts}/services/%{name} From 8f8d27914211d343d7f31bd59e196bd0b75b4009 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 22:21:50 +0000 Subject: [PATCH 10/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- crossfire.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index 6dcdc6e..6b1885c 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Server for hosting crossfire games Group: Amusements/Games # All files GPLv2+ except server/daemon.c which also has MIT attributions @@ -365,6 +365,9 @@ fi %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 1.71.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 1.71.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From fea830cde7a481a06dcba962431f5ee3fbfc5507 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 14 Jan 2019 18:59:22 +0100 Subject: [PATCH 11/39] Rebuilt for libcrypt.so.2 (#1666033) --- crossfire.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index 6b1885c..8ea8a7f 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Server for hosting crossfire games Group: Amusements/Games # All files GPLv2+ except server/daemon.c which also has MIT attributions @@ -365,6 +365,9 @@ fi %changelog +* Mon Jan 14 2019 Björn Esser - 1.71.0-9 +- Rebuilt for libcrypt.so.2 (#1666033) + * Thu Jul 12 2018 Fedora Release Engineering - 1.71.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From ad92c456a36b51e47242035b9c2d245131053d3c Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:41 +0100 Subject: [PATCH 12/39] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- crossfire.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/crossfire.spec b/crossfire.spec index 8ea8a7f..3698f3f 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -11,7 +11,6 @@ Name: crossfire Version: 1.71.0 Release: 9%{?dist} Summary: Server for hosting crossfire games -Group: Amusements/Games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPLv2+ and MIT URL: http://crossfire.real-time.com @@ -61,7 +60,6 @@ public or private network. %package doc Summary: Documentation files for Crossfire -Group: Documentation # Don't require the base package. The docs can be used without the # base package, and in fact include docs for both the client and # server packages. @@ -77,14 +75,12 @@ Documentation files for the crossfire game. %package plugins Summary: Plugin modules for the crossfire game server -Group: Amusements/Games Requires: %{name} = %{version}-%{release} %description plugins Plugin modules for the crossfire game server. %package client-images Summary: Image cache for crossfire clients -Group: Amusements/Games # No version dependency for the client since the images are pretty # ignorant of the client version. Requires: crossfire-client @@ -94,7 +90,6 @@ don't have to be downloaded from the server. %package selinux Summary: SELinux policy files for crossfire -Group: Amusements/Games Requires: %{name} = %{version}-%{release} Requires: selinux-policy >= %{selinux_policyver} Requires(post): /usr/sbin/semodule /usr/sbin/semanage /sbin/fixfiles @@ -105,7 +100,6 @@ selinux policy files for the Crossfire game server %package logwatch Summary: logwatch scripts for the Crossfire game server -Group: Amusements/Games Requires: %{name} = %{version}-%{release} logwatch %description logwatch logwatch scripts for the Crossfire game server From a8a79c582ece16d5275a3689da090dc8bd8295b3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 16:26:34 +0000 Subject: [PATCH 13/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- crossfire.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index 3698f3f..f2db2c1 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPLv2+ and MIT @@ -359,6 +359,9 @@ fi %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 1.71.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Jan 14 2019 Björn Esser - 1.71.0-9 - Rebuilt for libcrypt.so.2 (#1666033) From 368ca45166c76446dc54b1ca8da0c5538d22795c Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 21 Mar 2019 08:16:36 +0000 Subject: [PATCH 14/39] Drop legacy bits, use %%license --- crossfire.spec | 53 ++++++++++++++------------------------------------ 1 file changed, 15 insertions(+), 38 deletions(-) diff --git a/crossfire.spec b/crossfire.spec index f2db2c1..10561d4 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,11 +9,12 @@ Name: crossfire Version: 1.71.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPLv2+ and MIT URL: http://crossfire.real-time.com + Source0: http://downloads.sourceforge.net/crossfire/%{name}-%{version}.tar.bz2 Source1: http://downloads.sourceforge.net/crossfire/%{name}-%{version}.arch.tar.bz2 Source2: crossfire.service @@ -38,15 +39,9 @@ BuildRequires: python2-devel BuildRequires: autoconf flex Requires: %{name}-plugins -#Requires(post): /sbin/chkconfig -#Requires(post): /sbin/service -#Requires(preun): /sbin/chkconfig -#Requires(preun): /sbin/service -#Requires(postun): /sbin/service -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units -Requires(post): systemd-sysv +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd Provides: crossfire-devel = %{version}-%{release} Obsoletes: crossfire-devel < %{version}-%{release} @@ -68,7 +63,6 @@ Documentation files for the crossfire game. #%package devel #Summary: Development files for writing crossfire plugins -#Group: Development/Libraries #Requires: %%{name} = %%{version}-%%{release} #%description devel #Development files for writing crossfire plugins. @@ -93,7 +87,7 @@ Summary: SELinux policy files for crossfire Requires: %{name} = %{version}-%{release} Requires: selinux-policy >= %{selinux_policyver} Requires(post): /usr/sbin/semodule /usr/sbin/semanage /sbin/fixfiles -Requires(preun): /sbin/service /usr/sbin/semodule /usr/sbin/semanage /sbin/fixfiles +Requires(preun): /usr/sbin/semodule /usr/sbin/semanage /sbin/fixfiles Requires(postun): /usr/sbin/semodule %description selinux selinux policy files for the Crossfire game server @@ -115,15 +109,15 @@ cp %{SOURCE5} %{SOURCE6} %{SOURCE7} SELinux mv arch/ lib/ -%{__sed} -i 's#\r##' utils/player_dl.pl.in +sed -i 's#\r##' utils/player_dl.pl.in # Don't use a hardcoded /tmp directory for building the image archive -%{__sed} -i "s#^\$TMPDIR=.*#\$TMPDIR=\"`pwd`\";#" lib/adm/collect_images.pl +sed -i "s#^\$TMPDIR=.*#\$TMPDIR=\"`pwd`\";#" lib/adm/collect_images.pl # Don't map stdio streams to / # This is fixed in CVS, but didn't make it into the 1.9.1 release. -%{__sed} -i 's# (void) open ("/", O_RDONLY);# (void) open ("/var/log/crossfire/crossfire.log", O_RDONLY);#' server/daemon.c +sed -i 's# (void) open ("/", O_RDONLY);# (void) open ("/var/log/crossfire/crossfire.log", O_RDONLY);#' server/daemon.c # Change the location of the tmp directory -%{__sed} -i "s@^#define TMPDIR \"/tmp\"@#define TMPDIR \"%{_var}/games/%{name}/tmp\"@" include/config.h +sed -i "s@^#define TMPDIR \"/tmp\"@#define TMPDIR \"%{_var}/games/%{name}/tmp\"@" include/config.h %build # Change the localstatedir so that the variable data files are @@ -148,8 +142,6 @@ popd cd lib && adm/collect_images.pl -archive %install -rm -rf $RPM_BUILD_ROOT - make DESTDIR=$RPM_BUILD_ROOT install # Install the client images @@ -229,7 +221,6 @@ useradd -r -g crossfire -d %{_datadir}/%{name} -s /sbin/nologin \ exit 0 %post -#/sbin/chkconfig --add crossfire if [ $1 -eq 1 ] ; then # Initial installation /bin/systemctl daemon-reload >/dev/null 2>&1 || : @@ -248,10 +239,6 @@ done /sbin/service %{name} condrestart > /dev/null 2>&1 || : %preun -#if [ "$1" -le "0" ]; then -# /sbin/service crossfire stop > /dev/null 2>&1 -# /sbin/chkconfig --del crossfire -#fi if [ $1 -eq 0 ] ; then # Package removal, not upgrade /bin/systemctl --no-reload disable crossfire.service > /dev/null 2>&1 || : @@ -261,8 +248,6 @@ fi %preun selinux if [ "$1" -lt "1" ] ; then - # Disable the policy and restart the daemon - /sbin/service %{name} condrestart > /dev/null 2>&1 || : # Unload the module /usr/sbin/semanage port -d -t %{name}_port_t -p tcp 13327 >/dev/null 2>&1 || : for variant in %{selinux_variants} ; do @@ -292,20 +277,11 @@ if [ "$1" -ge "1" ] ; then done fi -%triggerun -- crossfire < 1.60.0-2 -# Save the current service runlevel info -# User must manually run systemd-sysv-convert --apply crossfire -# to migrate them to systemd targets -/usr/bin/systemd-sysv-convert --save crossfire >/dev/null 2>&1 ||: - -# Run these because the SysV package being removed won't do them -/sbin/chkconfig --del crossfire >/dev/null 2>&1 || : -/bin/systemctl try-restart crossfire.service >/dev/null 2>&1 || : - - %files +%license COPYING +%doc README NEWS AUTHORS #%%{_bindir}/crossedit #%%{_bindir}/crossfire %{_bindir}/crossfire-server @@ -330,9 +306,7 @@ fi %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %{_mandir}/man6/* -#%%{_initrddir}/%%{name} %{_unitdir}/%{name}.service -%doc README NEWS AUTHORS COPYING %files doc %doc doc/Developers doc/playbook* doc/scripts doc/spell-docs doc/spoiler doc/spoiler-html doc/*.txt @@ -359,6 +333,9 @@ fi %changelog +* Wed Mar 20 2019 Peter Robinson 1.71.0-11 +- Drop legacy bits, use %%license + * Thu Jan 31 2019 Fedora Release Engineering - 1.71.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From e192c72d6aa67442539c494816dea6c0d195bf39 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 19 Jun 2019 08:21:57 -0500 Subject: [PATCH 15/39] Fix hardlink path. --- crossfire.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/crossfire.spec b/crossfire.spec index 10561d4..00801b5 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPLv2+ and MIT @@ -205,7 +205,7 @@ do done popd # Hardlink identical policy module packages together -/usr/sbin/hardlink -cv $RPM_BUILD_ROOT%{_datadir}/selinux +/usr/bin/hardlink -cv $RPM_BUILD_ROOT%{_datadir}/selinux # Install logwatch files install -pD -m 0644 %{SOURCE8} $RPM_BUILD_ROOT%{logwatch_conf}/logfiles/%{name}.conf @@ -333,7 +333,10 @@ fi %changelog -* Wed Mar 20 2019 Peter Robinson 1.71.0-11 +* Wed Jun 19 2019 Gwyn Ciesla - 1.71.0-12 +- Fix FTBFS due to hardlink path. + +* Wed Mar 20 2019 Peter Robinson - 1.71.0-11 - Drop legacy bits, use %%license * Thu Jan 31 2019 Fedora Release Engineering - 1.71.0-10 From 326fe61bbf6f4f6e1b14c153a4335808fb50a98b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 21:12:19 +0000 Subject: [PATCH 16/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- crossfire.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index 00801b5..822e877 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPLv2+ and MIT @@ -333,6 +333,9 @@ fi %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 1.71.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Wed Jun 19 2019 Gwyn Ciesla - 1.71.0-12 - Fix FTBFS due to hardlink path. From 1c4dcf4ee57b42fc7527a81c81fa249bc413fde7 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 6 Aug 2019 09:42:59 -0500 Subject: [PATCH 17/39] Switch to python3. --- crossfire.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/crossfire.spec b/crossfire.spec index 822e877..76f2bb0 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPLv2+ and MIT @@ -35,7 +35,7 @@ BuildRequires: checkpolicy perl-generators selinux-policy-devel hardlink BuildRequires: libXt-devel BuildRequires: libXext-devel BuildRequires: libXaw-devel -BuildRequires: python2-devel +BuildRequires: python3-devel BuildRequires: autoconf flex Requires: %{name}-plugins @@ -333,6 +333,9 @@ fi %changelog +* Tue Aug 06 2019 Gwyn Ciesla - 1.71.0-14 +- Python 3. + * Wed Jul 24 2019 Fedora Release Engineering - 1.71.0-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From de947a3ba262577375c3eb26c63b73007b9dc460 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 15 Aug 2019 10:09:40 -0500 Subject: [PATCH 18/39] Fix FTBFS. --- crossfire.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index 76f2bb0..6373e0c 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPLv2+ and MIT @@ -37,6 +37,7 @@ BuildRequires: libXext-devel BuildRequires: libXaw-devel BuildRequires: python3-devel BuildRequires: autoconf flex +BuildRequires: systemd-rpm-macros Requires: %{name}-plugins Requires(post): systemd @@ -333,6 +334,9 @@ fi %changelog +* Thu Aug 15 2019 Gwyn Ciesla - 1.71.0-15 +- Fix FTBTS + * Tue Aug 06 2019 Gwyn Ciesla - 1.71.0-14 - Python 3. From cceee0d0f0ef6a187ce2f693d4ee80879594a544 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 15:01:44 +0000 Subject: [PATCH 19/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- crossfire.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index 6373e0c..e997226 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPLv2+ and MIT @@ -334,6 +334,9 @@ fi %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 1.71.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Aug 15 2019 Gwyn Ciesla - 1.71.0-15 - Fix FTBTS From a3437922ccd7d98af31c32f22d846a8b1096b0b6 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 1 Apr 2020 11:46:01 +0200 Subject: [PATCH 20/39] Add perl(FileHandle) for build --- crossfire.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index e997226..390f2ca 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPLv2+ and MIT @@ -35,6 +35,7 @@ BuildRequires: checkpolicy perl-generators selinux-policy-devel hardlink BuildRequires: libXt-devel BuildRequires: libXext-devel BuildRequires: libXaw-devel +BuildRequires: perl(FileHandle) BuildRequires: python3-devel BuildRequires: autoconf flex BuildRequires: systemd-rpm-macros @@ -334,6 +335,9 @@ fi %changelog +* Wed Apr 01 2020 Jitka Plesnikova - 1.71.0-17 +- Add perl(FileHandle) for build + * Tue Jan 28 2020 Fedora Release Engineering - 1.71.0-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 0f0d6112f7550eff27d03fcc9db278270a8b0a85 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 14:44:56 +0000 Subject: [PATCH 21/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- crossfire.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index 390f2ca..a9b506c 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPLv2+ and MIT @@ -335,6 +335,9 @@ fi %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1.71.0-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Apr 01 2020 Jitka Plesnikova - 1.71.0-17 - Add perl(FileHandle) for build From 632c8250b51050abdab0b419a7e9bdaeb2c7f59c Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 17 Dec 2020 04:02:05 +0000 Subject: [PATCH 22/39] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- crossfire.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/crossfire.spec b/crossfire.spec index a9b506c..e8ba3db 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -39,6 +39,7 @@ BuildRequires: perl(FileHandle) BuildRequires: python3-devel BuildRequires: autoconf flex BuildRequires: systemd-rpm-macros +BuildRequires: make Requires: %{name}-plugins Requires(post): systemd From 5386b1010e77ac0018dcbc778ed6663d4c3a1963 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 02:43:29 +0000 Subject: [PATCH 23/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- crossfire.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index e8ba3db..e6c7e80 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPLv2+ and MIT @@ -336,6 +336,9 @@ fi %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.71.0-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 1.71.0-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From ef385fdb8d073c8b2bd88ba5c44aa76fd5f77484 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 20:08:15 +0000 Subject: [PATCH 24/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- crossfire.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index e6c7e80..2785eff 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPLv2+ and MIT @@ -336,6 +336,9 @@ fi %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 1.71.0-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 1.71.0-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 63e7d808a88fa51a8efd1c157c9bf85b973611ef Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 00:01:12 +0000 Subject: [PATCH 25/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- crossfire.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index 2785eff..75c2895 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPLv2+ and MIT @@ -336,6 +336,9 @@ fi %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.71.0-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 1.71.0-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 9ed1b23454408e7cf7419af935aa6e2eaac87b8b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 23:46:25 +0000 Subject: [PATCH 26/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- crossfire.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index 75c2895..53a2607 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPLv2+ and MIT @@ -336,6 +336,9 @@ fi %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 1.71.0-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 1.71.0-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 0b3c8103add781e649830d0becfbb6da738c52b2 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 3 Jan 2023 17:48:47 +0100 Subject: [PATCH 27/39] Apply upstream patch to fix C99 compatibility issue Related to: --- crossfire-c99.patch | 27 +++++++++++++++++++++++++++ crossfire.spec | 7 ++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 crossfire-c99.patch diff --git a/crossfire-c99.patch b/crossfire-c99.patch new file mode 100644 index 0000000..2978abd --- /dev/null +++ b/crossfire-c99.patch @@ -0,0 +1,27 @@ +Declare make_perma_dead and unmake_perma_dead in a shared header file, +so that they can be called from server/resurrection.c without an +implicit function declaration. This improves compatibility with +future compilers. + +Fixed upstream via: + +commit 0980e69c30ce0b04cc33d24daa9917c2ee9be665 +Author: partmedia +Date: Sun Apr 13 17:27:41 2014 +0000 + + Add missing prototypes for permadeath functions. + + git-svn-id: svn://svn.code.sf.net/p/crossfire/code/server/trunk@19336 282e97 +7c-c81d-0410-88c4-b93c2d0d6712 + +diff -ur crossfire-server-1.71.0.orig/include/account_char.h crossfire-server-1.71.0/include/account_char.h +--- crossfire-server-1.71.0.orig/include/account_char.h 2014-04-06 00:30:40.000000000 +0200 ++++ crossfire-server-1.71.0/include/account_char.h 2023-01-03 16:54:56.152855130 +0100 +@@ -36,4 +36,7 @@ + struct account_char_struct *next; + } Account_Char; + ++int make_perma_dead(object *op); ++int unmake_perma_dead(char *account, char *player); ++ + #endif /* OBJECT_H */ diff --git a/crossfire.spec b/crossfire.spec index 53a2607..a8f0bf9 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPLv2+ and MIT @@ -29,6 +29,7 @@ Source10: logwatch.serviceconf.crossfire #Patch0: crossfire-1.10.0-log-login.patch #Patch1: crossfire-1.11.0-curl.patch Patch2: crossfire-1.71.0-snprintf-formatting.patch +Patch3: crossfire-c99.patch Requires: crossfire-maps BuildRequires: gcc BuildRequires: checkpolicy perl-generators selinux-policy-devel hardlink @@ -107,6 +108,7 @@ logwatch scripts for the Crossfire game server #%%patch0 -p0 #%patch1 -p0 %patch2 -p0 +%patch3 -p1 mkdir SELinux cp %{SOURCE5} %{SOURCE6} %{SOURCE7} SELinux @@ -336,6 +338,9 @@ fi %changelog +* Tue Jan 03 2023 Florian Weimer - 1.71.0-23 +- C99 compatibility fix + * Wed Jul 20 2022 Fedora Release Engineering - 1.71.0-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 12ba86dd269705133504b397c12c3338957c651a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 00:41:50 +0000 Subject: [PATCH 28/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- crossfire.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index a8f0bf9..2b42809 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPLv2+ and MIT @@ -338,6 +338,9 @@ fi %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 1.71.0-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Jan 03 2023 Florian Weimer - 1.71.0-23 - C99 compatibility fix From 6c7501633d31db98da50f7489747b9f8580acb2b Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 1 Mar 2023 15:14:01 -0600 Subject: [PATCH 29/39] SPDX license --- crossfire.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/crossfire.spec b/crossfire.spec index 2b42809..002992b 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,10 +9,10 @@ Name: crossfire Version: 1.71.0 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions -License: GPLv2+ and MIT +License: GPL-2.0-or-later and MIT URL: http://crossfire.real-time.com Source0: http://downloads.sourceforge.net/crossfire/%{name}-%{version}.tar.bz2 @@ -338,6 +338,9 @@ fi %changelog +* Wed Mar 01 2023 Gwyn Ciesla = 1.71.0-25 +- migrated to SPDX license + * Thu Jan 19 2023 Fedora Release Engineering - 1.71.0-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 07c26b71f8c3c317895570d23fd7690e9b2ae083 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 16:37:15 +0000 Subject: [PATCH 30/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- crossfire.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index 002992b..9cdf55c 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPL-2.0-or-later and MIT @@ -338,6 +338,9 @@ fi %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 1.71.0-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Mar 01 2023 Gwyn Ciesla = 1.71.0-25 - migrated to SPDX license From b9675ea1af26fb64e67cd7c58eff5557e1ceb575 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 16:23:24 +0000 Subject: [PATCH 31/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- crossfire.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index 9cdf55c..97462cb 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPL-2.0-or-later and MIT @@ -338,6 +338,9 @@ fi %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 1.71.0-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 1.71.0-26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 4a98270256078811bb73247ce190c03e5e7e9f3d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 08:28:21 +0000 Subject: [PATCH 32/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- crossfire.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index 97462cb..48c5076 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPL-2.0-or-later and MIT @@ -338,6 +338,9 @@ fi %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 1.71.0-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 1.71.0-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 3bec5e2cb9d71ae392d875d152f29828023d9ab8 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:46 +0200 Subject: [PATCH 33/39] Eliminate use of obsolete %patchN syntax (#2283636) --- crossfire.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crossfire.spec b/crossfire.spec index 48c5076..260410f 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -107,8 +107,8 @@ logwatch scripts for the Crossfire game server %setup -q -a 1 -n crossfire-server-%{version} #%%patch0 -p0 #%patch1 -p0 -%patch2 -p0 -%patch3 -p1 +%patch -P2 -p0 +%patch -P3 -p1 mkdir SELinux cp %{SOURCE5} %{SOURCE6} %{SOURCE7} SELinux From ed7becff832bbbf12c0168e345df8ddc2e886514 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 20:13:35 +0000 Subject: [PATCH 34/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- crossfire.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index 260410f..eb7368a 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPL-2.0-or-later and MIT @@ -338,6 +338,9 @@ fi %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 1.71.0-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jan 24 2024 Fedora Release Engineering - 1.71.0-28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 5585ff381fc2110cb59acf51b2e3690064f1edee Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 14:54:02 +0000 Subject: [PATCH 35/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- crossfire.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index eb7368a..29e02c0 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPL-2.0-or-later and MIT @@ -338,6 +338,9 @@ fi %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 1.71.0-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jul 17 2024 Fedora Release Engineering - 1.71.0-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 3e9ef0ea5fb409740a9ac799a8c9fa4ea4ee9648 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 30 Jan 2025 14:44:37 -0600 Subject: [PATCH 36/39] Fix FTBFS --- crossfire.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index 29e02c0..b9b4921 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -131,7 +131,7 @@ sed -i "s@^#define TMPDIR \"/tmp\"@#define TMPDIR \"%{_var}/games/%{name}/tmp\"@ %configure --localstatedir=%{_var}/games --disable-static #make %%{?_smp_mflags} # parallel build is broken -make CFLAGS="$RPM_OPT_FLAGS" +make CFLAGS="$RPM_OPT_FLAGS -std=gnu17" # Build the selinux policy file pushd SELinux From adfe7d1822de9cc4dd161ff35bc93da647cabffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 1 Feb 2025 19:53:33 +0100 Subject: [PATCH 37/39] Add explicit BR: libxcrypt-devel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Esser --- crossfire.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index b9b4921..2a6e4d1 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPL-2.0-or-later and MIT @@ -41,6 +41,7 @@ BuildRequires: python3-devel BuildRequires: autoconf flex BuildRequires: systemd-rpm-macros BuildRequires: make +BuildRequires: libxcrypt-devel Requires: %{name}-plugins Requires(post): systemd @@ -338,6 +339,9 @@ fi %changelog +* Sat Feb 01 2025 Björn Esser - 1.71.0-31 +- Add explicit BR: libxcrypt-devel + * Thu Jan 16 2025 Fedora Release Engineering - 1.71.0-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From a73499003bb6a305766696d6f4ba7726c886f329 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 14:36:22 +0100 Subject: [PATCH 38/39] Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. --- crossfire.spec | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/crossfire.spec b/crossfire.spec index 2a6e4d1..4bd6c31 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPL-2.0-or-later and MIT @@ -125,6 +125,11 @@ sed -i 's# (void) open ("/", O_RDONLY);# (void) open ("/var/log/crossfire/ # Change the location of the tmp directory sed -i "s@^#define TMPDIR \"/tmp\"@#define TMPDIR \"%{_var}/games/%{name}/tmp\"@" include/config.h +# Create a sysusers.d config file +cat >crossfire.sysusers.conf </dev/null || groupadd -r crossfire -getent passwd crossfire >/dev/null || \ -useradd -r -g crossfire -d %{_datadir}/%{name} -s /sbin/nologin \ - -c "Daemon account for the crossfire server" crossfire -exit 0 %post if [ $1 -eq 1 ] ; then @@ -313,6 +314,7 @@ fi %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %{_mandir}/man6/* %{_unitdir}/%{name}.service +%{_sysusersdir}/crossfire.conf %files doc %doc doc/Developers doc/playbook* doc/scripts doc/spell-docs doc/spoiler doc/spoiler-html doc/*.txt @@ -339,6 +341,9 @@ fi %changelog +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 1.71.0-32 +- Add sysusers.d config file to allow rpm to create users/groups automatically + * Sat Feb 01 2025 Björn Esser - 1.71.0-31 - Add explicit BR: libxcrypt-devel From 22039e4d238b7fb223b00fe56ac0c2ddc14c6adc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 18:50:54 +0000 Subject: [PATCH 39/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- crossfire.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index 4bd6c31..4df5165 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 32%{?dist} +Release: 33%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPL-2.0-or-later and MIT @@ -341,6 +341,9 @@ fi %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 1.71.0-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 1.71.0-32 - Add sysusers.d config file to allow rpm to create users/groups automatically