X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=sysklogd.spec;h=7988ea677655bc83826894df41a55f9808ecc6e6;hb=HEAD;hp=dba308aa431b0e1272b0f9e7c574bfcd76bcce4c;hpb=ca4a012f7cd28a776bb663c007bef6f5e7f448ad;p=packages%2Fsysklogd.git

diff --git a/sysklogd.spec b/sysklogd.spec
index dba308a..7988ea6 100644
--- a/sysklogd.spec
+++ b/sysklogd.spec
@@ -8,12 +8,12 @@ Summary(pl.UTF-8):	Programy logujące zdarzenia w systemie i jądrze Linuksa
 Summary(pt_BR.UTF-8):	Registrador de log do sistema linux
 Summary(tr.UTF-8):	Linux sistem ve çekirdek kayıt süreci
 Name:		sysklogd
-Version:	1.5
-Release:	6
+Version:	1.5.1
+Release:	2
 License:	GPL v2+
 Group:		Daemons
 Source0:	http://www.infodrom.org/projects/sysklogd/download/%{name}-%{version}.tar.gz
-# Source0-md5:	e053094e8103165f98ddafe828f6ae4b
+# Source0-md5:	c70599ab0d037fde724f7210c2c8d7f8
 Source1:	syslog.conf
 Source2:	syslog.init
 Source3:	syslog.logrotate
@@ -102,13 +102,14 @@ Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
 Requires(pre):	/usr/sbin/usermod
+Requires(post,preun,postun):	systemd-units >= 38
 Requires(triggerpostun):	sed >= 4.0
 # for vservers we don't need klogd and syslog works without klogd
 # (just it doesn't log kernel buffer into syslog)
 # Requires:	klogd
 Requires:	logrotate >= 3.2-3
 Requires:	psmisc >= 20.1
-Requires:       systemd-units >= 37-0.10
+Requires:       systemd-units >= 38
 Suggests:	klogd
 Provides:	group(syslog)
 Provides:       service(syslog)
@@ -118,6 +119,8 @@ Obsoletes:	msyslog
 Obsoletes:	sysklogd
 Obsoletes:	syslog-ng
 Obsoletes:	syslog-systemd
+Conflicts:	cronie < 1.5.0-3
+Conflicts:	fcron < 3.1.2-5
 
 %description -n syslog
 This is the Linux system logging program. It is run as a daemon
@@ -148,7 +151,8 @@ Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
 Requires(pre):	/usr/sbin/usermod
-Requires:       systemd-units >= 37-0.10
+Requires(post,preun,postun):	systemd-units >= 38
+Requires:       systemd-units >= 38
 Suggests:	syslog
 Provides:	group(syslog)
 Provides:	user(syslog)
@@ -205,7 +209,7 @@ install %{SOURCE8} $RPM_BUILD_ROOT%{_mandir}/man8
 install %{SOURCE9} $RPM_BUILD_ROOT%{systemdunitdir}
 install %{SOURCE10} $RPM_BUILD_ROOT%{systemdunitdir}
 
-for n in debug kernel maillog messages secure syslog user spooler lpr daemon
+for n in cron debug kernel maillog messages secure syslog user spooler lpr daemon
 do
 	> $RPM_BUILD_ROOT/var/log/$n
 done
@@ -224,7 +228,7 @@ chmod u+w $RPM_BUILD_ROOT%{_sbindir}/{klogd,syslogd}
 for n in /var/log/{cron,daemon,debug,kernel,lpr,maillog,messages,secure,spooler,syslog,user}; do
 	[ ! -f $n ] && touch $n
 	chmod 640 $n
-	chown syslog:syslog $n
+	chown syslog:logs $n
 done
 
 /sbin/chkconfig --add syslog
@@ -305,7 +309,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/syslog
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/syslog
 %attr(754,root,root) /etc/rc.d/init.d/syslog
-%attr(640,root,root) %ghost /var/log/[cdklmsu]*
+%attr(640,syslog,logs) %ghost /var/log/[cdklmsu]*
 %dir %attr(770,root,news) /var/log/news
 %attr(755,root,root) %{_sbindir}/syslogd
 %attr(755,root,root) %{_bindir}/syslogd-listfiles