Hello community, here is the log from the commit of package keyutils for openSUSE:Factory checked in at 2020-11-26 23:08:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/keyutils (Old) and /work/SRC/openSUSE:Factory/.keyutils.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "keyutils" Thu Nov 26 23:08:46 2020 rev:37 rq:849621 version:1.6 Changes: -------- --- /work/SRC/openSUSE:Factory/keyutils/keyutils.changes 2019-07-08 14:58:52.738339873 +0200 +++ /work/SRC/openSUSE:Factory/.keyutils.new.5913/keyutils.changes 2020-11-26 23:08:49.868796111 +0100 @@ -1,0 +2,5 @@ +Fri Oct 16 09:59:07 UTC 2020 - Ludwig Nussel <lnus...@suse.de> + +- prepare usrmerge (boo#1029961) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ keyutils.spec ++++++ --- /var/tmp/diff_new_pack.n8FQol/_old 2020-11-26 23:08:51.368797587 +0100 +++ /var/tmp/diff_new_pack.n8FQol/_new 2020-11-26 23:08:51.372797591 +0100 @@ -1,7 +1,7 @@ # # spec file for package keyutils # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ Name: keyutils %define lname libkeyutils1 -Url: http://people.redhat.com/~dhowells/keyutils/ +URL: http://people.redhat.com/~dhowells/keyutils/ Summary: Linux Key Management Utilities License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: System/Kernel @@ -70,10 +70,12 @@ %install make install NO_ARLIB=1 DESTDIR=%{buildroot} BINDIR=/%{_bindir} SBINDIR=/%{_sbindir} LIBDIR=/%{_libdir} USRLIBDIR=%{_libdir} +%if !0%{?usrmerged} mkdir -p %{buildroot}/bin %{buildroot}/sbin ln -s /%{_bindir}/keyctl %{buildroot}/bin ln -s /%{_sbindir}/key.dns_resolver %{buildroot}/sbin ln -s /%{_sbindir}/request-key %{buildroot}/sbin +%endif %post -n %lname -p /sbin/ldconfig @@ -83,8 +85,10 @@ %defattr(-,root,root,-) %license LICENCE.GPL %doc README +%if !0%{?usrmerged} /sbin/* /bin/* +%endif /%{_sbindir}/* /%{_bindir}/* %{_datadir}/keyutils _______________________________________________ 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
