Accepting request 105856 from Base:System

- fix license warning, set to SUSE-Permissive

- put binaries in /usr tree (UsrMerge) project

OBS-URL: https://build.opensuse.org/request/show/105856
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hdparm?expand=0&rev=54

hdparm.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+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
+
+- put binaries in /usr tree (UsrMerge) project
+
 -------------------------------------------------------------------
 Mon Feb  6 13:44:39 UTC 2012 - puzel@suse.com
 

hdparm.spec

@@ -16,14 +16,13 @@
 #
 
 
-
 Name:           hdparm
 PreReq:         %insserv_prereq %fillup_prereq coreutils
 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
@@ -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