diff --git a/keyutils.changes b/keyutils.changes index f9c2087..e1e547b 100644 --- a/keyutils.changes +++ b/keyutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 27 12:37:34 UTC 2022 - Ludwig Nussel + +- Replace transitional %usrmerged macro with regular version check (boo#1206798) + ------------------------------------------------------------------- Tue Jun 21 08:26:54 UTC 2022 - Alberto Planas Dominguez diff --git a/keyutils.spec b/keyutils.spec index 2a17dd7..cea9470 100644 --- a/keyutils.spec +++ b/keyutils.spec @@ -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