rpms/mpich2/EL-4 mpich2.spec,1.2,1.3

[Deji Akingunola]

Author: deji

Update of /cvs/pkgs/rpms/mpich2/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28524

Modified Files:
	mpich2.spec 
Log Message:
* Wed Mar 18 2009 Deji Akingunola <dakingun at gmail.com> - 1.0.8-4
- Fix un-owned directory (Fedora Bug #490270)



Index: mpich2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/EL-4/mpich2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mpich2.spec	10 Mar 2009 02:46:30 -0000	1.2
+++ mpich2.spec	19 Mar 2009 11:39:10 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:	An implementation of MPI
 Name:		mpich2
 Version:	1.0.8
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	MIT
 Group:		Development/Libraries
 URL:		http://www.mcs.anl.gov/research/projects/mpich2
@@ -39,8 +39,8 @@
 Requires:	%{name} = %{version}-%{release}
 Requires:	pkgconfig
 Requires:	gcc-gfortran
-Requires(post):	/usr/sbin/alternatives
-Requires(preun):/usr/sbin/alternatives
+Requires(post): chkconfig
+Requires(preun):chkconfig
 
 %description devel
 Contains development headers and libraries for mpich2
@@ -61,12 +61,10 @@
 %{!?opt_cc_cflags: %define opt_cc_cflags %{optflags}}
 %{!?opt_fc_fflags: %define opt_fc_fflags %{optflags}}
 
-%define selected_channels ch3:dllchan:sock,shm,ssm 
 %ifarch %{ix86} x86_64
 %define selected_channels ch3:nemesis
-%endif
-%ifarch ppc ppc64
-%define selected_channels ch3:dllchan:sock,shm 
+%else
+%define selected_channels ch3:sock 
 %endif
 
 %ifarch x86_64 ia64 ppc64 s390x sparc64
@@ -163,6 +161,7 @@
 rm -rf %{buildroot}
 
 %post
+if [ $1 -eq 1 ] ; then
 /usr/sbin/alternatives	\
 	--install %{_bindir}/mpirun mpi-run %{_bindir}/mpiexec.py 41	\
 	--slave	%{_bindir}/mpiexec mpi-exec %{_bindir}/mpiexec.py	\
@@ -176,24 +175,32 @@
 			%{_mandir}/man1/mp-mpicc.1.gz		\
 	--slave	%{_mandir}/man1/mpic++.1.gz mpic++-man		\
 			%{_mandir}/man1/mp-mpicxx.1.gz
+fi
 
 %preun
+if [ $1 -eq 0 ] ; then
 /usr/sbin/alternatives --remove mpi-run %{_bindir}/mpiexec.py
+fi
 
 %post devel
+if [ $1 -eq 1 ] ; then
 /usr/sbin/alternatives	\
 	--install %{_bindir}/mpicc mpicc %{_bindir}/mp%{mode}-mpicc %{priority}\
 	--slave	%{_bindir}/mpicxx  mpicxx  %{_bindir}/mp%{mode}-mpicxx	\
 	--slave	%{_bindir}/mpif90  mpif90  %{_bindir}/mp%{mode}-mpif90	\
 	--slave	%{_bindir}/mpif77  mpif77  %{_bindir}/mp%{mode}-mpif77
+fi
 
 %preun devel
+if [ $1 -eq 0 ] ; then
 /usr/sbin/alternatives --remove mpicc %{_bindir}/mp%{mode}-mpicc
+fi
 
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
 %dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/bin%{mode}
 %{_datadir}/%{name}/bin%{mode}/mpiexec
 %{_datadir}/%{name}/bin%{mode}/mpirun
 %exclude %{_bindir}/mp%{mode}-mpicc
@@ -237,6 +244,9 @@
 %doc README.testing README.romio README.developer
 
 %changelog
+* Wed Mar 18 2009 Deji Akingunola <dakingun at gmail.com> - 1.0.8-4
+- Fix un-owned directory (Fedora Bug #490270)
+
 * Mon Mar 09 2009 Deji Akingunola <dakingun at gmail.com> - 1.0.8-3
 - Drop the ssm channel from ppc* archs, it fails to build
 - Python scripts in bindir and sbindir are no longer bytecompiled (F-11+)