packages: rsyslog/rsyslog.spec - rel 4 - merged systemd stuff into main pac...

[baggins]

Author: baggins                      Date: Sun Feb  5 16:47:39 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4
- merged systemd stuff into main package

---- Files affected:
packages/rsyslog:
   rsyslog.spec (1.58 -> 1.59) 

---- Diffs:

================================================================
Index: packages/rsyslog/rsyslog.spec
diff -u packages/rsyslog/rsyslog.spec:1.58 packages/rsyslog/rsyslog.spec:1.59
--- packages/rsyslog/rsyslog.spec:1.58	Sun Feb  5 00:46:55 2012
+++ packages/rsyslog/rsyslog.spec	Sun Feb  5 17:47:34 2012
@@ -18,7 +18,7 @@
 Summary(tr.UTF-8):	Linux sistem ve çekirdek kayıt süreci
 Name:		rsyslog
 Version:	5.8.6
-Release:	3
+Release:	4
 License:	GPL v3+
 Group:		Daemons
 Source0:	http://www.rsyslog.com/files/download/rsyslog/%{name}-%{version}.tar.gz
@@ -54,7 +54,10 @@
 # Requires:	klogd
 Requires:	logrotate >= 3.2-3
 Requires:	psmisc >= 20.1
+Requires:	systemd-units >= 37-0.10
 Provides:	group(syslog)
+Provides:	service(klogd)
+Provides:	service(syslog)
 Provides:	syslogdaemon
 Provides:	user(syslog)
 Obsoletes:	msyslog
@@ -81,17 +84,6 @@
 logów, a jednocześnie jest przy tym łatwy do skonfigurowania dla
 początkującego użytkownika.
 
-%package systemd
-Summary:	systemd units for rsyslog
-Group:		Daemons
-Requires:	%{name} = %{version}-%{release}
-Requires:	systemd-units >= 37-0.10
-Provides:	service(klogd)
-Provides:	service(syslog)
-
-%description systemd
-systemd units for rsyslog.
-
 %package mysql
 Summary:	MySQL support for rsyslog
 Summary(pl.UTF-8):	Obsługa MySQL-a do rsysloga
@@ -256,17 +248,24 @@
 /sbin/chkconfig --add %{name}
 %service rsyslog restart "%{name} daemon"
 
+%systemd_post rsyslog.service
+
 %preun
 if [ "$1" = "0" ]; then
 	%service %{name} stop
 	/sbin/chkconfig --del %{name}
 fi
+%systemd_preun rsyslog.service
 
 %postun
 if [ "$1" = "0" ]; then
 	%userremove syslog
 	%groupremove syslog
 fi
+%systemd_reload
+
+%triggerpostun -- %{name} < 5.8.6-4
+%systemd_trigger rsyslog.service
 
 %triggerpostun -- inetutils-syslogd
 /sbin/chkconfig --del syslog
@@ -278,15 +277,6 @@
 	echo "Original file from package is available as /etc/syslog.conf.rpmnew"
 fi
 
-%post systemd
-%systemd_post rsyslog.service
-
-%preun systemd
-%systemd_preun rsyslog.service
-
-%postun systemd
-%systemd_reload
-
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
@@ -296,6 +286,7 @@
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/rsyslog
 %attr(754,root,root) /etc/rc.d/init.d/rsyslog
 %attr(640,root,root) %ghost /var/log/*
+/lib/systemd/system/rsyslog.service
 %attr(755,root,root) %{_sbindir}/rsyslogd
 %dir %{_libdir}/rsyslog
 %attr(755,root,root) %{_libdir}/rsyslog/imfile.so
@@ -334,10 +325,6 @@
 %{_mandir}/man5/*
 %{_mandir}/man8/*
 
-%files systemd
-%defattr(644,root,root,755)
-/lib/systemd/system/rsyslog.service
-
 %if %{with mysql}
 %files mysql
 %defattr(644,root,root,755)
@@ -386,6 +373,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.59  2012/02/05 16:47:34  baggins
+- rel 4
+- merged systemd stuff into main package
+
 Revision 1.58  2012/02/04 23:46:55  blues
 - provides service(klogd)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rsyslog/rsyslog.spec?r1=1.58&r2=1.59&f=u