SPECS: EMCpower.spec - modprobe is kernel package thing

[glen]

Author: glen                         Date: Tue May 29 14:37:45 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- modprobe is kernel package thing

---- Files affected:
SPECS:
   EMCpower.spec (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: SPECS/EMCpower.spec
diff -u SPECS/EMCpower.spec:1.22 SPECS/EMCpower.spec:1.23
--- SPECS/EMCpower.spec:1.22	Tue May 29 16:08:30 2007
+++ SPECS/EMCpower.spec	Tue May 29 16:37:40 2007
@@ -22,7 +22,7 @@
 %define	releq_kernel_smp	kernel-smp = 0:%{__kernel_ver}
 %define	releq_kernel_up		kernel-up = 0:%{__kernel_ver}
 
-%define		_rel	0.10
+%define		_rel	0.12
 Summary:	EMC PowerPath - multi-path with fail-over and load-sharing over SCSI
 Summary(pl.UTF-8):	EMC PowerPath - multi-path z fail-over i dzieleniem obciążenia po SCSI
 Name:		EMCpower
@@ -115,7 +115,6 @@
 install -d $RPM_BUILD_ROOT{/etc/emc/ppme,%{_libdir},%{_sbindir},%{_mandir}/man1,/etc/modprobe.d,%{_datadir}/locale,/etc/rc.d/init.d}
 
 cp -a man/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
-install modprobe.conf.pp $RPM_BUILD_ROOT/etc/modprobe.d/%{name}.conf
 cp -a i18n/catalog/* $RPM_BUILD_ROOT%{_datadir}/locale
 install PowerPath $RPM_BUILD_ROOT/etc/rc.d/init.d/PowerPath
 install bin/lib/* $RPM_BUILD_ROOT%{_libdir}
@@ -139,27 +138,28 @@
 %endif
 
 %if %{with kernel}
-cd bin/driver
 %if %{with up}
 install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/drivers/block
+install -D modprobe.conf.pp $RPM_BUILD_ROOT/etc/modprobe.d/%{_kernel_ver}/%{name}.conf
 
 brand=sles10; type=default
 %ifarch %{x8664}
 type=${type}_x8664
 %endif
 for a in emcp emcpdm emcpgpx emcpioc emcplib emcpmpx; do
-	install ${a}_$brand$type $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/drivers/block/$a.ko
+	install bin/driver/${a}_$brand$type $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/drivers/block/$a.ko
 done
 %endif
 
 %if %{with smp} && %{with dist_kernel}
 install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}-smp/kernel/drivers/block
+install -D modprobe.conf.pp $RPM_BUILD_ROOT/etc/modprobe.d/%{_kernel_ver}-smp/%{name}.conf
 brand=sles10; type=smp
 %ifarch %{x8664}
 type=${type}_x8664
 %endif
 for a in emcp emcpdm emcpgpx emcpioc emcplib emcpmpx; do
-	install ${a}_$brand$type $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}-smp/kernel/drivers/block/$a.ko
+	install bin/driver/${a}_$brand$type $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}-smp/kernel/drivers/block/$a.ko
 done
 %endif
 %endif
@@ -191,12 +191,14 @@
 %if %{with up}
 %files -n kernel-block-emc
 %defattr(644,root,root,755)
+/etc/modprobe.d/%{_kernel_ver}/%{name}.conf
 /lib/modules/%{_kernel_ver}/kernel/drivers/block/*.ko*
 %endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel-smp-block-emc
 %defattr(644,root,root,755)
+/etc/modprobe.d/%{_kernel_ver}-smp/%{name}.conf
 /lib/modules/%{_kernel_ver}-smp/kernel/drivers/block/*.ko*
 %endif
 %endif
@@ -209,7 +211,6 @@
 /etc/emc/.drivers_*
 %ghost /etc/emc/mpaa.excluded
 %ghost /etc/emc/mpaa.lams
-/etc/modprobe.d/EMCpower.conf
 %attr(754,root,root) /etc/rc.d/init.d/PowerPath
 %attr(755,root,root) %{_sbindir}/emcpadm
 %attr(755,root,root) %{_sbindir}/emcpdiscover
@@ -250,6 +251,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2007/05/29 14:37:40  glen
+- modprobe is kernel package thing
+
 Revision 1.22  2007/05/29 14:08:30  glen
 - chkconfig PowerPath for now
 - drop unused pre scriptlet
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/EMCpower.spec?r1=1.22&r2=1.23&f=u