From 155f5fff84b8041ab84ea869e8d0912d0d94620ca5290076294df5f5e66ecbb6 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Mon, 20 Mar 2023 14:03:15 +0000
Subject: [PATCH] Accepting request 1055716 from home:lnussel:usrmerge

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

OBS-URL: https://build.opensuse.org/request/show/1055716
OBS-URL: https://build.opensuse.org/package/show/network:utilities/net-tools?expand=0&rev=67
---
 net-tools.changes | 5 +++++
 net-tools.spec    | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/net-tools.changes b/net-tools.changes
index 85a1060..43bc7a9 100644
--- a/net-tools.changes
+++ b/net-tools.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec 27 13:12:55 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
+
+- Replace transitional %usrmerged macro with regular version check (boo#1206798)
+
 -------------------------------------------------------------------
 Sun Jan 24 18:04:26 UTC 2021 - Dirk Müller <dmueller@suse.com>
 
diff --git a/net-tools.spec b/net-tools.spec
index ef040b0..082c8cc 100644
--- a/net-tools.spec
+++ b/net-tools.spec
@@ -84,7 +84,7 @@ for tool in iptunnel ipmaddr; do
   help2man -s8 "%{buildroot}%{_sbindir}/${tool}" --no-discard-stderr >"${t}"
 done
 # generate bin/sbin compat symlinks
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 mkdir -p %{buildroot}/sbin
 mkdir -p %{buildroot}/bin
 for i in ether-wake nameif plipconfig slattach arp ipmaddr iptunnel; do
@@ -103,7 +103,7 @@ done
 %{_sbindir}/nameif
 %{_sbindir}/plipconfig
 %{_sbindir}/slattach
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 /sbin/ether-wake
 /sbin/nameif
 /sbin/plipconfig
@@ -126,7 +126,7 @@ done
 %{_bindir}/ifconfig
 %{_bindir}/netstat
 %{_bindir}/route
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 /bin/ifconfig
 /bin/netstat
 /bin/route