SPECS: mvsata.spec - th kernel ready

[glen]

Author: glen                         Date: Mon Nov  5 17:27:39 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- th kernel ready

---- Files affected:
SPECS:
   mvsata.spec (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: SPECS/mvsata.spec
diff -u SPECS/mvsata.spec:1.20 SPECS/mvsata.spec:1.21
--- SPECS/mvsata.spec:1.20	Fri Mar 16 00:01:58 2007
+++ SPECS/mvsata.spec	Mon Nov  5 18:27:34 2007
@@ -3,8 +3,6 @@
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-distribution kernel
 %bcond_without	kernel		# don't build kernel modules
-%bcond_without	up		# don't build UP module
-%bcond_without	smp		# don't build SMP module
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_with	grsec_kernel	# build for kernel-grsecurity
 #
@@ -12,18 +10,14 @@
 %define	alt_kernel	grsecurity
 %endif
 #
-%ifarch sparc
-%undefine	with_smp
-%endif
-#
 %define		_mv_ver	3.4.2a
 %define		_mv_name	mvSata
 %define		_rel		12
 Summary:	SATA driver for the Marvell MV88SX50xx and MV88SX60x1
 Summary(pl.UTF-8):	Sterownik dla kart SATA Marvell MV88SX50xx i MV88SX60x1
-Name:		kernel%{_alt_kernel}-scsi-mv
+Name:		mvsata
 Version:	%{_mv_ver}
-Release:	%{_rel}@%{_kernel_ver_str}
+Release:	%{_rel}
 License:	GPL v2
 Group:		Base/Kernel
 Source0:	http://www.keffective.com/mvsata/FC3/mvSata-%{version}-patched.tbz
@@ -33,94 +27,80 @@
 URL:		http://www.keffective.com/mvsata/
 %if %{with kernel}
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7}
-%{?with_dist_kernel:%requires_releq_kernel_up}
 BuildRequires:	rpmbuild(macros) >= 1.330
-Requires(post,postun):	/sbin/depmod
-%{?with_dist_kernel:Requires(postun):	%releq_kernel_up}
 %endif
+ExclusiveArch:	sparc
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 SATA driver for the Marvell MV88SX50xx and MV88SX60x1.
 
-This package contains Linux UP module.
-
 %description -l pl.UTF-8
 Sterownik dla kart SATA Marvell MV88SX50xx i MV88SX60x1.
 
-Ten pakiet zawiera moduł jądra Linuksa UP.
-
-%package -n kernel%{_alt_kernel}-smp-scsi-mv
+%package -n kernel%{_alt_kernel}-scsi-mv
 Summary:	Linux SMP SATA driver for the Marvell MV88SX50xx and MV88SX60x1
 Summary(pl.UTF-8):	Sterownik dla Linuksa SMP dla kart SATA Marvell MV88SX50xx i MV88SX60x1
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_smp}
 Requires(post,postun):	/sbin/depmod
-%{?with_dist_kernel:Requires(postun):	%releq_kernel_smp}
+%if %{with dist_kernel}
+%requires_releq_kernel
+Requires(postun):	%releq_kernel
+%endif
 
-%description -n kernel%{_alt_kernel}-smp-scsi-mv
+%description -n kernel%{_alt_kernel}-scsi-mv
 Linux SMP SATA driver for the Marvell MV88SX50xx and MV88SX60x1.
 
-This package contains Linux SMP module.
-
-%description -n kernel%{_alt_kernel}-smp-scsi-mv -l pl.UTF-8
+%description -n kernel%{_alt_kernel}-scsi-mv -l pl.UTF-8
 Sterownik dla Linuksa SMP dla kart SATA Marvell MV88SX50xx i
 MV88SX60x1.
 
-Ten pakiet zawiera moduł jądra Linuksa SMP.
-
 %prep
 %setup -q -n mvSata_Linux_%(echo %{version} | tr . _)
 %patch0 -p1
 %patch1 -p1
 
 %build
+%if %{with kernel}
 # kernel module(s)
 cd LinuxIAL
 %{__make} link_files
 %build_kernel_modules -m mv_sata KERNEL_VER=2.6 KERNEL_SRC="%{_kernelsrcdir}"
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
+%if %{with kernel}
 %install_kernel_modules -m LinuxIAL/mv_sata -d kernel/drivers/scsi
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
+%post -n kernel%{_alt_kernel}-scsi-mv
 %depmod %{_kernel_ver}
 
-%postun
+%postun -n kernel%{_alt_kernel}-scsi-mv
 %depmod %{_kernel_ver}
 
-%post -n kernel%{_alt_kernel}-smp-scsi-mv
-%depmod %{_kernel_ver}smp
-
-%postun -n kernel%{_alt_kernel}-smp-scsi-mv
-%depmod %{_kernel_ver}smp
-
-%if %{with up} || %{without dist_kernel}
-%files
+%if %{with kernel}
+%files -n kernel%{_alt_kernel}-scsi-mv
 %defattr(644,root,root,755)
 %doc LinuxIAL/ReleaseNotes.txt
 /lib/modules/%{_kernel_ver}/kernel/drivers/scsi/mv_sata.ko*
 %endif
 
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel%{_alt_kernel}-smp-scsi-mv
-%defattr(644,root,root,755)
-%doc LinuxIAL/ReleaseNotes.txt
-/lib/modules/%{_kernel_ver}smp/kernel/drivers/scsi/mv_sata.ko*
-%endif
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2007/11/05 17:27:34  glen
+- th kernel ready
+
 Revision 1.20  2007/03/15 23:01:58  glen
 - up bcond
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/mvsata.spec?r1=1.20&r2=1.21&f=u