diff --git a/syslogd.changes b/syslogd.changes index 0dbc251..a0e27c2 100644 --- a/syslogd.changes +++ b/syslogd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 27 13:21:16 UTC 2022 - Ludwig Nussel + +- Replace transitional %usrmerged macro with regular version check (boo#1206798) + ------------------------------------------------------------------- Wed Oct 19 11:57:37 UTC 2022 - Dr. Werner Fink diff --git a/syslogd.spec b/syslogd.spec index 10cf723..da9f147 100644 --- a/syslogd.spec +++ b/syslogd.spec @@ -177,7 +177,7 @@ install -m 644 %{SOURCE8} %{buildroot}%{_unitdir}/ install -m 755 %{SOURCE9} %{buildroot}/%{_sbindir}/ ln -s service %{buildroot}/%{_sbindir}/rcsyslogd install -m 644 %{SOURCE12} %{buildroot}%{_fillupdir} -%if !0%{?usrmerged} +%if 0%{?suse_version} < 1550 for sbin in klogd syslogd ; do ln -sf %{_sbindir}/${sbin} %{buildroot}/sbin/${sbin} done @@ -380,7 +380,7 @@ done %attr(0755,root,root) %dir %ghost %{_rundir}/syslogd %{_sbindir}/syslogd %{_sbindir}/rcsyslogd -%if !0%{?usrmerged} +%if 0%{?suse_version} < 1550 /sbin/syslogd %endif @@ -390,7 +390,7 @@ done %{_unitdir}/klogd.service %{_mandir}/man8/klogd.8%{ext_man} %{_sbindir}/klogd -%if !0%{?usrmerged} +%if 0%{?suse_version} < 1550 /sbin/klogd %endif