From 6cb9012e631222a129b4840ad3d88d6c487ee7917c59cccc549ea13d32066521 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 20 Nov 2020 10:16:13 +0000 Subject: [PATCH] Accepting request 849618 from home:lnussel:usrmove - prepare usrmerge (boo#1029961) OBS-URL: https://build.opensuse.org/request/show/849618 OBS-URL: https://build.opensuse.org/package/show/security/keyutils?expand=0&rev=51 --- keyutils.changes | 5 +++++ keyutils.spec | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/keyutils.changes b/keyutils.changes index 4cea68d..f2c1a05 100644 --- a/keyutils.changes +++ b/keyutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 16 09:59:07 UTC 2020 - Ludwig Nussel + +- prepare usrmerge (boo#1029961) + ------------------------------------------------------------------- Mon Jul 1 14:28:52 UTC 2019 - Wolfgang Frisch diff --git a/keyutils.spec b/keyutils.spec index 0059665..20e0dcf 100644 --- a/keyutils.spec +++ b/keyutils.spec @@ -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 @@ make %{?_smp_mflags} NO_ARLIB=1 CFLAGS="%{optflags}" CC="%__cc" %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 @@ ln -s /%{_sbindir}/request-key %{buildroot}/sbin %defattr(-,root,root,-) %license LICENCE.GPL %doc README +%if !0%{?usrmerged} /sbin/* /bin/* +%endif /%{_sbindir}/* /%{_bindir}/* %{_datadir}/keyutils