packages: syslog-ng/syslog-ng.spec, syslog-ng/syslog-ng.upstart - fixup sbi...

[baggins]

Author: baggins                      Date: Thu Jan 27 19:35:16 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixup sbindir path in upstart script

---- Files affected:
packages/syslog-ng:
   syslog-ng.spec (1.205 -> 1.206) , syslog-ng.upstart (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/syslog-ng/syslog-ng.spec
diff -u packages/syslog-ng/syslog-ng.spec:1.205 packages/syslog-ng/syslog-ng.spec:1.206
--- packages/syslog-ng/syslog-ng.spec:1.205	Thu Jan 27 20:34:01 2011
+++ packages/syslog-ng/syslog-ng.spec	Thu Jan 27 20:35:11 2011
@@ -184,7 +184,7 @@
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/syslog-ng/*.la
 
 %if "%{pld_release}" == "th"
-cp -a %{SOURCE6} $RPM_BUILD_ROOT/etc/init/%{name}.conf
+%{__sed} -e 's|@@SBINDIR@@|%{_sbindir}|g' %{SOURCE6} > $RPM_BUILD_ROOT/etc/init/%{name}.conf
 %endif
 
 %clean
@@ -298,6 +298,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.206  2011/01/27 19:35:11  baggins
+- fixup sbindir path in upstart script
+
 Revision 1.205  2011/01/27 19:34:01  baggins
 - fixup sbindir path in init script
 

================================================================
Index: packages/syslog-ng/syslog-ng.upstart
diff -u packages/syslog-ng/syslog-ng.upstart:1.2 packages/syslog-ng/syslog-ng.upstart:1.3
--- packages/syslog-ng/syslog-ng.upstart:1.2	Mon May 10 14:17:30 2010
+++ packages/syslog-ng/syslog-ng.upstart	Thu Jan 27 20:35:11 2011
@@ -9,7 +9,7 @@
 
 console output
 
-exec /usr/sbin/syslog-ng --process-mode=background -f /etc/syslog-ng/syslog-ng.conf
+exec @@SBINDIR@@/syslog-ng --process-mode=background -f /etc/syslog-ng/syslog-ng.conf
 expect fork
 
 # vi: ft=upstart
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/syslog-ng/syslog-ng.spec?r1=1.205&r2=1.206&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/syslog-ng/syslog-ng.upstart?r1=1.2&r2=1.3&f=u