Hello community, here is the log from the commit of package hdparm for openSUSE:Factory checked in at 2012-03-07 13:42:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hdparm (Old) and /work/SRC/openSUSE:Factory/.hdparm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hdparm", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/hdparm/hdparm.changes 2012-02-07 14:45:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.hdparm.new/hdparm.changes 2012-03-07 13:42:36.000000000 +0100 @@ -1,0 +2,10 @@ +Sat Feb 18 11:35:40 UTC 2012 - [email protected] + +- fix license warning, set to SUSE-Permissive + +------------------------------------------------------------------- +Wed Feb 15 18:22:03 UTC 2012 - [email protected] + +- put binaries in /usr tree (UsrMerge) project + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hdparm.spec ++++++ --- /var/tmp/diff_new_pack.GifCRD/_old 2012-03-07 13:42:38.000000000 +0100 +++ /var/tmp/diff_new_pack.GifCRD/_new 2012-03-07 13:42:38.000000000 +0100 @@ -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 @@ 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 -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 @@ %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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
