rpms/inn/F-8 inn.spec,1.37,1.38

[Ondrej Vasik (ovasik)]

Author: ovasik

Update of /cvs/extras/rpms/inn/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10870

Modified Files:
	inn.spec 
Log Message:
use rsyslog locations instead of sysklogd


Index: inn.spec
===================================================================
RCS file: /cvs/extras/rpms/inn/F-8/inn.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- inn.spec	7 Jan 2008 16:37:54 -0000	1.37
+++ inn.spec	16 Jan 2008 13:38:57 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: The InterNetNews (INN) system, an Usenet news server
 Name: inn
 Version: 2.4.3
-Release: 8%{?dist}
+Release: 9%{?dist}
 #see LICENSE file for details
 License: GPL+ and BSD and MIT and Public Domain
 Group: System Environment/Daemons
@@ -210,26 +210,28 @@
 service innd stop > /dev/null 2>&1
 exit 0
 
-%triggerin -- sysklogd
-if [ -f /etc/syslog.conf ]; then
-  if ! grep -q INN /etc/syslog.conf; then
-    sed 's/mail.none;/mail.none;news.none;/' < /etc/syslog.conf > /etc/syslog.conf.inn
-    mv /etc/syslog.conf.inn /etc/syslog.conf
+%triggerin -- rsyslog
+if [ -f /etc/rsyslog.conf ]; then
+  if ! grep -q INN /etc/rsyslog.conf; then
+    sed 's/mail.none;/mail.none;news.none;/' < /etc/rsyslog.conf > /etc/rsyslog.conf.inn
+    mv /etc/rsyslog.conf.inn /etc/rsyslog.conf
 
     echo '' \
-       >> /etc/syslog.conf
+       >> /etc/rsyslog.conf
     echo '#' \
-       >> /etc/syslog.conf
+       >> /etc/rsyslog.conf
     echo '# INN' \
-       >> /etc/syslog.conf
+       >> /etc/rsyslog.conf
     echo '#' \
-       >> /etc/syslog.conf
-    echo 'news.=crit                                        /var/log/news/news.crit'   >> /etc/syslog.conf
-    echo 'news.=err                                         /var/log/news/news.err'    >> /etc/syslog.conf
-    echo 'news.notice                                       /var/log/news/news.notice' >> /etc/syslog.conf
+       >> /etc/rsyslog.conf
+    echo 'news.=crit                                        /var/log/news/news.crit'   >> /etc/rsyslog.conf
+    echo 'news.=err                                         /var/log/news/news.err'    >> /etc/rsyslog.conf
+    echo 'news.notice                                       /var/log/news/news.notice' >> /etc/rsyslog.conf
+    echo 'news.=debug                                       /var/log/news/news.debug' >> /etc/rsyslog.conf
+
     fi
-  if [ -f /var/run/syslog.pid ]; then
-    kill -HUP `cat /var/run/syslog.pid` 2> /dev/null ||:
+  if [ -f /var/run/rsyslogd.pid ]; then
+    kill -HUP `cat /var/run/rsyslogd.pid` 2> /dev/null ||:
   fi
 fi
 
@@ -293,6 +295,9 @@
 %{_mandir}/man1/inews*
 
 %changelog
+* Wed Jan 16 2008 Ondrej Vasik <ovasik at redhat.com> 2.4.3-9
+- use /etc/rsyslog.conf instead of /etc/syslog.conf
+
 * Mon Jan 07 2008 Ondrej Vasik <ovasik at redhat.com> 2.4.3-8
 - initscript changes - review changes caused errors while
   in stop() phase - not known variable NEWSBIN(#401241)