SPECS: syslog-ng.spec - use %service

[glen]

Author: glen                         Date: Wed Mar  1 18:48:12 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service

---- Files affected:
SPECS:
   syslog-ng.spec (1.112 -> 1.113) 

---- Diffs:

================================================================
Index: SPECS/syslog-ng.spec
diff -u SPECS/syslog-ng.spec:1.112 SPECS/syslog-ng.spec:1.113
--- SPECS/syslog-ng.spec:1.112	Tue Feb 28 15:03:46 2006
+++ SPECS/syslog-ng.spec	Wed Mar  1 19:48:07 2006
@@ -1,4 +1,7 @@
 # $Revision$, $Date$
+# TODO
+# - use shared eventlog
+
 %define		mainver		1.9
 %define		minorver	9
 
@@ -20,18 +23,20 @@
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
 BuildRequires:	eventlog-devel
+BuildRequires:	eventlog-static
 BuildRequires:	flex
 BuildRequires:	glib2-static
 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
@@ -100,17 +105,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
 
@@ -133,6 +132,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.113  2006/03/01 18:48:07  glen
+- use %service
+
 Revision 1.112  2006/02/28 14:03:46  baggins
 - rel 1
 
@@ -178,7 +180,7 @@
 - updated to 1.6.6, added link patch
 
 Revision 1.98  2004/11/24 17:04:12  witekfl
-- html docs added to %%doc
+- html docs added to %doc
 - rel 4
 
 Revision 1.97  2004/10/12 20:46:30  paszczus
@@ -259,14 +261,14 @@
 - security update to 1.5.21
 
 Revision 1.56.2.3  2002/09/21 00:55:12  baggins
-- I want to see if the restart succeded in %%post :/
+- I want to see if the restart succeded in %post :/
 
 Revision 1.56.2.2  2002/09/20 13:27:18  baggins
 - updated to 1.5.20
 - obsoletes klogd - AT LAST!
 
 Revision 1.75  2002/12/07 23:49:27  ankry
-- fix improper usage of %%{_sysconfdir}
+- fix improper usage of %{_sysconfdir}
 
 Revision 1.74  2002/11/21 11:54:31  undefine
 - add obsoletes msyslog
@@ -274,8 +276,8 @@
 Revision 1.73  2002/11/04 16:38:39  jack
 - updated to version 1.4.17
 - from changelog:
-	* Fixed a possible off-by-one problem
-	* A more correct version of the previous security update was added.
+  * Fixed a possible off-by-one problem
+  * A more correct version of the previous security update was added.
 
 Revision 1.72  2002/10/10 23:08:50  cieciwa
 - update to version 1.4.16,
@@ -320,14 +322,14 @@
 - new %doc.
 
 Revision 1.61  2002/05/21 23:14:48  kloczek
-perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
+- perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
              s/^automake -a -c -f/\%\{__automake\}/; \
-	     s/^autoconf/\%\{__autoconf\}/"
+     s/^autoconf/\%\{__autoconf\}/"
 
 Revision 1.60  2002/05/13 20:05:20  qboosh
 - added ac25x patch needed for autoconf 2.53
 - use config(noreplace)
-- fixed bashism in %%post
+- fixed bashism in %post
 - release 3
 
 Revision 1.59  2002/05/13 06:53:20  kloczek
@@ -347,7 +349,7 @@
   Group field using gettext).
 
 Revision 1.54  2002/01/18 02:15:08  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.53  2001/10/22 22:11:23  qboosh
 - rm -f missing
@@ -462,10 +464,10 @@
 - updated to 1.4.5.
 
 Revision 1.20  2000/06/09 07:55:11  kloczek
-- more %%{__make} macros.
+- more %{__make} macros.
 
 Revision 1.19  2000/06/09 07:24:00  kloczek
-- added using %%{__make} macro.
+- added using %{__make} macro.
 
 Revision 1.18  2000/05/13 11:50:14  klakier
 - release 3
@@ -483,7 +485,7 @@
 - release 2
 
 Revision 1.13  2000/04/25 20:54:32  bonkey
-- corrected %%post and %%preun scripts
+- corrected %post and %preun scripts
 
 Revision 1.12  2000/04/21 00:42:04  kloczek
 - updated to 1.4.3.
@@ -515,7 +517,7 @@
 - updated to 1.3.17,
 - spec adapterized.
 - gzipping %doc instead bzipping2,
-Package builds correctly but need testing.
+  Package builds correctly but need testing.
 
 * Tue Jul 20 1999 Wojciech "Sas" Cięciwa <cieciwa at alpha.zarz.agh.edu.pl>
   [1.1.27-1]
================================================================

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