From 3b8734dd9660b18d9cb6c26bb907e06af2a3a984358812179573448ecc251e59 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Wed, 4 Jan 2023 18:40:50 +0000
Subject: [PATCH] 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
---
 keyutils.changes | 5 +++++
 keyutils.spec    | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

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 <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>
 
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