Author: blues Date: Sat Feb 4 22:36:18 2012 GMT Module: packages Tag: HEAD ---- Log message: - systemd sypport
---- Files affected: packages/sysklogd: sysklogd.spec (1.133 -> 1.134) , klogd.service (NONE -> 1.1) (NEW), syslog.service (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/sysklogd/sysklogd.spec diff -u packages/sysklogd/sysklogd.spec:1.133 packages/sysklogd/sysklogd.spec:1.134 --- packages/sysklogd/sysklogd.spec:1.133 Sat Jan 29 01:07:26 2011 +++ packages/sysklogd/sysklogd.spec Sat Feb 4 23:36:12 2012 @@ -10,7 +10,7 @@ Summary(tr.UTF-8): Linux sistem ve çekirdek kayıt süreci Name: sysklogd Version: 1.5 -Release: 2 +Release: 3 License: GPL v2+ Group: Daemons Source0: http://www.infodrom.org/projects/sysklogd/download/%{name}-%{version}.tar.gz @@ -23,6 +23,8 @@ Source6: klogd.sysconfig Source7: syslogd-listfiles.sh Source8: syslogd-listfiles.8 +Source9: syslog.service +Source10: klogd.service Patch0: %{name}-bind.patch Patch1: %{name}-alpha.patch Patch2: %{name}-alphafoo.patch @@ -107,6 +109,7 @@ # Requires: klogd Requires: logrotate >= 3.2-3 Requires: psmisc >= 20.1 +Suggests: klogd Provides: group(syslog) Provides: syslogdaemon Provides: user(syslog) @@ -128,6 +131,16 @@ 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 @@ -143,6 +156,7 @@ Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd Requires(pre): /usr/sbin/usermod +Suggests: syslog Provides: group(syslog) Provides: user(syslog) Obsoletes: sysklogd @@ -155,6 +169,16 @@ 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 @@ -177,7 +201,7 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d,logrotate.d} \ $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man{5,8},%{_bindir}} \ - $RPM_BUILD_ROOT/{dev,var/log/news} + $RPM_BUILD_ROOT{/dev,/var/log/news,%{systemdunitdir}} %{__make} install \ BINDIR=$RPM_BUILD_ROOT%{_sbindir} \ @@ -193,6 +217,8 @@ install %{SOURCE7} $RPM_BUILD_ROOT%{_bindir}/syslogd-listfiles 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 do @@ -232,6 +258,24 @@ %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 %groupadd -P klogd -g 18 syslog %useradd -P klogd -u 18 -g syslog -c "Syslog User" syslog @@ -289,6 +333,10 @@ %{_mandir}/man5/* %{_mandir}/man8/sys* +%files -n syslog-systemd +%defattr(644,root,root,755) +%{systemdunitdir}/syslog.service + %files -n klogd %defattr(644,root,root,755) %attr(754,root,root) /etc/rc.d/init.d/klogd @@ -296,12 +344,19 @@ %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"`) %changelog * %{date} PLD Team <[email protected]> All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.134 2012/02/04 22:36:12 blues +- systemd sypport + Revision 1.133 2011/01/29 00:07:26 sparky - dropped pre-cvs changelog ================================================================ Index: packages/sysklogd/klogd.service diff -u /dev/null packages/sysklogd/klogd.service:1.1 --- /dev/null Sat Feb 4 23:36:18 2012 +++ packages/sysklogd/klogd.service Sat Feb 4 23:36:12 2012 @@ -0,0 +1,11 @@ +[Unit] +Description=System Kernel Logging Service +After=syslog.service + +[Service] +EnvironmentFile=/etc/sysconfig/klogd +ExecStart=/sbin/service klogd start +ExecStop=/sbin/service klogd stop + +[Install] +WantedBy=multi-user.target ================================================================ Index: packages/sysklogd/syslog.service diff -u /dev/null packages/sysklogd/syslog.service:1.1 --- /dev/null Sat Feb 4 23:36:18 2012 +++ packages/sysklogd/syslog.service Sat Feb 4 23:36:12 2012 @@ -0,0 +1,10 @@ +[Unit] +Description=System Logging Service + +[Service] +EnvironmentFile=/etc/sysconfig/syslog +ExecStart=/sbin/service syslog start +ExecStop=/sbin/service syslog stop + +[Install] +WantedBy=multi-user.target ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/sysklogd/sysklogd.spec?r1=1.133&r2=1.134&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
