From 66780624a588d5e26a713dee381e82e98a45a9ae44a6207bc5067678cbb43b03 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Wed, 4 Jan 2023 11:09:52 +0000
Subject: [PATCH] Accepting request 1054740 from home:lnussel:usrmerge

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

OBS-URL: https://build.opensuse.org/request/show/1054740
OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=234
---
 iproute2.changes | 5 +++++
 iproute2.spec    | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/iproute2.changes b/iproute2.changes
index 29c00db..8f6c137 100644
--- a/iproute2.changes
+++ b/iproute2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec 27 12:27:23 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
+
+- Replace transitional %usrmerged macro with regular version check (boo#1206798)
+
 -------------------------------------------------------------------
 Fri Dec 23 08:13:21 UTC 2022 - Dirk Müller <dmueller@suse.com>
 
diff --git a/iproute2.spec b/iproute2.spec
index 8c5f371..edbbc0b 100644
--- a/iproute2.spec
+++ b/iproute2.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package iproute2
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -123,7 +123,7 @@ chmod -x "$b/%_libdir/libnetlink.a"
 install -pm0644 "include/libnetlink.h" "$b/%_includedir/"
 chmod -x "$b/%_includedir/libnetlink.h"
 install -Dm0644 "%SOURCE3" "$b/%_tmpfilesdir/%name.conf"
-%if 0%{?usrmerged}
+%if 0%{?suse_version} >= 1550
 ln -sf "%_sbindir/ip" "$b/%_bindir/ip"
 %else
 ln -s "%_sbindir/ip" "$b/sbin/"
@@ -158,7 +158,7 @@ EOF
 %_tmpfilesdir/%name.conf
 %ghost %dir %_rundir/netns
 %exclude %_sbindir/arpd
-%if 0%{?usrmerged}
+%if 0%{?suse_version} >= 1550
 %_bindir/ip
 %else
 /sbin/*