From 7aee87415d7b406f22e5c0d2c0b7bf499c6836c839ac7c95321b78712e6f1f43 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Wed, 4 Jan 2023 10:54:19 +0000
Subject: [PATCH] Accepting request 1054610 from home:lnussel:usrmerge

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

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

diff --git a/hdparm.changes b/hdparm.changes
index d51d936..9b4c06f 100644
--- a/hdparm.changes
+++ b/hdparm.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec 27 12:26:26 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
+
+- Replace transitional %usrmerged macro with regular version check (boo#1206798)
+
 -------------------------------------------------------------------
 Wed Sep 14 09:15:05 UTC 2022 - Danilo Spinella <danilo.spinella@suse.com>
 
diff --git a/hdparm.spec b/hdparm.spec
index 4a1ecf9..43a2a6b 100644
--- a/hdparm.spec
+++ b/hdparm.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package hdparm
 #
-# 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
@@ -60,7 +60,7 @@ install -d "%{buildroot}%{_libexecdir}/hdparm"
 install -m 755 contrib/idectl "%{buildroot}%{_libexecdir}/hdparm"
 install -m 755 contrib/ultrabayd "%{buildroot}%{_libexecdir}/hdparm"
 install -m 755 wiper/wiper.sh "%{buildroot}/%{_sbindir}"
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 mkdir -p "%{buildroot}/sbin"
 ln -sf %{_sbindir}/wiper.sh "%{buildroot}/sbin"
 ln -sf %{_sbindir}/hdparm "%{buildroot}/sbin"
@@ -70,7 +70,7 @@ ln -sf %{_sbindir}/hdparm "%{buildroot}/sbin"
 %license LICENSE.TXT
 %doc Changelog README.acoustic contrib/README.contrib README.wiper
 %{_mandir}/man8/hdparm.8%{?ext_man}
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 /sbin/hdparm
 /sbin/wiper.sh
 %endif