X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=EMCpower.spec;h=1c316b17069cc7b2448e025213ac16ce06e05aba;hb=4a302f7f084995b7414abc2f076822a7b71e5362;hp=f577f459e59a18260253dc11d29c8b381bba4a97;hpb=3aa0548ae78ac0e6c3a40e12a8db025a78159df9;p=packages%2FEMCpower.git

diff --git a/EMCpower.spec b/EMCpower.spec
index f577f45..1c316b1 100644
--- a/EMCpower.spec
+++ b/EMCpower.spec
@@ -11,31 +11,39 @@
 %undefine	with_dist_kernel
 %endif
 
+# just don't want to build it :)
 %ifarch %{x8664}
 %undefine	with_up
 %endif
 
-%define	__kernel_ver	2.6.16.21-0.8
+%define	__kernel_ver	2.6.16.46-0.12
 %define	__kernel_rpmvr	%{__kernel_ver}
 
 %define	releq_kernel_smp	kernel-smp = 0:%{__kernel_ver}
 %define	releq_kernel_up		kernel-up = 0:%{__kernel_ver}
 
-%define		_rel	0.10
+%define	brand sles10sp1
+
+%define		_rel	0.3
 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
-Version:	5.0.0
+Version:	5.0.1
 Release:	%{_rel}
 License:	Proprietary (not distributable)
 Group:		Base
-Source0:	%{name}.LINUX-%{version}-157.sles10.i386.rpm
+URL:		https://powerlink.emc.com/
+%ifarch %{ix86}
+Source0:	%{name}.LINUX-%{version}-022.%{brand}.i386.rpm
 # NoSource0-md5:	9e687044c65d2ee368b71c339e639522
-Source1:	%{name}.LINUX-%{version}-157.sles10.x86_64.rpm
-# NoSource1-md5:	cf980fc4714f0be008de168333cefcb4
 NoSource:	0
+%endif
+%ifarch %{x8664}
+Source1:	%{name}.LINUX-%{version}-022.%{brand}.x86_64.rpm
+# NoSource1-md5:	cbe183e0a7f4beef04873529313a7325
 NoSource:	1
-Patch0:		%{name}-init.patch
+%endif
+Source2:	PowerPath.init
 Requires(post,preun):	/sbin/chkconfig
 Obsoletes:	EMCpower.LINUX
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -104,8 +112,6 @@ rpm2cpio %{SOURCE0} | cpio -dimu
 rpm2cpio %{SOURCE1} | cpio -dimu
 %endif
 mv etc/opt/emcpower/EMCpower.LINUX-%{version}/* .
-cp PowerPath{.rhel,}
-%patch0 -p1
 echo 'options emcp managedclass=symm,clariion,hitachi,invista,hpxp,ess,hphsx' >> modprobe.conf.pp
 
 %install
@@ -113,10 +119,14 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with userspace}
 install -d $RPM_BUILD_ROOT{/etc/emc/ppme,%{_libdir},%{_sbindir},%{_mandir}/man1,/etc/modprobe.d,%{_datadir}/locale,/etc/rc.d/init.d}
 
+# udev
+install -d $RPM_BUILD_ROOT{/etc/udev/rules.d,/lib/udev}
+install udev-pp.rules $RPM_BUILD_ROOT/etc/udev/rules.d
+install pp_udev.sh $RPM_BUILD_ROOT/lib/udev/pp_udev.sh
+
 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 %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/PowerPath
 install bin/lib/* $RPM_BUILD_ROOT%{_libdir}
 install bin/cmds/* $RPM_BUILD_ROOT%{_sbindir}
 cp -a bin/.drivers_* $RPM_BUILD_ROOT/etc/emc
@@ -127,8 +137,8 @@ cat PowerPath.lang >> EMCpower.lang
 
 # hardcoded paths. oh sigh
 install -d $RPM_BUILD_ROOT/etc/opt/emcpower/.tmp
-ln -s %{_sbindir}/emcpmgr $RPM_BUILD_ROOT/etc/opt/emcpower
-ln -s %{_sbindir}/powercf $RPM_BUILD_ROOT/etc/opt/emcpower
+mv $RPM_BUILD_ROOT{%{_sbindir},/etc/opt/emcpower}/emcpmgr
+mv $RPM_BUILD_ROOT{%{_sbindir},/etc/opt/emcpower}/powercf
 touch $RPM_BUILD_ROOT/etc/opt/emcpower/.__emcp_db_global_lock
 touch $RPM_BUILD_ROOT/etc/opt/emcpower/.__emcp_db_lock
 
@@ -138,28 +148,20 @@ touch $RPM_BUILD_ROOT/etc/emc/mpaa.{excluded,lams}
 %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
+install bin/driver/%{brand}default_x8664/*.ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}-smp/kernel/drivers/block
 %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
-done
 %endif
 
 %if %{with smp} && %{with dist_kernel}
 install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}-smp/kernel/drivers/block
-brand=sles10; type=smp
+install -D modprobe.conf.pp $RPM_BUILD_ROOT/etc/modprobe.d/%{_kernel_ver}-smp/%{name}.conf
 %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
-done
+install bin/driver/%{brand}smp_x8664/*.ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}-smp/kernel/drivers/block
 %endif
 %endif
 
@@ -190,12 +192,14 @@ fi
 %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
@@ -203,19 +207,19 @@ fi
 %if %{with userspace}
 %files -f EMCpower.lang
 %defattr(644,root,root,755)
+/etc/udev/rules.d/*.rules
+%attr(755,root,root) /lib/udev/pp_udev.sh
+
 %dir /etc/emc
 %dir /etc/emc/ppme
 /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
-%attr(755,root,root) %{_sbindir}/emcpmgr
 %attr(755,root,root) %{_sbindir}/emcppurge
 %attr(755,root,root) %{_sbindir}/emcpreg
-%attr(755,root,root) %{_sbindir}/powercf
 %attr(755,root,root) %{_sbindir}/powermt
 %attr(755,root,root) %{_sbindir}/powerprotect
 %attr(755,root,root) %{_sbindir}/powermig
@@ -237,8 +241,10 @@ fi
 
 # hardcoded paths. oh sigh
 %dir /etc/opt/emcpower
+%attr(755,root,root) /etc/opt/emcpower/emcpmgr
+%attr(755,root,root) /etc/opt/emcpower/powercf
 %ghost /etc/opt/emcpower/.__emcp_db_global_lock
 %ghost /etc/opt/emcpower/.__emcp_db_lock
-/opt/emcpower
+%dir /opt/emcpower
 %dir /etc/emcpower
 %endif