Author: baggins Date: Thu Jan 27 19:34:06 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- fixup sbindir path in init script
---- Files affected:
packages/syslog-ng:
syslog-ng.init (1.34 -> 1.35) , syslog-ng.spec (1.204 -> 1.205)
---- Diffs:
================================================================
Index: packages/syslog-ng/syslog-ng.init
diff -u packages/syslog-ng/syslog-ng.init:1.34
packages/syslog-ng/syslog-ng.init:1.35
--- packages/syslog-ng/syslog-ng.init:1.34 Thu Jan 27 12:48:35 2011
+++ packages/syslog-ng/syslog-ng.init Thu Jan 27 20:34:01 2011
@@ -67,7 +67,7 @@
msg_starting "syslog-ng"
emit starting JOB=syslog-ng SERVICE=syslog
- daemon /usr/sbin/syslog-ng -f /etc/syslog-ng/syslog-ng.conf $OPTIONS
+ daemon @@SBINDIR@@/syslog-ng -f /etc/syslog-ng/syslog-ng.conf $OPTIONS
emit --no-wait started JOB=syslog-ng SERVICE=syslog
RETVAL=$?
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/syslog-ng
================================================================
Index: packages/syslog-ng/syslog-ng.spec
diff -u packages/syslog-ng/syslog-ng.spec:1.204
packages/syslog-ng/syslog-ng.spec:1.205
--- packages/syslog-ng/syslog-ng.spec:1.204 Thu Jan 27 20:20:57 2011
+++ packages/syslog-ng/syslog-ng.spec Thu Jan 27 20:34:01 2011
@@ -3,7 +3,7 @@
# Conditional build:
%bcond_with dynamic # link dynamically with glib, eventlog, pcre,
openssl
%if "%{pld_release}" == "ac"
-%bcond_with sql # build with support for logging to SQL
DB
+%bcond_with sql # build with support for logging to SQL DB
%else
%bcond_without sql # build without support for logging to SQL DB
%endif
@@ -170,7 +170,7 @@
%{__make} -j1 install \
DESTDIR=$RPM_BUILD_ROOT
-install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/syslog-ng
+%{__sed} -e 's|@@SBINDIR@@|%{_sbindir}|g' %{SOURCE1} >
$RPM_BUILD_ROOT/etc/rc.d/init.d/syslog-ng
cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/syslog-ng/syslog-ng.conf
cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/syslog-ng
@@ -298,6 +298,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.205 2011/01/27 19:34:01 baggins
+- fixup sbindir path in init script
+
Revision 1.204 2011/01/27 19:20:57 baggins
- package remaining files
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/syslog-ng/syslog-ng.init?r1=1.34&r2=1.35&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/syslog-ng/syslog-ng.spec?r1=1.204&r2=1.205&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
