From 939d6047cf138f26912470f5d7ba13c20df28151 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sun, 24 May 2009 09:20:04 +0000 Subject: [PATCH] post-review fixes - see https://bugzilla.redhat.com/show_bug.cgi?id=487148 --- gearmand.init | 4 ++-- gearmand.spec | 7 ++++++- gearmand.sysconfig | 3 +++ 3 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 gearmand.sysconfig diff --git a/gearmand.init b/gearmand.init index fbe58bc..e2502aa 100644 --- a/gearmand.init +++ b/gearmand.init @@ -25,10 +25,10 @@ if [ -f /etc/sysconfig/gearmand ]; then . /etc/sysconfig/gearmand fi -[ -z "${PIDFILE}" ] && pidfile = "/var/run/gearmand/gearmand.pid" +[ -z "${PIDFILE}" ] && pidfile="/var/run/gearmand/gearmand.pid" [ -z "${LOCKFILE}" ] && lockfile="/var/lock/subsys/gearmand" -gearmand=/usr/bin/gearmand +gearmand=/usr/sbin/gearmand prog=gearmand RETVAL=0 diff --git a/gearmand.spec b/gearmand.spec index 7beeb03..e5e0ea0 100644 --- a/gearmand.spec +++ b/gearmand.spec @@ -8,6 +8,7 @@ License: BSD URL: http://www.gearman.org Source0: http://launchpad.net/gearmand/trunk/%{version}/+download/gearmand-%{version}.tar.gz Source1: gearmand.init +Source2: gearmand.sysconfig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libevent-devel, e2fsprogs-devel @@ -69,7 +70,9 @@ make %{?_smp_mflags} rm -rf %{buildroot} make install DESTDIR=%{buildroot} rm -v %{buildroot}%{_libdir}/libgearman.la -install -D %{SOURCE1} %{buildroot}%{_initrddir}/gearmand +install -p -D -m 0644 %{SOURCE1} %{buildroot}%{_initrddir}/gearmand +install -p -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/gearmand +mkdir -p %{buildroot}/var/run/gearmand %clean @@ -101,6 +104,8 @@ fi %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README +%dir %attr(755,gearmand,gearmand) /var/run/gearmand +%config(noreplace) %{_sysconfdir}/sysconfig/gearmand %{_sbindir}/gearmand %{_bindir}/gearman %{_initrddir}/gearmand diff --git a/gearmand.sysconfig b/gearmand.sysconfig new file mode 100644 index 0000000..2548190 --- /dev/null +++ b/gearmand.sysconfig @@ -0,0 +1,3 @@ +## Settings for gearmand +#OPTIONS="" +