[sg3_utils] - update to version 1.37 - switch to included rescan-scsi-bus script

Dan Horák sharkcz at fedoraproject.org
Thu Oct 17 08:10:00 UTC 2013


commit 00f56d9deb9c9ebaea7a8216dee8073e39c6f101
Author: Dan Horák <dan at danny.cz>
Date:   Thu Oct 17 10:09:57 2013 +0200

    - update to version 1.37
    - switch to included rescan-scsi-bus script

 .gitignore                  |    1 +
 rescan-scsi-bus-fixes.patch |   41 -----------------------------------------
 sg3_utils.spec              |   22 +++++++++-------------
 sources                     |    3 +--
 4 files changed, 11 insertions(+), 56 deletions(-)
---
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/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 <dan at danny.cz> - 1.37-1
+- update to version 1.37
+- switch to included rescan-scsi-bus script
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 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


More information about the scm-commits mailing list