From 0d1a54573bca686f62380e611f325ff5097ff599f9a21ccdd175ac4f789b839a Mon Sep 17 00:00:00 2001
From: Petr Vorel <petr.vorel@gmail.com>
Date: Wed, 4 Jan 2023 16:33:42 +0000
Subject: [PATCH] Accepting request 1055730 from home:lnussel:usrmerge

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

OBS-URL: https://build.opensuse.org/request/show/1055730
OBS-URL: https://build.opensuse.org/package/show/network/rpcbind?expand=0&rev=97
---
 rpcbind.changes | 5 +++++
 rpcbind.spec    | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/rpcbind.changes b/rpcbind.changes
index 27bc3a7..a92e6d2 100644
--- a/rpcbind.changes
+++ b/rpcbind.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec 27 13:16:20 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
+
+- Replace transitional %usrmerged macro with regular version check (boo#1206798)
+
 -------------------------------------------------------------------
 Mon Jun 21 15:44:17 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>
 
diff --git a/rpcbind.spec b/rpcbind.spec
index 4ecbc8c..a032d01 100644
--- a/rpcbind.spec
+++ b/rpcbind.spec
@@ -86,7 +86,7 @@ install -m 644 %{SOURCE5} %{buildroot}%{_sysusersdir}/
 mkdir -p %{buildroot}/%{_sbindir}
 ln -s service %{buildroot}%{_sbindir}/rc%{name}
 ln -s %{_bindir}/rpcinfo %{buildroot}%{_sbindir}/rpcinfo
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 mkdir %{buildroot}/sbin
 mkdir %{buildroot}/bin
 ln -s %{_bindir}/rpcinfo %{buildroot}/sbin/rpcinfo
@@ -110,7 +110,7 @@ ln -s %{_sbindir}/%{name} %{buildroot}/sbin/%{name}
 %files
 %license COPYING
 %doc AUTHORS README
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 /sbin/%{name}
 /bin/rpcinfo
 /sbin/rpcinfo