Author: baggins Date: Sun Feb 5 16:56:46 2012 GMT Module: packages Tag: HEAD ---- Log message: - rel 4 - merge systemd stuff into main package
---- Files affected: packages/sysklogd: sysklogd.spec (1.134 -> 1.135) ---- Diffs: ================================================================ Index: packages/sysklogd/sysklogd.spec diff -u packages/sysklogd/sysklogd.spec:1.134 packages/sysklogd/sysklogd.spec:1.135 --- packages/sysklogd/sysklogd.spec:1.134 Sat Feb 4 23:36:12 2012 +++ packages/sysklogd/sysklogd.spec Sun Feb 5 17:56:41 2012 @@ -10,7 +10,7 @@ Summary(tr.UTF-8): Linux sistem ve çekirdek kayıt süreci Name: sysklogd Version: 1.5 -Release: 3 +Release: 4 License: GPL v2+ Group: Daemons Source0: http://www.infodrom.org/projects/sysklogd/download/%{name}-%{version}.tar.gz @@ -109,8 +109,10 @@ # Requires: klogd Requires: logrotate >= 3.2-3 Requires: psmisc >= 20.1 +Requires: systemd-units >= 37-0.10 Suggests: klogd Provides: group(syslog) +Provides: service(syslog) Provides: syslogdaemon Provides: user(syslog) Obsoletes: msyslog @@ -131,16 +133,6 @@ dotyczące bezpieczeństwa systemu, a także informacje o błędach z innych demonów. -%package -n syslog-systemd -Summary: systemd units for syslog -Group: Daemons -Requires: syslog = %{version}-%{release} -Requires: systemd-units >= 37-0.10 -Provides: service(syslog) - -%description -n syslog-systemd -systemd units for syslog. - %package -n klogd Summary: Linux kernel logger Summary(de.UTF-8): Linux-Kerner-Logger @@ -156,9 +148,11 @@ Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd Requires(pre): /usr/sbin/usermod +Requires: systemd-units >= 37-0.10 Suggests: syslog Provides: group(syslog) Provides: user(syslog) +Provides: service(klogd) Obsoletes: sysklogd %description -n klogd @@ -169,16 +163,6 @@ Pakiet ten zawiera program, który jest uruchamiany jako demon i służy do logowania komunikatów jądra Linuksa. -%package -n klogd-systemd -Summary: systemd units for klogd -Group: Daemons -Requires: klogd = %{version}-%{release} -Requires: systemd-units >= 37-0.10 -Provides: service(klogd) - -%description -n klogd-systemd -systemd units for klogdg. - %prep %setup -q %patch0 -p1 @@ -246,34 +230,20 @@ %service syslog restart "syslog daemon" %service -q klogd restart +%systemd_post syslog.service + %preun -n syslog if [ "$1" = "0" ]; then %service syslog stop /sbin/chkconfig --del syslog fi +%systemd_preun syslog.service %postun -n syslog if [ "$1" = "0" ]; then %userremove syslog %groupremove syslog fi - -%post -n syslog-systemd -%systemd_post syslog.service - -%preun -n syslog-systemd -%systemd_preun syslog.service - -%postun -n syslog-systemd -%systemd_reload - -%post -n klogd-systemd -%systemd_post klogd.service - -%preun -n klogd-systemd -%systemd_preun klogd.service - -%postun -n klogd-systemd %systemd_reload %pre -n klogd @@ -284,18 +254,21 @@ %post -n klogd /sbin/chkconfig --add klogd %service klogd restart "kernel logger daemon" +%systemd_post klogd.service %preun -n klogd if [ "$1" = "0" ]; then %service klogd stop /sbin/chkconfig --del klogd fi +%systemd_preun klogd.service %postun -n klogd if [ "$1" = "0" ]; then %userremove syslog %groupremove syslog fi +%systemd_reload %triggerpostun -- inetutils-syslogd /sbin/chkconfig --del syslog @@ -307,7 +280,7 @@ echo "Original file from package is available as /etc/syslog.conf.rpmnew" fi -%triggerpostun -n syslog -- syslog < 1.4.1-17.7 +%triggerpostun -n syslog -- syslog < 1.5-4 # remove any -a option from ADDITIONAL_SOCK cp -f /etc/sysconfig/syslog{,.rpmsave} sed -i -e '/^ADDITIONAL_SOCK=/s/-a //g' /etc/sysconfig/syslog @@ -316,6 +289,11 @@ # survive syslog reload chgrp syslog /etc/syslog.conf +%systemd_trigger syslog.service + +%triggerpostun -n klogd -- klogd < 1.5-4 +%systemd_trigger klogd.service + %clean rm -rf $RPM_BUILD_ROOT @@ -332,9 +310,6 @@ %attr(755,root,root) %{_bindir}/syslogd-listfiles %{_mandir}/man5/* %{_mandir}/man8/sys* - -%files -n syslog-systemd -%defattr(644,root,root,755) %{systemdunitdir}/syslog.service %files -n klogd @@ -343,9 +318,6 @@ %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/klogd %attr(755,root,root) %{_sbindir}/klogd %{_mandir}/man8/klog* - -%files -n klogd-systemd -%defattr(644,root,root,755) %{systemdunitdir}/klogd.service %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -354,6 +326,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.135 2012/02/05 16:56:41 baggins +- rel 4 +- merge systemd stuff into main package + Revision 1.134 2012/02/04 22:36:12 blues - systemd sypport ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/sysklogd/sysklogd.spec?r1=1.134&r2=1.135&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
