rpm/hdparm
SHA256
1
0
Fork 0
forked from pool/hdparm
Code Pull Requests Activity

Accepting request 1054610 from home:lnussel:usrmerge

Browse Source 
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
This commit is contained in:
Dirk Mueller 2023-01-04 10:54:19 +00:00 committed by Git OBS Bridge
parent 84b3eceef6
commit 7aee87415d
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hdparm.changes
View File

@ -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> Wed Sep 14 09:15:05 UTC 2022 - Danilo Spinella <danilo.spinella@suse.com>

6
hdparm.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package hdparm # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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/idectl "%{buildroot}%{_libexecdir}/hdparm"
install -m 755 contrib/ultrabayd "%{buildroot}%{_libexecdir}/hdparm" install -m 755 contrib/ultrabayd "%{buildroot}%{_libexecdir}/hdparm"
install -m 755 wiper/wiper.sh "%{buildroot}/%{_sbindir}" install -m 755 wiper/wiper.sh "%{buildroot}/%{_sbindir}"
%if !0%{?usrmerged} %if 0%{?suse_version} < 1550
mkdir -p "%{buildroot}/sbin" mkdir -p "%{buildroot}/sbin"
ln -sf %{_sbindir}/wiper.sh "%{buildroot}/sbin" ln -sf %{_sbindir}/wiper.sh "%{buildroot}/sbin"
ln -sf %{_sbindir}/hdparm "%{buildroot}/sbin" ln -sf %{_sbindir}/hdparm "%{buildroot}/sbin"
@ -70,7 +70,7 @@ ln -sf %{_sbindir}/hdparm "%{buildroot}/sbin"
%license LICENSE.TXT %license LICENSE.TXT
%doc Changelog README.acoustic contrib/README.contrib README.wiper %doc Changelog README.acoustic contrib/README.contrib README.wiper
%{_mandir}/man8/hdparm.8%{?ext_man} %{_mandir}/man8/hdparm.8%{?ext_man}
%if !0%{?usrmerged} %if 0%{?suse_version} < 1550
/sbin/hdparm /sbin/hdparm
/sbin/wiper.sh /sbin/wiper.sh
%endif %endif