- fixup sbindir path in init script

Changed files:
    syslog-ng.init -> 1.35
    syslog-ng.spec -> 1.205

diff --git a/syslog-ng.init b/syslog-ng.init
index 08a07b6f54dfb574144cc7a0469415b5a54ba9da..138641f3a509bff81949b288df958421d167ff18 100644 (file)
--- a/syslog-ng.init
+++ b/syslog-ng.init
@@ -67,7 +67,7 @@ start() {
 
        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

diff --git a/syslog-ng.spec b/syslog-ng.spec
index 27edb9653ec7837d973344675a30502440541ec4..c3917832ab54e665afef205add9a0ca144f066c2 100644 (file)
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -2,7 +2,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
@@ -169,7 +169,7 @@ install -d $RPM_BUILD_ROOT/etc/{init,sysconfig,logrotate.d,rc.d/init.d} \
 %{__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