From f78b56f65ae888ff8ffc6f0bfdc982ab60394e3d64a31484b9416ca18dfbcf06 Mon Sep 17 00:00:00 2001
From: Danilo Spinella <danilo.spinella@suse.com>
Date: Wed, 4 Jan 2023 14:19:00 +0000
Subject: [PATCH] Accepting request 1055744 from home:lnussel:usrmerge

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

OBS-URL: https://build.opensuse.org/request/show/1055744
OBS-URL: https://build.opensuse.org/package/show/Base:System/tar?expand=0&rev=118
---
 tar.changes | 5 +++++
 tar.spec    | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/tar.changes b/tar.changes
index 91b417c..3823980 100644
--- a/tar.changes
+++ b/tar.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec 27 13:22:21 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
+
+- Replace transitional %usrmerged macro with regular version check (boo#1206798)
+
 -------------------------------------------------------------------
 Thu Oct 27 13:55:03 UTC 2022 - Danilo Spinella <danilo.spinella@suse.com>
 
diff --git a/tar.spec b/tar.spec
index 8f9781c..8ae282d 100644
--- a/tar.spec
+++ b/tar.spec
@@ -167,7 +167,7 @@ rm %{buildroot}%{_localstatedir}/lib/tests/tar/{atconfig,atlocal,Makefile}*
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 ln -sf %{_sysconfdir}/alternatives/rmt %{buildroot}%{_bindir}/rmt
 ln -sf %{_sysconfdir}/alternatives/rmt.1%{ext_man} %{buildroot}%{_mandir}/man1/rmt.1%{ext_man}
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 mkdir -p %{buildroot}/bin
 ln -s %{_bindir}/%{name} %{buildroot}/bin
 %endif
@@ -218,7 +218,7 @@ fi
 
 %files
 %license COPYING
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 /bin/%{name}
 %endif
 %{_bindir}/%{name}