rpms/rsyslog/devel rsyslog.init, 1.1, 1.2 rsyslog.log, 1.1, 1.2 rsyslog.spec, 1.50, 1.51

[Peter Vrabec]

Author: pvrabec

Update of /cvs/extras/rpms/rsyslog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10506

Modified Files:
	rsyslog.init rsyslog.log rsyslog.spec 
Log Message:
- use RPM_OPT_FLAGS
- use same pid file and logrotate file as syslog-ng (#441664)
- mark config files as noreplace (#428155)



Index: rsyslog.init
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/rsyslog.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rsyslog.init	11 Jul 2008 11:37:05 -0000	1.1
+++ rsyslog.init	15 Sep 2008 12:39:34 -0000	1.2
@@ -51,7 +51,7 @@
 }
 reload()  {
     RETVAL=1
-    syslog=`cat /var/run/rsyslogd.pid 2>/dev/null`
+    syslog=`cat /var/run/syslogd.pid 2>/dev/null`
     echo -n "Reloading system logger..."
     if [ -n "${syslog}" ] && [ -e /proc/"${syslog}" ]; then
 	kill -HUP "$syslog";


Index: rsyslog.log
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/rsyslog.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rsyslog.log	11 Jul 2008 11:37:05 -0000	1.1
+++ rsyslog.log	15 Sep 2008 12:39:34 -0000	1.2
@@ -1,6 +1,6 @@
 /var/log/messages /var/log/secure /var/log/maillog /var/log/spooler /var/log/boot.log /var/log/cron {
     sharedscripts
     postrotate
-        /bin/kill -HUP `cat /var/run/rsyslogd.pid 2> /dev/null` 2> /dev/null || true
+	/bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true
     endscript
 }


Index: rsyslog.spec
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/rsyslog.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- rsyslog.spec	1 Sep 2008 14:16:02 -0000	1.50
+++ rsyslog.spec	15 Sep 2008 12:39:34 -0000	1.51
@@ -3,7 +3,7 @@
 Summary: Enhanced system logging and kernel message trapping daemons
 Name: rsyslog
 Version: 3.21.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv3+
 Group: System Environment/Daemons
 URL: http://www.rsyslog.com/
@@ -93,6 +93,7 @@
 %patch1 -p1 -b .manual
 
 %build
+export CFLAGS="$RPM_OPT_FLAGS -DSYSLOGD_PIDNAME=\\\"syslogd.pid\\\""
 %configure	--sbindir=%{sbindir} \
 		--disable-static \
 		--enable-mysql \
@@ -162,8 +163,8 @@
 %{_libdir}/rsyslog/lmtcpsrv.so
 %{_libdir}/rsyslog/lmnetstrms.so
 %{_libdir}/rsyslog/lmnsd_ptcp.so
-%config %{_sysconfdir}/rsyslog.conf
-%config %{_sysconfdir}/sysconfig/rsyslog
+%config(noreplace) %{_sysconfdir}/rsyslog.conf
+%config(noreplace) %{_sysconfdir}/sysconfig/rsyslog
 %config(noreplace) %{_sysconfdir}/logrotate.d/syslog
 %{_initrddir}/rsyslog
 %{sbindir}/rsyslogd
@@ -195,6 +196,11 @@
 %{_libdir}/rsyslog/lmnsd_gtls.so
 
 %changelog
+* Mon Sep 15 2008 Peter Vrabec <pvrabec at redhat.com> 3.21.3-4
+- use RPM_OPT_FLAGS
+- use same pid file and logrotate file as syslog-ng (#441664)
+- mark config files as noreplace (#428155)
+
 * Mon Sep 01 2008 Tomas Heinrich <theinric at redhat.com> 3.21.3-3
 - fix a wrong module name in the rsyslog.conf manual page (#455086)
 - expand the rsyslog.conf manual page (#456030)