Accepting request 313426 from home:kstreitova:branches:Base:System

- update to version 9.48
  * 9.48 - fixed a number of output bugs due to the devslp patch 
  * 9.47 - added devslp patch (IDENTIFY word 76) from David Woodhouse.
         - help and manpage fixes from Michal Minar.
  * 9.46 - fix compilation with "musl libc".
         - added "hex:aabbcc.." for binary security passwords.
         - return EIO when read_big_block() fails
         - use llabs() rather than abs() in identify.c
- use spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/313426
OBS-URL: https://build.opensuse.org/package/show/Base:System/hdparm?expand=0&rev=80

hdparm-9.45.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:23b01caa56a995cf0897877b6aff98ea622a5df255bc2894b1a7693387f38669
-size 129410

hdparm-9.48.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ce97b4a71cb04146f54cf6f69787e7f97ddfda9836dc803b459d3b3df3a4fbee
+size 130277

hdparm.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Jun 22 12:17:05 UTC 2015 - kstreitova@suse.com
+
+- update to version 9.48
+  * 9.48 - fixed a number of output bugs due to the devslp patch 
+  * 9.47 - added devslp patch (IDENTIFY word 76) from David Woodhouse.
+         - help and manpage fixes from Michal Minar.
+  * 9.46 - fix compilation with "musl libc".
+         - added "hex:aabbcc.." for binary security passwords.
+         - return EIO when read_big_block() fails
+         - use llabs() rather than abs() in identify.c
+- use spec-cleaner
+
 -------------------------------------------------------------------
 Sat Jan 17 19:05:36 UTC 2015 - p.drouand@gmail.com
 

hdparm.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package hdparm
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,16 +16,16 @@
 #
 
 
+%{!?_udevdir: %global _udevdir %(pkg-config --variable=udevdir udev) }
+%{!?_udevrulesdir: %global _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d }
 Name:           hdparm
-PreReq:         %fillup_prereq coreutils
+Version:        9.48
-Provides:       base:/sbin/hdparm
-Version:        9.45
 Release:        0
 Summary:        A Program to get and set hard disk parameters
 License:        SUSE-Permissive
 Group:          Hardware/Other
-
+Url:            http://sourceforge.net/projects/hdparm/
-Source:         http://downloads.sf.net/hdparm/%name-%version.tar.gz
+Source:         http://downloads.sf.net/hdparm/%{name}-%{version}.tar.gz
 Source1:        56-idedma.rules
 Source2:        sysconfig.ide
 Source3:        udev.idedma.sh
@@ -35,12 +35,10 @@ Patch3:         hdparm-leak-fix.patch
 Patch4:         hdparm-9.43-fix-bashisms.patch
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(udev)
-Url:            http://sourceforge.net/projects/hdparm/
+Requires(post): %fillup_prereq coreutils
+Provides:       base:/sbin/hdparm
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
-%{!?_udevdir: %global _udevdir %(pkg-config --variable=udevdir udev) }
-%{!?_udevrulesdir: %global _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d }
-
 %description
 A shell utility to access and tune the ioctl features of the Linux IDE
 driver and IDE drives.
@@ -53,27 +51,27 @@ driver and IDE drives.
 %patch4 -p1
 
 %build
-make CFLAGS="%optflags -Wall -Wstrict-prototypes" LDFLAGS= CC="%{__cc}"
+make %{?_smp_mflags} CFLAGS="%{optflags} -Wall -Wstrict-prototypes" LDFLAGS= CC="gcc"
 cp -p wiper/README.txt README.wiper
 
 %install
-mkdir -p "%buildroot/usr/share/man/man8"
+mkdir -p "%{buildroot}%{_mandir}/man8"
-install -d "%buildroot/%_sbindir"
+install -d "%{buildroot}/%{_sbindir}"
-%make_install binprefix="%_prefix"
+%make_install binprefix="%{_prefix}"
 mv contrib/README contrib/README.contrib
-install -d "%buildroot/%_udevrulesdir"
+install -d "%{buildroot}/%{_udevrulesdir}"
-install -m 644 %{S:1} "%buildroot/%_udevrulesdir"
+install -m 644 %{SOURCE1} "%{buildroot}/%{_udevrulesdir}"
-install -d "%buildroot/var/adm/fillup-templates"
+install -d "%{buildroot}%{_localstatedir}/adm/fillup-templates"
-install -m 644 %{S:2} "%buildroot/var/adm/fillup-templates"
+install -m 644 %{SOURCE2} "%{buildroot}%{_localstatedir}/adm/fillup-templates"
-install -m 755 %{S:3} "%buildroot/%_udevdir/idedma.sh"
+install -m 755 %{SOURCE3} "%{buildroot}/%{_udevdir}/idedma.sh"
-install -d "%buildroot/usr/lib/hdparm"
+install -d "%{buildroot}%{_libexecdir}/hdparm"
-install -m 755 contrib/idectl "%buildroot/usr/lib/hdparm"
+install -m 755 contrib/idectl "%{buildroot}%{_libexecdir}/hdparm"
-install -m 755 contrib/ultrabayd "%buildroot/usr/lib/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}"
 #UsrMerge
-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"
 #EndUsrMerge
 
 %post
@@ -104,12 +102,12 @@ if [ "$NEW_DMA" != "" ] ; then
       && mv etc/sysconfig/ide.new etc/sysconfig/ide
     rm -f etc/sysconfig/ide.new
 fi
-%{?udev_rules_update:%{udev_rules_update}}
+%{?udev_rules_update:%udev_rules_update}
 
 %files
 %defattr(-,root,root)
 %doc Changelog README.acoustic contrib/README.contrib README.wiper
-%doc %{_mandir}/man8/hdparm.8.gz
+%{_mandir}/man8/hdparm.8.gz
 #UsrMerge
 /sbin/hdparm
 /sbin/wiper.sh
@@ -118,7 +116,7 @@ fi
 %{_sbindir}/wiper.sh
 %{_udevdir}/idedma.sh
 %{_udevrulesdir}/56-idedma.rules
-/usr/lib/hdparm
+%{_libexecdir}/hdparm
-/var/adm/fillup-templates/sysconfig.ide
+%{_localstatedir}/adm/fillup-templates/sysconfig.ide
 
 %changelog