From 12e2de0c922c585554bc1383915d14aee5c81625302201e9a9d171da872d513c Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Tue, 1 Dec 2020 07:56:24 +0000
Subject: [PATCH] Accepting request 851915 from home:lnussel:usrmove

- prepare usrmerge (boo#1029961)
- replace broken rcsyslog script with rcsyslogd link

OBS-URL: https://build.opensuse.org/request/show/851915
OBS-URL: https://build.opensuse.org/package/show/Base:System/syslogd?expand=0&rev=149
---
 rc.syslog       | 18 ------------------
 syslogd.changes |  6 ++++++
 syslogd.spec    | 11 ++++++++---
 3 files changed, 14 insertions(+), 21 deletions(-)
 delete mode 100644 rc.syslog

diff --git a/rc.syslog b/rc.syslog
deleted file mode 100644
index 242ca5a..0000000
--- a/rc.syslog
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
-#
-# Author:
-#     Werner Fink <werner@suse.de>
-#     Marius Tomaschewski <mt@suse.de>
-#
-# Description:
-#     Compatibility script triggering a "systemctl <action> syslog.service"
-#     redirection using rc.status.
-#
-
-. /etc/rc.status
-
-echo "Usage: /sbin/rcsyslog {start|stop|status|try-restart|restart|force-reload|reload}"
-exit 1
-
diff --git a/syslogd.changes b/syslogd.changes
index c519712..fdf77f5 100644
--- a/syslogd.changes
+++ b/syslogd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Nov 24 17:03:30 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- prepare usrmerge (boo#1029961)
+- replace broken rcsyslog script with rcsyslogd link
+
 -------------------------------------------------------------------
 Wed Aug 19 07:15:13 UTC 2020 - Dr. Werner Fink <werner@suse.de>
 
diff --git a/syslogd.spec b/syslogd.spec
index c0defc2..7f88502 100644
--- a/syslogd.spec
+++ b/syslogd.spec
@@ -40,7 +40,6 @@ Source6:        klog.service
 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 %{SOURCE6} %{buildroot}%{_unitdir}/
 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 @@ rm -f %{_sysconfdir}/systemd/system/multi-user.target.wants/syslog.service
 %{_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 @@ rm -f %{_sysconfdir}/systemd/system/multi-user.target.wants/syslog.service
 %{_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 @@ rm -f %{_sysconfdir}/systemd/system/multi-user.target.wants/syslog.service
 %config(noreplace) %{_sysconfdir}/logrotate.d/syslog
 %{_unitdir}/klog.service
 %{_mandir}/man8/syslog.8%{ext_man}
-/sbin/rcsyslog
 
 %changelog