[packages/rescan-scsi-bus] use sq_inq 0.70 syntax, the autodetection is broken with 1.x series

[glen]

commit 8ad7cf03c7fba357d57a0b57849a04beb95c3579
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Mar 6 23:14:25 2013 +0200

    use sq_inq 0.70 syntax, the autodetection is broken with 1.x series
    
    + cut -d   -f 3
    + sg_inq -V
    + 2>&1
    + sg_version=1.08
    + sg_version=1.08
    + [ -z 1.08 -o 1.08 -lt 70 ]
    /usr/sbin/rescan-scsi-bus: line 628: [: 1.08: integer expression expected
    + sg_len_arg=--len=36

 rescan-scsi-bus.spec |  6 ++++--
 sg_inq-0.70.patch    | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)
---
diff --git a/rescan-scsi-bus.spec b/rescan-scsi-bus.spec
index aa2b6e4..1e96f86 100644
--- a/rescan-scsi-bus.spec
+++ b/rescan-scsi-bus.spec
@@ -2,13 +2,14 @@ Summary:	Rescan SCSI bus in Linux
 Summary(pl.UTF-8):	Ponowne skanowanie szyny SCSI pod Linuksem
 Name:		rescan-scsi-bus
 Version:	1.56
-Release:	1
+Release:	2
 License:	GPL v2 or GPL v3
 Group:		Applications/System
 # http://www.garloff.de/kurt/linux/rescan-scsi-bus.sh (with changed CVS tag)
 Source0:	%{name}.sh
+Patch0:		sg_inq-0.70.patch
 URL:		http://www.garloff.de/kurt/linux/#rescan-scsi
-Requires:	sg3_utils
+Requires:	sg3_utils >= 0.70
 Obsoletes:	scsiutils
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -45,6 +46,7 @@ wyłączeniem.
 %prep
 %setup -qcT
 install -p %{SOURCE0} .
+%patch0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/sg_inq-0.70.patch b/sg_inq-0.70.patch
new file mode 100644
index 0000000..ea6050b
--- /dev/null
+++ b/sg_inq-0.70.patch
@@ -0,0 +1,18 @@
+--- rescan-scsi-bus.sh	2012-01-15 00:43:33.000000000 +0200
++++ rescan-scsi-bus	2013-03-06 23:12:27.000000000 +0200
+@@ -625,11 +625,11 @@
+     sg_version=$(sg_inq -V 2>&1 | cut -d " " -f 3)
+     sg_version=${sg_version##0.}
+     #echo "\"$sg_version\""
+-    if [ -z "$sg_version" -o "$sg_version" -lt 70 ] ; then
+-        sg_len_arg="-36"
+-    else
++#    if [ -z "$sg_version" -o "$sg_version" -lt 70 ] ; then
++#        sg_len_arg="-36"
++#    else
+         sg_len_arg="--len=36"
+-    fi
++#    fi
+ else
+     echo "WARN: /usr/bin/sg_inq not present -- please install sg3_utils"
+     echo " or rescan-scsi-bus.sh might not fully work."     
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rescan-scsi-bus.git/commitdiff/8ad7cf03c7fba357d57a0b57849a04beb95c3579