diff --git a/.cvsignore b/.cvsignore index d70de0d..5bdfd4c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ sg3_utils-1.26.tgz +rescan-scsi-bus.sh-1.29 diff --git a/sg3_utils.spec b/sg3_utils.spec index 9ca2105..e9260da 100644 --- a/sg3_utils.spec +++ b/sg3_utils.spec @@ -1,13 +1,17 @@ +%define rescan_version 1.29 + Summary: Utilities for devices that use SCSI command sets Name: sg3_utils Version: 1.26 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and BSD Group: Applications/System -Source: http://sg.torque.net/sg/p/sg3_utils-%{version}.tgz -Url: http://sg.torque.net/sg/sg3_utils.html +Source0: http://sg.danny.cz/sg/p/sg3_utils-%{version}.tgz +Source1: http://www.garloff.de/kurt/linux/rescan-scsi-bus.sh-%{rescan_version} +URL: http://sg.danny.cz/sg/sg3_utils.html BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + %description Collection of Linux utilities for devices that use the SCSI command set. Includes utilities to copy data based on "dd" syntax and semantics (called @@ -42,6 +46,7 @@ developing applications. %prep %setup -q + %build %configure --disable-static @@ -51,20 +56,23 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} + %install -if [ "$RPM_BUILD_ROOT" != "/" ]; then - rm -rf $RPM_BUILD_ROOT -fi make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la +install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/rescan-scsi-bus.sh + + %clean rm -rf $RPM_BUILD_ROOT + %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig + %files %defattr(-,root,root) %doc ChangeLog COVERAGE CREDITS INSTALL README README.sg_start @@ -79,9 +87,14 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_includedir}/scsi/*.h %{_libdir}/*.so + %changelog -* Mon Jun 30 2008 Dan Horak - 1.26-1 +* Mon Nov 3 2008 Dan Horák - 1.26-2 +- update URL +- include rescan-scsi-bus script 1.29 + +* Mon Jun 30 2008 Dan Horák - 1.26-1 - update to upstream version 1.26 * Fri Mar 28 2008 Phil Knirsch - 1.25-4 diff --git a/sources b/sources index 209ba3b..6d0278d 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 9a7aa8d954d75dc6c91e066e215867f2 sg3_utils-1.26.tgz +679aa223710bddffe40d0cfc700009b7 rescan-scsi-bus.sh-1.29