diff --git a/logwatch.script.xpilot b/logwatch.script.xpilot old mode 100755 new mode 100644 diff --git a/logwatch.shared.applyxpilotdate b/logwatch.shared.applyxpilotdate old mode 100755 new mode 100644 diff --git a/xpilot-ng-4.7.2-scoreassert.patch b/xpilot-ng-4.7.2-scoreassert.patch index c5573f4..560fdc3 100644 --- a/xpilot-ng-4.7.2-scoreassert.patch +++ b/xpilot-ng-4.7.2-scoreassert.patch @@ -1,5 +1,5 @@ ---- src/server/score.c.orig 2006-10-20 11:38:01.000000000 -0700 -+++ src/server/score.c 2006-10-20 12:44:30.000000000 -0700 +--- a/src/server/score.c.orig 2006-10-20 11:38:01.000000000 -0700 ++++ b/src/server/score.c 2006-10-20 12:44:30.000000000 -0700 @@ -257,9 +257,13 @@ sc = Rate(cannon->score, Get_Score(victim)) * options.cannonKillScoreMult; diff --git a/xpilot-ng.spec b/xpilot-ng.spec index ade2824..0f67795 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -4,7 +4,7 @@ Name: xpilot-ng Version: 4.7.3 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Multi-player space arcade game License: GPLv2+ @@ -86,10 +86,7 @@ logwatch scripts for the Xpilot game server %prep -%setup -q -%patch0 -%patch1 -p1 -%patch2 -p1 +%autosetup -p1 # regenerate autofoo files for patch2 ./bootstrap pushd doc/man @@ -98,6 +95,7 @@ mv xpilot-ng-server.man.new xpilot-ng-server.man iconv --from=ISO-8859-1 --to=UTF-8 xpilot-ng-x11.man > xpilot-ng-x11.man.new mv xpilot-ng-x11.man.new xpilot-ng-x11.man popd +sed -i 's:/usr/bin/env python:/usr/bin/python2:' mapconvert.py %build @@ -138,9 +136,9 @@ ln -s %{_datadir}/fonts/dejavu/DejaVuSansMono-Bold.ttf $RPM_BUILD_ROOT%{_datadir # Install logwatch files install -pD -m 0644 %{SOURCE10} $RPM_BUILD_ROOT%{logwatch_conf}/logfiles/%{name}.conf -install -pD -m 0755 %{SOURCE11} $RPM_BUILD_ROOT%{logwatch_scripts}/services/%{name} +install -pD -m 0644 %{SOURCE11} $RPM_BUILD_ROOT%{logwatch_scripts}/services/%{name} install -pD -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{logwatch_conf}/services/%{name}.conf -install -pD -m 0755 %{SOURCE13} $RPM_BUILD_ROOT%{logwatch_scripts}/shared/applyxpilotdate +install -pD -m 0644 %{SOURCE13} $RPM_BUILD_ROOT%{logwatch_scripts}/shared/applyxpilotdate %pre server getent group xpilot >/dev/null || groupadd -r xpilot @@ -205,6 +203,9 @@ exit 0 %changelog +* Sat Feb 23 2019 Hans de Goede - 4.7.3-17 +- Fix FTBFS (rhbz#1676250) + * Sun Feb 03 2019 Fedora Release Engineering - 4.7.3-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild