Author: qboosh Date: Thu Jul 10 17:47:44 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- scsidev moved to separate package (Suggested)
- R: sg3_utils (for rescan-scsi-bus.sh)
---- Files affected:
SPECS:
scsiutils.spec (1.31 -> 1.32)
---- Diffs:
================================================================
Index: SPECS/scsiutils.spec
diff -u SPECS/scsiutils.spec:1.31 SPECS/scsiutils.spec:1.32
--- SPECS/scsiutils.spec:1.31 Fri Jul 4 10:57:54 2008
+++ SPECS/scsiutils.spec Thu Jul 10 19:47:39 2008
@@ -1,29 +1,25 @@
# $Revision$, $Date$
-%define scsidev_ver 2.35
%define scsiinfo_ver 1.7
Summary: SCSI utilities
Summary(pl.UTF-8): Narzędzia do SCSI
Name: scsiutils
-Version: %{scsiinfo_ver}.%{scsidev_ver}
+Version: %{scsiinfo_ver}
Release: 2
Epoch: 1
License: GPL v2
Group: Applications/System
Source0:
ftp://tsx-11.mit.edu/pub/linux/ALPHA/scsi/scsiinfo-%{scsiinfo_ver}.tar.gz
# Source0-md5: 1d7a9a42e84430d14b2fbfee342a950c
-Source2:
http://www.garloff.de/kurt/linux/scsidev/scsidev-%{scsidev_ver}.tar.gz
-# Source2-md5: 1ef22cb2ae19c65ae644b34202b7995e
Source3: http://www.garloff.de/kurt/linux/rescan-scsi-bus.sh
# Source3-md5: 794f4c8f35a6036b8ae1e1310f46353b
Patch0: scsiinfo-glibc.patch
Patch1: scsiinfo-makefile.patch
Patch2: scsiinfo-misc.patch
Patch3: scsiinfo-tmpdir.patch
-Patch5: scsidev-makefile.patch
-BuildRequires: autoconf
-BuildRequires: automake
BuildRequires: tk-devel
-Provides: scsidev
+# sg_turs and sg_inq commands used by rescan-scsi-bus.sh
+Requires: sg3_utils
+Suggests: scsidev
Provides: scsiinfo
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -84,8 +80,6 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
-cd ../scsidev-%{scsidev_ver}
-%patch5 -p1
%build
cd scsiinfo-%{scsiinfo_ver}
@@ -95,14 +89,6 @@
LDFLAGS="%{rpmldflags}" \
OPT="%{rpmcflags}"
-cd ../scsidev-%{scsidev_ver}
-%{__aclocal}
-%{__autoconf}
-%configure \
- CFLAGS="%{rpmcflags} %{rpmldflags}"
-%{__make} \
- CC="%{__cc}"
-
%install
rm -rf $RPM_BUILD_ROOT
install -d
$RPM_BUILD_ROOT{/sbin,%{_sbindir},%{_bindir},%{_ulibdir}/scsi,%{_mandir}/man8}
@@ -110,10 +96,6 @@
%{__make} -C scsiinfo-%{scsiinfo_ver} install \
DESTDIR=$RPM_BUILD_ROOT
-%{__make} -C scsidev-%{scsidev_ver} install \
- DESTDIR=$RPM_BUILD_ROOT \
- bindir=/sbin
-
install %{SOURCE3} $RPM_BUILD_ROOT/sbin/rescan-scsi-bus
gunzip $RPM_BUILD_ROOT%{_mandir}/man8/*.gz
@@ -124,8 +106,6 @@
%files
%defattr(644,root,root,755)
%doc scsiinfo-%{scsiinfo_ver}/{0-CHANGES,0-README.first,0-TODO}
-%doc scsidev-%{scsidev_ver}/{boot.diff,CHANGES,README,TODO}
-%attr(755,root,root) /sbin/scsidev
%attr(755,root,root) /sbin/rescan-scsi-bus
%attr(755,root,root) %{_sbindir}/sgcheck
%attr(755,root,root) %{_bindir}/scsiformat
@@ -133,7 +113,6 @@
%attr(755,root,root) %{_bindir}/scsi_inquiry
%attr(755,root,root) %{_bindir}/sginfo
%attr(755,root,root) %{_bindir}/sgp_dd
-%{_mandir}/man8/scsidev.8*
%{_mandir}/man8/scsiformat.8*
%{_mandir}/man8/scsiinfo.8*
@@ -166,6 +145,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.32 2008/07/10 17:47:39 qboosh
+- scsidev moved to separate package (Suggested)
+- R: sg3_utils (for rescan-scsi-bus.sh)
+
Revision 1.31 2008/07/04 08:57:54 blues
- drop old sg_utils - it's for kernel 2.2 ...
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/scsiutils.spec?r1=1.31&r2=1.32&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
