SPECS: scsiutils.spec - drop old sg_utils - it's for kernel 2.2 ...

Fri Jul 4 10:57:59 CEST 2008

Author: blues                        Date: Fri Jul  4 08:57:59 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- drop old sg_utils - it's for kernel 2.2 ...

---- Files affected:
SPECS:
   scsiutils.spec (1.30 -> 1.31) 

---- Diffs:

================================================================
Index: SPECS/scsiutils.spec
diff -u SPECS/scsiutils.spec:1.30 SPECS/scsiutils.spec:1.31

--- SPECS/scsiutils.spec:1.30	Sat Jun  2 22:45:06 2007
+++ SPECS/scsiutils.spec	Fri Jul  4 10:57:54 2008
@@ -1,19 +1,16 @@
 # $Revision$, $Date$
-%define	sg_utils_ver	1.02
 %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}.%{sg_utils_ver}
-Release:	1
+Version:	%{scsiinfo_ver}.%{scsidev_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
-Source1:	http://www.torque.net/sg/p/sg_utils-%{sg_utils_ver}.tgz
-# Source1-md5:	127860ff59d9cff0faf3929494c413d3
 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
@@ -22,14 +19,12 @@
 Patch1:		scsiinfo-makefile.patch
 Patch2:		scsiinfo-misc.patch
 Patch3:		scsiinfo-tmpdir.patch
-Patch4:		sg_utils-makefile.patch
 Patch5:		scsidev-makefile.patch
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	tk-devel
 Provides:	scsidev
 Provides:	scsiinfo
-Provides:	sg_utils
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_ulibdir	%{_prefix}/lib
@@ -47,10 +42,6 @@
   remains unchanged in most of these cases.
 - rescan-scsi-bus.sh: Script that scans the SCSI bus and dynamicaaly
   adds (and optionally removes) devices.
-- sg_utils: A colection of small useful tools, that are based on the
-  sg interface and give info on the SCSI bus, copy data... Warning: Some
-  of these tools access the internals of your system and a wrong usage
-  of them may render your system inoperational.
 
 Note: scsiinfo comes with a graphical user interface which can be
 found in the scsiutils-tk package.
@@ -67,10 +58,6 @@
   tworzy mapowanie nie zmieniające się w większości przypadków.
 - rescan-scsi-bus.sh: skrypt skanujący szynę SCSI i dynamicznie
   dodający (opcjonalnie także usuwający) urządzenia.
-- sg_utils: zestaw małych narzędzi bazujących na interfejsie sg
-  udostępniających informacje o szynie SCSI, kopiujących dane... Uwaga:
-  część z nich używa dostępu do wnętrzności systemu i złe ich użycie
-  może uczynić system niedziałającym.
 
 Dostępny jest interfejs graficzny do scsiinfo - znajduje się w
 pakiecie scsiutils-tk.
@@ -91,14 +78,12 @@
 stronami trybów SCSI.
 
 %prep
-%setup -q -c -a1 -a2
+%setup -q -c -a2
 cd scsiinfo-%{scsiinfo_ver}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-cd ../sg_utils-%{sg_utils_ver}
-%patch4 -p1
 cd ../scsidev-%{scsidev_ver}
 %patch5 -p1
 
@@ -118,15 +103,6 @@
 %{__make} \
 	CC="%{__cc}"
 
-cd ../sg_utils-%{sg_utils_ver}
-mv -f README README.sg
-%{__make} \
-	CC="%{__cc}" \
-	LD="%{__cc}" \
-	LDFLAGS="%{rpmldflags}" \
-	OPT="%{rpmcflags}" \
-	PREFIX=%{_prefix}
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/sbin,%{_sbindir},%{_bindir},%{_ulibdir}/scsi,%{_mandir}/man8}
@@ -140,10 +116,6 @@
 
 install %{SOURCE3} $RPM_BUILD_ROOT/sbin/rescan-scsi-bus
 
-%{__make} -C sg_utils-%{sg_utils_ver} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	PREFIX=%{_prefix}
-
 gunzip $RPM_BUILD_ROOT%{_mandir}/man8/*.gz
 
 %clean
@@ -153,7 +125,6 @@
 %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}
-%doc sg_utils-%{sg_utils_ver}/{README.sg,README.sg_start,CHANGELOG}
 %attr(755,root,root) /sbin/scsidev
 %attr(755,root,root) /sbin/rescan-scsi-bus
 %attr(755,root,root) %{_sbindir}/sgcheck
@@ -162,34 +133,9 @@
 %attr(755,root,root) %{_bindir}/scsi_inquiry
 %attr(755,root,root) %{_bindir}/sginfo
 %attr(755,root,root) %{_bindir}/sgp_dd
-%attr(755,root,root) %{_bindir}/sg_dd
-%attr(755,root,root) %{_bindir}/sg_debug
-%attr(755,root,root) %{_bindir}/sg_inq
-%attr(755,root,root) %{_bindir}/sg_map
-%attr(755,root,root) %{_bindir}/sg_rbuf
-%attr(755,root,root) %{_bindir}/sg_read
-%attr(755,root,root) %{_bindir}/sg_readcap
-%attr(755,root,root) %{_bindir}/sg_runt_ex
-%attr(755,root,root) %{_bindir}/sg_scan
-%attr(755,root,root) %{_bindir}/sg_simple1
-%attr(755,root,root) %{_bindir}/sg_simple2
-%attr(755,root,root) %{_bindir}/sg_start
-%attr(755,root,root) %{_bindir}/sg_test_rwbuf
-%attr(755,root,root) %{_bindir}/sg_turs
-%attr(755,root,root) %{_bindir}/sg_whoami
 %{_mandir}/man8/scsidev.8*
 %{_mandir}/man8/scsiformat.8*
 %{_mandir}/man8/scsiinfo.8*
-%{_mandir}/man8/sg_dd.8*
-%{_mandir}/man8/sg_map.8*
-%{_mandir}/man8/sg_rbuf.8*
-%{_mandir}/man8/sg_read.8*
-%{_mandir}/man8/sgp_dd.8*
-#%attr(755,root,root) %{_bindir}/sg_poll
-#%attr(755,root,root) %{_bindir}/sg_dd512
-#%attr(755,root,root) %{_bindir}/sgq_dd512
-#%attr(755,root,root) %{_bindir}/sg_dd2048
-#%attr(755,root,root) %{_bindir}/sg_tst_med
 
 %files tk
 %defattr(644,root,root,755)
@@ -220,6 +166,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.31  2008/07/04 08:57:54  blues
+- drop old sg_utils - it's for kernel 2.2 ...
+
 Revision 1.30  2007/06/02 20:45:06  arekm
 - builds with latest llh
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/scsiutils.spec?r1=1.30&r2=1.31&f=u

