From bfc53f48302c918d0f2bfa808f33c57fbe8fc84788de6282b0cac83eaf982c0d Mon Sep 17 00:00:00 2001 From: Petr Uzel Date: Fri, 17 Feb 2012 14:33:01 +0000 Subject: [PATCH 1/2] Accepting request 105285 from home:rjschwei:branches:Base:System - put binaries in /usr tree (UsrMerge) project OBS-URL: https://build.opensuse.org/request/show/105285 OBS-URL: https://build.opensuse.org/package/show/Base:System/hdparm?expand=0&rev=61 --- hdparm.changes | 5 +++++ hdparm.spec | 16 ++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/hdparm.changes b/hdparm.changes index b8a515f..b47caf5 100644 --- a/hdparm.changes +++ b/hdparm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 15 18:22:03 UTC 2012 - rschweikert@suse.com + +- put binaries in /usr tree (UsrMerge) project + ------------------------------------------------------------------- Mon Feb 6 13:44:39 UTC 2012 - puzel@suse.com diff --git a/hdparm.spec b/hdparm.spec index a19aa70..e36599b 100644 --- a/hdparm.spec +++ b/hdparm.spec @@ -16,7 +16,6 @@ # - Name: hdparm PreReq: %insserv_prereq %fillup_prereq coreutils Provides: base:/sbin/hdparm @@ -50,9 +49,9 @@ make CFLAGS="$RPM_OPT_FLAGS -Wall -Wstrict-prototypes" LDFLAGS= CC="%{__cc}" cp -p wiper/README.txt README.wiper %install -mkdir -p $RPM_BUILD_ROOT/sbin mkdir -p $RPM_BUILD_ROOT/usr/share/man/man8 -make install DESTDIR=$RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT/%{_sbindir} +%make_install binprefix=%{_prefix} mv contrib/README contrib/README.contrib install -d $RPM_BUILD_ROOT/lib/udev/rules.d install -m 644 %{S:1} $RPM_BUILD_ROOT/lib/udev/rules.d @@ -62,7 +61,12 @@ install -m 755 %{S:3} $RPM_BUILD_ROOT/lib/udev/idedma.sh install -d $RPM_BUILD_ROOT/usr/lib/hdparm install -m 755 contrib/idectl $RPM_BUILD_ROOT/usr/lib/hdparm install -m 755 contrib/ultrabayd $RPM_BUILD_ROOT/usr/lib/hdparm -install -m 755 wiper/wiper.sh $RPM_BUILD_ROOT/sbin +install -m 755 wiper/wiper.sh $RPM_BUILD_ROOT/%{_sbindir} +#UsrMerge +mkdir -p $RPM_BUILD_ROOT/sbin +ln -sf %{_sbindir}/wiper.sh $RPM_BUILD_ROOT/sbin +ln -sf %{_sbindir}/hdparm $RPM_BUILD_ROOT/sbin +#EndUsrMerge %post if [ -f etc/sysconfig/hardware ] ; then @@ -97,8 +101,12 @@ fi %defattr(-,root,root) %doc Changelog README.acoustic contrib/README.contrib README.wiper %doc %{_mandir}/man8/hdparm.8.gz +#UsrMerge /sbin/hdparm /sbin/wiper.sh +#EndUserMerge +%{_sbindir}/hdparm +%{_sbindir}/wiper.sh %dir /lib/udev /lib/udev/idedma.sh %dir /lib/udev/rules.d From edf172863c5dcbfeee6dc0e3c0d1141c7671d11ab95464079be3ee0bed923523 Mon Sep 17 00:00:00 2001 From: Petr Uzel Date: Sun, 19 Feb 2012 06:57:16 +0000 Subject: [PATCH 2/2] Accepting request 105787 from home:rjschwei:branches:Base:System fix license warning OBS-URL: https://build.opensuse.org/request/show/105787 OBS-URL: https://build.opensuse.org/package/show/Base:System/hdparm?expand=0&rev=62 --- hdparm.changes | 5 +++++ hdparm.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hdparm.changes b/hdparm.changes index b47caf5..0ba8fe1 100644 --- a/hdparm.changes +++ b/hdparm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Feb 18 11:35:40 UTC 2012 - rschweikert@suse.com + +- fix license warning, set to SUSE-Permissive + ------------------------------------------------------------------- Wed Feb 15 18:22:03 UTC 2012 - rschweikert@suse.com diff --git a/hdparm.spec b/hdparm.spec index e36599b..11696d8 100644 --- a/hdparm.spec +++ b/hdparm.spec @@ -22,7 +22,7 @@ Provides: base:/sbin/hdparm Version: 9.39 Release: 0 Summary: A Program to get and set hard disk parameters -License: PERMISSIVE-OSI-COMPLIANT +License: SUSE-Permissive Group: Hardware/Other Source: http://sourceforge.net/projects/hdparm/files/hdparm/%{name}-%{version}.tar.gz Source1: 56-idedma.rules