Hello community,
here is the log from the commit of package rsyslog for openSUSE:Factory checked
in at 2020-12-03 18:37:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rsyslog (Old)
and /work/SRC/openSUSE:Factory/.rsyslog.new.5913 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rsyslog"
Thu Dec 3 18:37:37 2020 rev:154 rq:851245 version:8.2010.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/rsyslog/rsyslog.changes 2020-11-23
15:50:57.700864965 +0100
+++ /work/SRC/openSUSE:Factory/.rsyslog.new.5913/rsyslog.changes
2020-12-03 18:37:38.897632434 +0100
@@ -1,0 +2,5 @@
+Thu Nov 26 10:57:12 UTC 2020 - Ludwig Nussel <lnus...@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rsyslog.spec ++++++
--- /var/tmp/diff_new_pack.CX2yBx/_old 2020-12-03 18:37:39.825634192 +0100
+++ /var/tmp/diff_new_pack.CX2yBx/_new 2020-12-03 18:37:39.833634208 +0100
@@ -754,10 +754,10 @@
%{buildroot}%{rsyslog_module_dir_withdeps}
done
fi
-if test "%{_sbindir}" != "/sbin" ; then
+%if !0%{?usrmerged}
install -d -m0755 %{buildroot}/sbin
ln -sf %{_sbindir}/rsyslogd $RPM_BUILD_ROOT/sbin/rsyslogd
-fi
+%endif
# it is simply broken (bnc#890228)
rm -f $RPM_BUILD_ROOT%{_sbindir}/zpipe
#
@@ -916,7 +916,7 @@
%config(noreplace) %attr(600,root,root) %{_sysconfdir}/rsyslog.d/remote.conf
%config(noreplace) %attr(600,root,root) %{_sysconfdir}/rsyslog.d/*.frule
%{_sbindir}/rsyslogd
-%if "%{_sbindir}" != "/sbin"
+%if !0%{?usrmerged}
/sbin/rsyslogd
%endif
%dir %{rsyslog_module_dir_nodeps}
_______________________________________________
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
