rpms/openmpi/F-11 openmpi.spec,1.40,1.41

[Doug Ledford]

Author: dledford

Update of /cvs/extras/rpms/openmpi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4039

Modified Files:
	openmpi.spec 
Log Message:
* Fri Jan 15 2010 Doug Ledford <dledford at redhat.com> - 1.4-4
- Fix an issue with usage of _cc_name_suffix that cause a broken define in
  our module file



Index: openmpi.spec
===================================================================
RCS file: /cvs/extras/rpms/openmpi/F-11/openmpi.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- openmpi.spec	15 Jan 2010 14:30:56 -0000	1.40
+++ openmpi.spec	15 Jan 2010 22:45:47 -0000	1.41
@@ -19,7 +19,7 @@
 
 Name:			openmpi%{?_cc_name_suffix}
 Version:		1.4
-Release:		3%{?dist}
+Release:		4%{?dist}
 Summary:		Open Message Passing Interface
 Group:			Development/Libraries
 License:		BSD
@@ -32,7 +32,7 @@ Source3:		macros.openmpi
 Patch0:			openmpi-changeset_r22324.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:		gcc-gfortran, libtool, numactl-devel, valgrind-devel
-BuildRequires:		libibverbs-devel >= 1.1.2, opensm-devel > 3.3.0
+BuildRequires:		libibverbs-devel, opensm-devel > 3.3.0
 BuildRequires:		librdmacm librdmacm-devel libibcm libibcm-devel
 #%ifnarch ppc
 #BuildRequires:		compat-dapl-devel
@@ -150,7 +150,7 @@ sed 's#@NAME@#'%{name}'#g;s#@VERSION@#'%
 # Make the environment-modules file
 mkdir -p %{buildroot}%{_sysconfdir}/modulefiles
 # Since we're doing our own substitution here, use our own definitions.
-sed 's#@LIBDIR@#'%{_libdir}/%{name}'#g;s#@ETCDIR@#'%{_sysconfdir}/%{namearch}'#g;s#@FMODDIR@#'%{_fmoddir}/%{namearch}'#g;s#@INCDIR@#'%{_includedir}/%{namearch}'#g;s#@MANDIR@#'%{_mandir}/%{namearch}'#g;s#@PYSITEARCH@#'%{python_sitearch}/%{name}'#g;s#@COMPILER@#openmpi-'%{_arch}%{_cc_name_suffix}'#g;s#@SUFFIX@#'%{?_cc_name_suffix}'_openmpi#g' < %SOURCE2 > %{buildroot}%{_sysconfdir}/modulefiles/%{namearch}
+sed 's#@LIBDIR@#'%{_libdir}/%{name}'#g;s#@ETCDIR@#'%{_sysconfdir}/%{namearch}'#g;s#@FMODDIR@#'%{_fmoddir}/%{namearch}'#g;s#@INCDIR@#'%{_includedir}/%{namearch}'#g;s#@MANDIR@#'%{_mandir}/%{namearch}'#g;s#@PYSITEARCH@#'%{python_sitearch}/%{name}'#g;s#@COMPILER@#openmpi-'%{_arch}%{?_cc_name_suffix}'#g;s#@SUFFIX@#'%{?_cc_name_suffix}'_openmpi#g' < %SOURCE2 > %{buildroot}%{_sysconfdir}/modulefiles/%{namearch}
 # make the rpm config file
 mkdir -p %{buildroot}/%{_sysconfdir}/rpm
 cp %SOURCE3 %{buildroot}/%{_sysconfdir}/rpm/macros.%{namearch}
@@ -216,6 +216,10 @@ rm -rf %{buildroot}
 %{_sysconfdir}/rpm/macros.%{namearch}
 
 %changelog
+* Fri Jan 15 2010 Doug Ledford <dledford at redhat.com> - 1.4-4
+- Fix an issue with usage of _cc_name_suffix that cause a broken define in
+  our module file
+
 * Fri Jan 15 2010 Doug Ledford <dledford at redhat.com> - 1.4-3
 - Fix pkgconfig file substitution
 - Bump version so we are later than the equivalent version from Red Hat