diff --git a/.gitignore b/.gitignore index 1ce1842..6c4ce78 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ rescan-scsi-bus.sh-1.35 /sg3_utils-1.34.tgz /sg3_utils-1.35.tgz /sg3_utils-1.36.tgz +/sg3_utils-1.37.tgz diff --git a/rescan-scsi-bus-fixes.patch b/rescan-scsi-bus-fixes.patch deleted file mode 100644 index 1c95e21..0000000 --- a/rescan-scsi-bus-fixes.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 64d876bf70c392390ac83a986b14f889c2a03741 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Fri, 14 Sep 2012 15:19:08 +0200 -Subject: [PATCH] fix for sg3_utils >= 1.32 - -sg_inq in sg3_utils 1.32 comes with version 1.01 while rescan-scsi-bus expects 0.xy -and thus throws an error about non-integer expression - -[dan@eagle ~]$ LANG=en_US.UTF-8 rescan-scsi-bus.sh -+ test @ = @--help -o @ = @-h -o @ = '@-?' -+ test '!' -d /sys/class/scsi_host/ -a '!' -d /proc/scsi/ -+ modprobe sg -+ test -x /usr/bin/sg_inq -++ sg_inq -V -++ cut -d ' ' -f 3 -+ sg_version=1.03 -+ sg_version=1.03 -+ '[' -z 1.03 -o 1.03 -lt 70 ']' -/usr/bin/rescan-scsi-bus.sh: line 532: [: 1.03: integer expression expected -+ sg_len_arg=--len=36 -+ unsetcolor ---- - rescan-scsi-bus.sh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/rescan-scsi-bus.sh b/rescan-scsi-bus.sh -index 09744bb..e3b80d0 100644 ---- a/rescan-scsi-bus.sh -+++ b/rescan-scsi-bus.sh -@@ -623,7 +623,7 @@ modprobe sg >/dev/null 2>&1 - - if test -x /usr/bin/sg_inq; then - sg_version=$(sg_inq -V 2>&1 | cut -d " " -f 3) -- sg_version=${sg_version##0.} -+ sg_version=${sg_version/./} - #echo "\"$sg_version\"" - if [ -z "$sg_version" -o "$sg_version" -lt 70 ] ; then - sg_len_arg="-36" --- -1.7.7.6 - diff --git a/sg3_utils.spec b/sg3_utils.spec index e1df1dc..9685aa0 100644 --- a/sg3_utils.spec +++ b/sg3_utils.spec @@ -1,15 +1,12 @@ -%define rescan_version 1.56 -%define rescan_script rescan-scsi-bus.sh +%global rescan_script rescan-scsi-bus.sh Summary: Utilities for devices that use SCSI command sets Name: sg3_utils -Version: 1.36 -Release: 2%{?dist} +Version: 1.37 +Release: 1%{?dist} License: GPLv2+ and BSD Group: Applications/System Source0: http://sg.danny.cz/sg/p/sg3_utils-%{version}.tgz -Source1: http://www.garloff.de/kurt/linux/%{rescan_script}-%{rescan_version} -Patch0: rescan-scsi-bus-fixes.patch URL: http://sg.danny.cz/sg/sg3_utils.html Requires: %{name}-libs = %{version}-%{release} @@ -48,11 +45,6 @@ developing applications. %prep %setup -q -# rescan-scsi-bus.sh -cp -p %{SOURCE1} %{rescan_script} -# apply fixes -%patch0 -p1 - %build %configure --disable-static @@ -68,7 +60,7 @@ make %{?_smp_mflags} make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la -install -p -m 755 %{rescan_script} $RPM_BUILD_ROOT%{_bindir} +install -p -m 755 scripts/%{rescan_script} $RPM_BUILD_ROOT%{_bindir} ( cd $RPM_BUILD_ROOT%{_bindir}; ln -sf %{rescan_script} scsi-rescan ) @@ -78,7 +70,7 @@ install -p -m 755 %{rescan_script} $RPM_BUILD_ROOT%{_bindir} %files -%doc ChangeLog COVERAGE CREDITS INSTALL README README.sg_start +%doc AUTHORS BSD_LICENSE COPYING COVERAGE CREDITS ChangeLog README README.sg_start %{_bindir}/* %{_mandir}/man8/* @@ -92,6 +84,10 @@ install -p -m 755 %{rescan_script} $RPM_BUILD_ROOT%{_bindir} %changelog +* Wed Oct 16 2013 Dan HorĂ¡k - 1.37-1 +- update to version 1.37 +- switch to included rescan-scsi-bus script + * Sun Aug 04 2013 Fedora Release Engineering - 1.36-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 4938487..3a44b57 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -a3339169d61ac90e3d539f906e67a2b8 sg3_utils-1.36.tgz -4fce214c24d38447060145b11fc904a9 rescan-scsi-bus.sh-1.56 +9d557e8db4d1ff306a1f9415b7a57c22 sg3_utils-1.37.tgz