2011-08-22 13:14:47 +00:00
committed by Git OBS Bridge
parent 5b5968ce59
commit f821b84a13
7 changed files with 166 additions and 52 deletions

View File

@@ -24,8 +24,10 @@ Name: syslogd
License: GPLv2+
Group: System/Daemons
BuildRequires: pkg-config systemd-devel
PreReq: coreutils %fillup_prereq klogd sed
PreReq: coreutils %fillup_prereq sed
PreReq: klogd syslog-service
Provides: syslog
Provides: sysklogd
AutoReqProv: on
Version: 1.4.1
Release: 741
@@ -40,6 +42,7 @@ Source6: syslog.8
Source7: syslog-service-generator
Source8: klogd.service
Source9: syslog.service
Source10: klog.service
Patch0: sysklogd-1.4.1.dif
Patch1: sysklogd-1.4.1-dgram.patch
Patch2: sysklogd-1.4.1-sparc.patch
@@ -88,10 +91,7 @@ Authors:
%package -n klogd
License: GPLv2+
PreReq: %insserv_prereq %fillup_prereq
Provides: sysklogd
Provides: syslogd:/sbin/klogd
Requires: /etc/init.d/network logrotate
Provides: klogd:/sbin/klogd
Summary: The kernel log daemon
Group: System/Daemons
@@ -111,6 +111,24 @@ Authors:
Juha Virtanen <jiivee@hut.fi>
Shane Alderton <shane@scs.apana.org.au>
%package -n syslog-service
License: GPLv2+
PreReq: %insserv_prereq %fillup_prereq
Provides: klogd:/etc/init.d/syslog
Requires: /etc/init.d/network logrotate
Summary: The kernel log daemon
Group: System/Daemons
%description -n syslog-service
The package syslog-service provides the service boot
scripts for SysV and the service unit files for systemd.
Authors:
--------
Marius Tomaschewsk
Werner Fink
%prep
%setup -n sysklogd-1.4.1
%patch1 -p0 -b .dgram
@@ -169,6 +187,7 @@ mv sample-s390.conf sample.conf
install -m 755 %{SOURCE7} $RPM_BUILD_ROOT%{sysdsysunitdir}-generators/
install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{sysdsysunitdir}/
install -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{sysdsysunitdir}/
install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{sysdsysunitdir}/
%ifarch s390 s390x
sed 's/^KERNEL_LOGLEVEL=1/KERNEL_LOGLEVEL=7/' %{SOURCE2} \
> $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.syslog
@@ -176,10 +195,9 @@ mv sample-s390.conf sample.conf
%post
#
# add syslog variables provided by klogd if needed
# add syslog variables provided by syslogd if needed
#
%{fillup_and_insserv -ny syslog syslog}
%{fillup_and_insserv -nY syslog earlysyslog}
%{fillup_only -ns syslog syslogd}
#
# check if daemon configured in SYSLOG_DAEMON is
# installed and switch to ourself if it's missed
@@ -214,11 +232,6 @@ touch var/log/news/news.err; chmod 640 var/log/news/news.err
chown news:news var/log/news/news.err
touch var/log/news/news.notice; chmod 640 var/log/news/news.notice
chown news:news var/log/news/news.notice
mkdir -p -m 0755 /var/run/rsyslog
mkdir -p -m 0755 /var/run/syslog-ng
%preun
%stop_on_removal syslog
%postun
%restart_on_update syslog
@@ -232,36 +245,63 @@ if test -f etc/sysconfig/syslog ; then
fi
fi
%preun -n klogd
%post -n syslog-service
#
# add syslog variables provided by klogd if needed
#
%{fillup_and_insserv -ny syslog syslog}
%{fillup_and_insserv -nY syslog earlysyslog}
mkdir -p -m 0755 var/run/rsyslog
mkdir -p -m 0755 var/run/syslog-ng
%preun -n syslog-service
%stop_on_removal syslog
%postun -n syslog-service
%restart_on_update syslog
%{insserv_cleanup}
%post -n klogd
#
# add syslog variables provided by klogd if needed
#
%{fillup_only -ns syslog klogd}
%restart_on_update syslog
%preun -n klogd
%restart_on_update syslog
%postun -n klogd
%restart_on_update syslog
%{insserv_cleanup}
%files
%defattr(-,root,root)
/var/adm/fillup-templates/sysconfig.syslogd
%config %verify(not mode) /etc/syslog.conf
%doc %{_mandir}/man5/syslog.conf.5.gz
%doc %{_mandir}/man8/syslogd.8.gz
%doc %{_mandir}/man8/sysklogd.8.gz
/sbin/syslogd
%files -n klogd
%defattr(-,root,root)
/var/adm/fillup-templates/sysconfig.syslog
/var/adm/fillup-templates/sysconfig.klogd
%config %{sysdsysunitdir}/klogd.service
%doc %{_mandir}/man8/klogd.8.gz
/sbin/klogd
%files -n syslog-service
%defattr(-,root,root)
%config(noreplace) /etc/logrotate.d/syslog
%config /etc/init.d/syslog
%config /etc/init.d/earlysyslog
%config %{sysdsysunitdir}/klogd.service
%config %{sysdsysunitdir}/syslog.service
%doc %{_mandir}/man8/klogd.8.gz
%doc %{_mandir}/man8/sysklogd.8.gz
%doc %{_mandir}/man8/syslog.8.gz
/sbin/klogd
/sbin/rcsyslog
%attr(0744,root,root) %{sysdsysunitdir}-generators/syslog-service-generator
%attr(0755,root,root) %dir %ghost /var/run/rsyslog/
%attr(0755,root,root) %dir %ghost /var/run/syslog-ng/
%attr(0755,root,root) %dir %ghost /var/run/rsyslog
%attr(0755,root,root) %dir %ghost /var/run/syslog-ng
%{omc_svcdir}/syslog.xml
%changelog