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

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

OBS-URL: https://build.opensuse.org/request/show/1052771
OBS-URL: https://build.opensuse.org/package/show/Archiving/cpio?expand=0&rev=89
---
 cpio.changes | 5 +++++
 cpio.spec    | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cpio.changes b/cpio.changes
index 232ff12..b122a53 100644
--- a/cpio.changes
+++ b/cpio.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec 27 10:29:29 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
+
+- Replace transitional %usrmerged macro with regular version check (boo#1206798)
+
 -------------------------------------------------------------------
 Thu Oct 28 13:13:33 UTC 2021 - Danilo Spinella <danilo.spinella@suse.com>
 
diff --git a/cpio.spec b/cpio.spec
index 7bf3496..0e1b960 100644
--- a/cpio.spec
+++ b/cpio.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cpio
 #
-# Copyright (c) 2021 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
@@ -110,7 +110,7 @@ mkdir -p %{buildroot}/{usr/bin,bin}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 ln -sf %{_sysconfdir}/alternatives/mt %{buildroot}%{_bindir}/mt
 ln -sf %{_sysconfdir}/alternatives/mt.1%{ext_man} %{buildroot}%{_mandir}/man1/mt.1%{ext_man}
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 ln -sf %{_bindir}/cpio %{buildroot}/bin
 %endif
 
@@ -138,7 +138,7 @@ fi
 %files
 %license COPYING
 %doc NEWS ChangeLog
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 /bin/cpio
 %endif
 %{_bindir}/cpio