[packages/bzflag] shell syntax
glen
glen at pld-linux.org
Fri Dec 11 18:28:50 CET 2015
commit 88420b6d3ea48c22c6434b4dc903f089bbfc0994
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Fri Dec 11 19:28:08 2015 +0200
shell syntax
altho such package should be removed from ftp, if todo item 'do not run
daemon as root' has not done.
bzflag.init | 2 +-
bzflag.spec | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/bzflag.spec b/bzflag.spec
index 7ec4c3f..2047ac0 100644
--- a/bzflag.spec
+++ b/bzflag.spec
@@ -4,13 +4,13 @@
# (to be compiled, moved to doc, or something else)
# - bzfsAPI.h and other is marked ad noinst_HEADER, maybe in future it will
# be installed too, to allow compiling plugins externall
-# - finish init script (currently runs server from root)
+# - finish init script (currently runs server from root)!
#
Summary: Multiplayer 3D tank battle game
Summary(pl.UTF-8): Gra 3D dla wielu graczy - czołgi
Name: bzflag
Version: 2.4.0
-Release: 7
+Release: 8
License: LGPL v2.1
Group: X11/Applications/Games
Source0: http://downloads.sourceforge.net/bzflag/%{name}-%{version}.tar.bz2
@@ -95,11 +95,11 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/bzflag} \
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/bzflag
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/bzflag
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/bzflag
+cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/bzflag
-install data/bzflag-48x48.png $RPM_BUILD_ROOT%{_pixmapsdir}/bzflag.png
+cp -p data/bzflag-48x48.png $RPM_BUILD_ROOT%{_pixmapsdir}/bzflag.png
%clean
rm -rf $RPM_BUILD_ROOT
diff --git a/bzflag.init b/bzflag.init
old mode 100644
new mode 100755
index 010c70d..95b174c
--- a/bzflag.init
+++ b/bzflag.init
@@ -33,7 +33,7 @@ start() {
if [ ! -f /var/lock/subsys/bzflag ]; then
msg_starting bzflag
# fixme, don't start from root
- daemon --fork "/usr/bin/bzfs -pidfile /var/run/bzfs.pid $BZFLAG_OPTIONS > /var/log/bzflag.log 2>&1"
+ daemon --fork /bin/sh -c "/usr/bin/bzfs -pidfile /var/run/bzfs.pid $BZFLAG_OPTIONS > /var/log/bzflag.log 2>&1"
RETVAL=$?
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/bzflag
else
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/bzflag.git/commitdiff/88420b6d3ea48c22c6434b4dc903f089bbfc0994
More information about the pld-cvs-commit
mailing list