Author: glen                         Date: Tue May 23 23:04:50 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- use %service; rel 4

---- Files affected:
SPECS:
   syslog-ng.spec (1.108 -> 1.108.2.1) 

---- Diffs:

================================================================
Index: SPECS/syslog-ng.spec
diff -u SPECS/syslog-ng.spec:1.108 SPECS/syslog-ng.spec:1.108.2.1
--- SPECS/syslog-ng.spec:1.108  Tue Dec 13 16:14:18 2005
+++ SPECS/syslog-ng.spec        Wed May 24 01:04:45 2006
@@ -7,7 +7,7 @@
 Summary(pt_BR):        Daemon de log nova geraçăo
 Name:          syslog-ng
 Version:       %{mainver}.%{minorver}
-Release:       3
+Release:       4
 License:       GPL
 Group:         Daemons
 Source0:       
http://www.balabit.hu/downloads/syslog-ng/%{mainver}/src/%{name}-%{version}.tar.gz
@@ -22,15 +22,16 @@
 BuildRequires: flex
 BuildRequires: libol-static >= 0.3.17
 BuildRequires: libwrap-devel
+BuildRequires: rpmbuild(macros) >= 1.268
 Requires(post):        fileutils
 Requires(post,preun):  /sbin/chkconfig
 Requires:      logrotate
 Requires:      psmisc >= 20.1
 Requires:      rc-scripts >= 0.2.0
 Provides:      syslogdaemon
-Obsoletes:     syslog
-Obsoletes:     msyslog
 Obsoletes:     klogd
+Obsoletes:     msyslog
+Obsoletes:     syslog
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -95,17 +96,11 @@
 done
 
 /sbin/chkconfig --add syslog-ng
-if [ -f /var/lock/subsys/syslog-ng ]; then
-       /etc/rc.d/init.d/syslog-ng restart >&2
-else
-       echo "Run \"/etc/rc.d/init.d/syslog-ng start\" to start syslog-ng 
daemon."
-fi
+%service syslog-ng restart "syslog-ng daemon"
 
 %preun
 if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/syslog-ng ]; then
-               /etc/rc.d/init.d/syslog-ng stop >&2
-       fi
+       %service syslog-ng stop
        /sbin/chkconfig --del syslog-ng
 fi
 
@@ -130,6 +125,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.108.2.1  2006/05/23 23:04:45  glen
+- use %service; rel 4
+
 Revision 1.108  2005/12/13 15:14:18  glen
 - adapterized (sorted %verify attrs)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/syslog-ng.spec?r1=1.108&r2=1.108.2.1&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to