From d65e322de57b5c2355379684fbaf7eb7369a5c689f0aba16c315115f88fd67cf Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Mon, 20 Mar 2023 14:02:24 +0000
Subject: [PATCH] Accepting request 1054650 from home:lnussel:usrmerge

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

OBS-URL: https://build.opensuse.org/request/show/1054650
OBS-URL: https://build.opensuse.org/package/show/network:utilities/hostname?expand=0&rev=25
---
 hostname.changes | 5 +++++
 hostname.spec    | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/hostname.changes b/hostname.changes
index 583701a..ea25ec0 100644
--- a/hostname.changes
+++ b/hostname.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec 27 12:26:47 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
+
+- Replace transitional %usrmerged macro with regular version check (boo#1206798)
+
 -------------------------------------------------------------------
 Mon Oct 19 16:04:14 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
 
diff --git a/hostname.spec b/hostname.spec
index 5387936..b754dd7 100644
--- a/hostname.spec
+++ b/hostname.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package hostname
 #
-# Copyright (c) 2020 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
@@ -44,13 +44,13 @@ make %{?_smp_mflags} CFLAGS="%{optflags} -D_GNU_SOURCE"
 
 %install
 install -D -p -m 755 %{name} %{buildroot}%{_bindir}/%{name}
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 install -d -m 755 %{buildroot}/bin/
 ln -sf %{_bindir}/%{name} %{buildroot}/bin/%{name}
 %endif
 install -D -p -m 644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
 for prog in dnsdomainname domainname ypdomainname nisdomainname; do
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
     ln -sf %{_bindir}/%{name} %{buildroot}/bin/$prog
 %endif
     ln -sf %{_bindir}/%{name} %{buildroot}%{_bindir}/$prog
@@ -71,7 +71,7 @@ install -p -m 0644 nis-domainname.service %{buildroot}%{_unitdir}
 %files
 %license COPYRIGHT
 %doc debian/changelog
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 /bin/%{name}
 /bin/domainname
 /bin/dnsdomainname