From 94ff671922742260a0b3d962ec71794d9039eb76da01fe90a2421e5481d203de Mon Sep 17 00:00:00 2001
From: Kristyna Streitova <kstreitova@suse.com>
Date: Mon, 30 Nov 2020 18:11:52 +0000
Subject: [PATCH] Accepting request 851917 from home:lnussel:usrmove

- prepare usrmerge (boo#1029961)

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

diff --git a/hdparm.changes b/hdparm.changes
index 886cc7c..92a8085 100644
--- a/hdparm.changes
+++ b/hdparm.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Nov 26 09:41:02 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
 -------------------------------------------------------------------
 Sun Feb 10 11:11:01 UTC 2019 - josua.mayer97@gmail.com
 
diff --git a/hdparm.spec b/hdparm.spec
index 9c5e5df..62f7cfb 100644
--- a/hdparm.spec
+++ b/hdparm.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package hdparm
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@ Release:        0
 Summary:        A Program to get and set hard disk parameters
 License:        SUSE-Permissive
 Group:          Hardware/Other
-Url:            http://sourceforge.net/projects/hdparm/
+URL:            http://sourceforge.net/projects/hdparm/
 Source:         http://downloads.sf.net/hdparm/%{name}-%{version}.tar.gz
 Patch1:         hdparm-nostrip.patch
 Patch2:         hdparm-wiper-warn.patch
@@ -57,19 +57,19 @@ 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}"
-#UsrMerge
+%if !0%{?usrmerged}
 mkdir -p "%{buildroot}/sbin"
 ln -sf %{_sbindir}/wiper.sh "%{buildroot}/sbin"
 ln -sf %{_sbindir}/hdparm "%{buildroot}/sbin"
-#EndUsrMerge
+%endif
 
 %files
 %doc Changelog README.acoustic contrib/README.contrib README.wiper
 %{_mandir}/man8/hdparm.8%{?ext_man}
-#UsrMerge
+%if !0%{?usrmerged}
 /sbin/hdparm
 /sbin/wiper.sh
-#EndUserMerge
+%endif
 %{_sbindir}/hdparm
 %{_sbindir}/wiper.sh
 %{_libexecdir}/hdparm