From e939e94c00cbcfe9b37acadeb894a4d59426f1e6c1e72ad5ab487dbf08d746dc Mon Sep 17 00:00:00 2001
From: Michal Seben <mseben@gmail.com>
Date: Wed, 10 Mar 2010 16:55:38 +0000
Subject: [PATCH] Accepting request 34520 from home:mseben:branches:Base:System

Copy from home:mseben:branches:Base:System/hdparm via accept of submit request 34520 revision 4.
Request was accepted with message:

OBS-URL: https://build.opensuse.org/request/show/34520
OBS-URL: https://build.opensuse.org/package/show/Base:System/hdparm?expand=0&rev=14
---
 hdparm-9.27.tar.bz2                                |  3 ---
 hdparm-9.28.tar.bz2                                |  3 +++
 ...rm-9.22-leak-fix.patch => hdparm-leak-fix.patch |  0
 hdparm-9.22-nostrip.patch => hdparm-nostrip.patch  |  0
 wiper-warn.diff => hdparm-wiper-warn.patch         | 14 ++++++--------
 hdparm.changes                                     | 10 ++++++++++
 hdparm.spec                                        | 12 ++++++------
 7 files changed, 25 insertions(+), 17 deletions(-)
 delete mode 100644 hdparm-9.27.tar.bz2
 create mode 100644 hdparm-9.28.tar.bz2
 rename hdparm-9.22-leak-fix.patch => hdparm-leak-fix.patch (100%)
 rename hdparm-9.22-nostrip.patch => hdparm-nostrip.patch (100%)
 rename wiper-warn.diff => hdparm-wiper-warn.patch (52%)

diff --git a/hdparm-9.27.tar.bz2 b/hdparm-9.27.tar.bz2
deleted file mode 100644
index c80a952..0000000
--- a/hdparm-9.27.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dde7862d5b2be79fe1013cf29a511f929225d8712e87de765e57b8555d48afa2
-size 97138
diff --git a/hdparm-9.28.tar.bz2 b/hdparm-9.28.tar.bz2
new file mode 100644
index 0000000..d13c2c6
--- /dev/null
+++ b/hdparm-9.28.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b2c2b3fdcf439a685a35ef31db6d23378260e5f3f8aa201127c2d7a8777eb033
+size 97861
diff --git a/hdparm-9.22-leak-fix.patch b/hdparm-leak-fix.patch
similarity index 100%
rename from hdparm-9.22-leak-fix.patch
rename to hdparm-leak-fix.patch
diff --git a/hdparm-9.22-nostrip.patch b/hdparm-nostrip.patch
similarity index 100%
rename from hdparm-9.22-nostrip.patch
rename to hdparm-nostrip.patch
diff --git a/wiper-warn.diff b/hdparm-wiper-warn.patch
similarity index 52%
rename from wiper-warn.diff
rename to hdparm-wiper-warn.patch
index 7473578..77ff05a 100644
--- a/wiper-warn.diff
+++ b/hdparm-wiper-warn.patch
@@ -1,9 +1,8 @@
-Index: hdparm-9.27/wiper-2.3/wiper.sh
+Index: hdparm-9.28/wiper/wiper.sh
 ===================================================================
---- hdparm-9.27.orig/wiper-2.3/wiper.sh
-+++ hdparm-9.27/wiper-2.3/wiper.sh
-@@ -42,8 +42,11 @@ function find_prog(){
- }
+--- hdparm-9.28.orig/wiper/wiper.sh
++++ hdparm-9.28/wiper/wiper.sh
+@@ -41,6 +41,9 @@ function usage_error(){
  
  echo
  echo "${0##*/}: Linux SATA SSD TRIM utility, version $VERSION, by Mark Lord."
@@ -11,6 +10,5 @@ Index: hdparm-9.27/wiper-2.3/wiper.sh
 +echo "${0##*/}: /usr/share/doc/packages/hdparm/README.wiper"
 +echo "${0##*/}: before going any further."
  
- ## Ensure we have most of the necessary utilities available before trying to proceed:
- ##
- hash -r  ## Refresh bash's cached PATH entries
+ export verbose=0
+ commit=""
diff --git a/hdparm.changes b/hdparm.changes
index 755bc75..509e8f4 100644
--- a/hdparm.changes
+++ b/hdparm.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Mar 10 11:35:42 UTC 2010 - mseben@novell.com
+ 
+Update to hdparm-9.28:
+  * check for EBADE for IDE/ATAPI compatibility with recent kernels
+  * always issue both methods when setting DVD speed with -E
+  * use /usr/sbin/rdev to find rootdev in wiper.sh
+  * fix reporting of Sector-0 offset, from Martin Petersen
+  * first crack at decoding the "WD Idle3" vendor-unique command (disabled by default)
+
 -------------------------------------------------------------------
 Wed Sep 16 17:12:55 CEST 2009 - mseben@novell.com
 
diff --git a/hdparm.spec b/hdparm.spec
index 0038c5a..7add3d1 100644
--- a/hdparm.spec
+++ b/hdparm.spec
@@ -24,16 +24,16 @@ Group:          Hardware/Other
 PreReq:         %insserv_prereq %fillup_prereq coreutils
 Provides:       base:/sbin/hdparm
 AutoReqProv:    on
-Version:        9.27
+Version:        9.28
 Release:        1
 Summary:        A Program to Get and Set Hard Disk Parameters
 Source:         %{name}-%{version}.tar.bz2
 Source1:        56-idedma.rules
 Source2:        sysconfig.ide
 Source3:        udev.idedma.sh
-Patch1:         %{name}-9.22-nostrip.patch
-Patch2:         wiper-warn.diff
-Patch3:         hdparm-9.22-leak-fix.patch
+Patch1:         %{name}-nostrip.patch
+Patch2:         %{name}-wiper-warn.patch
+Patch3:         %{name}-leak-fix.patch
 Url:            http://sourceforge.net/projects/hdparm/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -55,7 +55,7 @@ Authors:
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS -Wall -Wstrict-prototypes" LDFLAGS=
-cp -p wiper-2.3/README.txt README.wiper
+cp -p wiper/README.txt README.wiper
 
 %install
 mkdir -p $RPM_BUILD_ROOT/sbin
@@ -70,7 +70,7 @@ 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-2.3/wiper.sh $RPM_BUILD_ROOT/sbin
+install -m 755 wiper/wiper.sh $RPM_BUILD_ROOT/sbin
 
 %post
 if [ -f etc/sysconfig/hardware ] ; then