SHA256
1
0
forked from pool/keyutils

Accepting request 1055078 from home:lnussel:usrmerge

Replace transitional %usrmerged macro with regular version check (boo#1206798)

OBS-URL: https://build.opensuse.org/request/show/1055078
OBS-URL: https://build.opensuse.org/package/show/security/keyutils?expand=0&rev=60
This commit is contained in:
Marcus Meissner 2023-01-04 18:40:50 +00:00 committed by Git OBS Bridge
parent 0eb8eae8b8
commit 3b8734dd96
2 changed files with 7 additions and 2 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 12:37:34 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Replace transitional %usrmerged macro with regular version check (boo#1206798)
-------------------------------------------------------------------
Tue Jun 21 08:26:54 UTC 2022 - Alberto Planas Dominguez <aplanas@suse.com>

View File

@ -79,7 +79,7 @@ This package provides headers and libraries for building key utilities.
%install
make install NO_ARLIB=1 DESTDIR=%{buildroot} BINDIR=/%{_bindir} SBINDIR=/%{_sbindir} LIBDIR=/%{_libdir} USRLIBDIR=%{_libdir}
%if !0%{?usrmerged}
%if 0%{?suse_version} < 1550
mkdir -p %{buildroot}/bin %{buildroot}/sbin
ln -s /%{_bindir}/keyctl %{buildroot}/bin
ln -s /%{_sbindir}/key.dns_resolver %{buildroot}/sbin
@ -100,7 +100,7 @@ install -m 0750 -d \
%files
%license LICENCE.GPL
%doc README
%if !0%{?usrmerged}
%if 0%{?suse_version} < 1550
/sbin/*
/bin/*
%endif