[xpilot-ng] Move server cmdline config file to /etc/xpilot-ng, where all the other

[Hans de Goede]

commit b5e0320e3c06d9a14b32042a91fe142d92c085f2
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Sun Jul 29 17:27:35 2012 +0200

    Move server cmdline config file to /etc/xpilot-ng, where all the other
    
      config-files are. You can now find it here:
      /etc/xpilot/xpilot-ng-server-cmdline-opts

 xpilot-ng-server.service |    2 +-
 xpilot-ng.spec           |   19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/xpilot-ng-server.service b/xpilot-ng-server.service
index cbc973a..e567558 100644
--- a/xpilot-ng-server.service
+++ b/xpilot-ng-server.service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 Type=simple
-EnvironmentFile=/etc/sysconfig/xpilot-ng-server.conf
+EnvironmentFile=/etc/xpilot-ng/xpilot-ng-server-cmdline-opts
 ExecStart=/usr/bin/xpilot-ng-server $XPILOTD_OPTIONS
 
 [Install]
diff --git a/xpilot-ng.spec b/xpilot-ng.spec
index 990f5d4..9854c0b 100644
--- a/xpilot-ng.spec
+++ b/xpilot-ng.spec
@@ -4,7 +4,7 @@
 
 Name:           xpilot-ng
 Version:        4.7.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Multiplayer space arcade game
 
 Group:          Amusements/Games
@@ -94,17 +94,15 @@ install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/app
 
 install -p -D -m 644 %{SOURCE4} $RPM_BUILD_ROOT/lib/systemd/system/%{name}-server.service
 
-install -p -D -m 644 %{SOURCE5} \
-    $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/%{name}-server.conf
-
-install -p -D -m 644 %{SOURCE6} \
-    $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/%{name}-server
-
 # Copy certain configuration files to /etc so that they can be properly managed
 # as config files.
+install -p -D -m 644 %{SOURCE5} $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}-server-cmdline-opts
 install -p -D -m 644 lib/defaults.txt $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/defaults.txt
 install -p -D -m 600 lib/password.txt $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/password.txt
 
+install -p -D -m 644 %{SOURCE6} \
+    $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/%{name}-server
+
 # Replace bundled fonts with system fonts
 
 rm $RPM_BUILD_ROOT%{_datadir}/%{name}/fonts/FreeSansBoldOblique.ttf
@@ -179,12 +177,12 @@ fi
 %{_bindir}/xpilot-ng-xp-mapedit
 %{_bindir}/xpilot-ng-server
 /lib/systemd/system/xpilot-ng-server.service
-%config(noreplace) %{_sysconfdir}/sysconfig/%{name}-server.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}-server
 %{_datadir}/%{name}
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %attr(0600,xpilot,root) %{_sysconfdir}/%{name}/password.txt
 %config(noreplace) %{_sysconfdir}/%{name}/defaults.txt
+%config(noreplace) %{_sysconfdir}/%{name}/xpilot-ng-server-cmdline-opts
 %{_mandir}/man6/xpilot-ng-server.6.gz
 %{_mandir}/man6/xpilot-ng-xp-mapedit.6.gz
 %doc README COPYING
@@ -197,6 +195,11 @@ fi
 
 
 %changelog
+* Sun Jul 27 2012 Hans de Goede <hdegoede at redhat.com> - 4.7.3-2
+- Move server cmdline config file to /etc/xpilot-ng, where all the other
+  config-files are. You can now find it here:
+  /etc/xpilot/xpilot-ng-server-cmdline-opts
+
 * Sun Jul 27 2012 Hans de Goede <hdegoede at redhat.com> - 4.7.3-1
 - Fix a crash in the welcome screen (rhbz#830640)
 - Upgrade to latest upstream 4.7.3