Hello community,
here is the log from the commit of package syslogd for openSUSE:Factory checked
in at 2020-12-03 18:40:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/syslogd (Old)
and /work/SRC/openSUSE:Factory/.syslogd.new.5913 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "syslogd"
Thu Dec 3 18:40:54 2020 rev:94 rq:852030 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/syslogd/syslogd.changes 2020-09-03
01:12:26.280432690 +0200
+++ /work/SRC/openSUSE:Factory/.syslogd.new.5913/syslogd.changes
2020-12-03 18:42:24.566133866 +0100
@@ -1,0 +2,6 @@
+Tue Nov 24 17:03:30 UTC 2020 - Ludwig Nussel <lnus...@suse.de>
+
+- prepare usrmerge (boo#1029961)
+- replace broken rcsyslog script with rcsyslogd link
+
+-------------------------------------------------------------------
Old:
----
rc.syslog
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ syslogd.spec ++++++
--- /var/tmp/diff_new_pack.noqpLv/_old 2020-12-03 18:42:25.358134366 +0100
+++ /var/tmp/diff_new_pack.noqpLv/_new 2020-12-03 18:42:25.362134369 +0100
@@ -40,7 +40,6 @@
Source7: klogd.service
Source8: syslogd.service
Source9: syslogd-service-prepare
-Source10: rc.syslog
Source11: syslogd-rpmlintrc
Source12: sysconfig.boot
Patch0: sysklogd-1.4.1.dif
@@ -181,11 +180,13 @@
install -m 644 %{SOURCE7} %{buildroot}%{_unitdir}/
install -m 644 %{SOURCE8} %{buildroot}%{_unitdir}/
install -m 755 %{SOURCE9} %{buildroot}/%{_sbindir}/
-install -m 755 %{SOURCE10} %{buildroot}/sbin/rcsyslog
+ln -s service %{buildroot}/%{_sbindir}/rcsyslogd
install -m 644 %{SOURCE12} %{buildroot}%{_fillupdir}
+%if !0%{?usrmerged}
for sbin in klogd syslogd ; do
ln -sf %{_sbindir}/${sbin} %{buildroot}/sbin/${sbin}
done
+%endif
%ifarch s390 s390x
sed -i 's/^KERNEL_LOGLEVEL=1/KERNEL_LOGLEVEL=7/' \
%{buildroot}%{_fillupdir}/sysconfig.klogd
@@ -369,7 +370,10 @@
%{_sbindir}/syslogd-service-prepare
%attr(0755,root,root) %dir %ghost %{_rundir}/syslogd
%{_sbindir}/syslogd
+%{_sbindir}/rcsyslogd
+%if !0%{?usrmerged}
/sbin/syslogd
+%endif
%files -n klogd
%defattr(-,root,root)
@@ -377,7 +381,9 @@
%{_unitdir}/klogd.service
%{_mandir}/man8/klogd.8%{ext_man}
%{_sbindir}/klogd
+%if !0%{?usrmerged}
/sbin/klogd
+%endif
%files -n syslog-service
%defattr(-,root,root)
@@ -385,6 +391,5 @@
%config(noreplace) %{_sysconfdir}/logrotate.d/syslog
%{_unitdir}/klog.service
%{_mandir}/man8/syslog.8%{ext_man}
-/sbin/rcsyslog
%changelog
_______________________________________________
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
