rpms/mpich2/devel mpich2.spec,1.17,1.18

[Deji Akingunola]

Author: deji

Update of /cvs/pkgs/rpms/mpich2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14142

Modified Files:
	mpich2.spec 
Log Message:
* Wed Dec 16 2009 Jay Fenlason <fenlason at redhat.com> - 1.2.1-4
- add the m_option macro to replace hardcoding -m{__isa_bits}
  and define it correctly for s390, where __isa_bits is 32, but
  the option to pass to gcc et all is -m31.



Index: mpich2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/devel/mpich2.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- mpich2.spec	10 Dec 2009 17:37:48 -0000	1.17
+++ mpich2.spec	17 Dec 2009 20:07:15 -0000	1.18
@@ -1,7 +1,7 @@
 Summary:	A high-performance implementation of MPI
 Name:		mpich2
 Version:	1.2.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	MIT
 Group:		Development/Libraries
 URL:		http://www.mcs.anl.gov/research/projects/mpich2
@@ -70,6 +70,12 @@ Contains documentations, examples and ma
 #%{!?opt_fc_fflags: %global opt_fc_fflags %{optflags} -I%{_fmoddir}}
 %{!?opt_f77_fflags: %global opt_f77_fflags %{optflags}}
 
+%ifarch s390
+%global m_option -m31
+%else
+%global m_option -m%{__isa_bits}
+%endif
+
 %ifarch %{ix86} x86_64
 %global selected_channels ch3:nemesis
 %else
@@ -105,20 +111,20 @@ Contains documentations, examples and ma
 	--with-java=%{_sysconfdir}/alternatives/java_sdk	\
 	F90=%{opt_fc}						\
 	F77=%{opt_f77}						\
-	CFLAGS="-m%{__isa_bits} -O2 %{?XFLAGS}"			\
-	CXXFLAGS="-m%{__isa_bits} -O2 %{?XFLAGS}"		\
-	F90FLAGS="-m%{__isa_bits} -O2 %{?XFLAGS}"		\
-	FFLAGS="-m%{__isa_bits} -O2 %{?XFLAGS}"			\
+	CFLAGS="%{m_option} -O2 %{?XFLAGS}"			\
+	CXXFLAGS="%{m_option} -O2 %{?XFLAGS}"			\
+	F90FLAGS="%{m_option} -O2 %{?XFLAGS}"			\
+	FFLAGS="%{m_option} -O2 %{?XFLAGS}"			\
 	LDFLAGS='-Wl,-z,noexecstack'				\
 	MPICH2LIB_CFLAGS="%{?opt_cc_cflags}"			\
 	MPICH2LIB_CXXFLAGS="%{optflags}"			\
 	MPICH2LIB_F90FLAGS="%{?opt_fc_fflags}"			\
 	MPICH2LIB_FFLAGS="%{?opt_f77_fflags}"	
 #	MPICH2LIB_LDFLAGS='-Wl,-z,noexecstack'			\
-#	MPICH2_MPICC_FLAGS="-m%{__isa_bits} -O2 %{?XFLAGS}"	\
-#	MPICH2_MPICXX_FLAGS="-m%{__isa_bits} -O2 %{?XFLAGS}"	\
-#	MPICH2_MPIF90_FLAGS="-m%{__isa_bits} -O2 %{?XFLAGS}"	\
-#	MPICH2_MPIF77_FLAGS="-m%{__isa_bits} -O2 %{?XFLAGS}"
+#	MPICH2_MPICC_FLAGS="%{m_option} -O2 %{?XFLAGS}"	\
+#	MPICH2_MPICXX_FLAGS="%{m_option} -O2 %{?XFLAGS}"	\
+#	MPICH2_MPIF90_FLAGS="%{m_option} -O2 %{?XFLAGS}"	\
+#	MPICH2_MPIF77_FLAGS="%{m_option} -O2 %{?XFLAGS}"
 
 #	F90FLAGS="%{?opt_fc_fflags} -I%{_fmoddir}/%{name} %{?XFLAGS}"	\
 #make %{?_smp_mflags} doesn't work
@@ -160,8 +166,8 @@ chmod -x %{buildroot}%{_libdir}/pkgconfi
 
 # Install the module file
 mkdir -p %{buildroot}%{_datadir}/Modules/modulefiles
-cp -pr src/packaging/envmods/mpich2.module %{buildroot}%{_datadir}/Modules/modulefiles/%{name}-%{_arch}
-sed -i 's#'%{_bindir}'#'%{_libdir}/%{name}/bin'#;s#@LIBDIR@#'%{_libdir}'#;s#@ARCH@#'%{_arch}'#' %{buildroot}%{_datadir}/Modules/modulefiles/%{name}-%{_arch}
+cp -pr src/packaging/envmods/mpich2.module %{buildroot}%{_sysconfdir}/modulefiles/%{name}-%{_arch}
+sed -i 's#'%{_bindir}'#'%{_libdir}/%{name}/bin'#;s#@LIBDIR@#'%{_libdir}'#;s#@ARCH@#'%{_arch}'#' %{buildroot}%{_sysconfdir}/modulefiles/%{name}-%{_arch}
 
 # Install the RPM macro
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
@@ -277,10 +283,9 @@ fi
 %{_libdir}/%{name}/bin/mpirun
 %{_libdir}/%{name}/bin/mpich2version
 %config %{_sysconfdir}/%{name}-%{_arch}/
-%config %{_sysconfdir}/rpm/macros.%{name}
 %dir %{_mandir}/%{name}
 %doc %{_mandir}/%{name}/man1/
-%{_datadir}/Modules/modulefiles/%{name}-%{_arch}
+%{_sysconfdir}/modulefiles/%{name}-%{_arch}
 %exclude %{_bindir}/mpif*
 %exclude %{_bindir}/mpic*
 %ghost %{_bindir}/mpiexec
@@ -309,6 +314,7 @@ fi
 %{_libdir}/%{name}/lib/trace_rlog/libTraceInput.so
 %{_libdir}/pkgconfig/%{name}-ch3.pc
 %{_datadir}/%{name}/examples*/Makefile-%{_arch}
+%config %{_sysconfdir}/rpm/macros.%{name}
 
 %files doc
 %defattr(-,root,root,-)
@@ -321,8 +327,15 @@ fi
 %exclude %{_datadir}/%{name}/examples*/Makefile-%{_arch}
 
 %changelog
-* Thu Dec 10 2009 Deji Akingunola <dakingun at gmail.com> - 1.2.1-3
+* Wed Dec 16 2009 Jay Fenlason <fenlason at redhat.com> - 1.2.1-4
+- add the m_option macro to replace hardcoding -m{__isa_bits}
+  and define it correctly for s390, where __isa_bits is 32, but
+  the option to pass to gcc et all is -m31.
+
+* Thu Dec 10 2009 Deji Akingunola <dakingun at gmail.com> - 1.2.1-4
 - Remove the *.a libs that have the shared version
+- Place the rpm macro in the -devel subpackage
+- Move the module file around (again!) to /etc/modufiles/.
 
 * Thu Nov 26 2009 Deji Akingunola <dakingun at gmail.com> - 1.2.1-3
 - More fixes the mpich2.module patch.