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

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

OBS-URL: https://build.opensuse.org/request/show/1054542
OBS-URL: https://build.opensuse.org/package/show/Base:System/gzip?expand=0&rev=91
---
 gzip.changes | 5 +++++
 gzip.spec    | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/gzip.changes b/gzip.changes
index 7fa0194..70d347b 100644
--- a/gzip.changes
+++ b/gzip.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec 27 12:26:05 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
+
+- Replace transitional %usrmerged macro with regular version check (boo#1206798)
+
 -------------------------------------------------------------------
 Wed Apr 27 08:53:53 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/gzip.spec b/gzip.spec
index c4b93a1..a09021f 100644
--- a/gzip.spec
+++ b/gzip.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package gzip
 #
-# 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
@@ -107,7 +107,7 @@ done
 
 %install
 %make_install
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 mkdir -p %{buildroot}/bin
 ln -sf %{_bindir}/gzip %{_bindir}/gunzip %{_bindir}/zcat %{buildroot}/bin
 %endif
@@ -123,7 +123,7 @@ ln -sf zmore.1 %{buildroot}%{_mandir}/man1/zless.1
 %files
 %license COPYING
 %doc README AUTHORS ChangeLog TODO NEWS THANKS
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 /bin/gunzip
 /bin/gzip
 /bin/zcat