rpms/openmpi/F-11 openmpi.pc.in,1.4,1.5 openmpi.spec,1.39,1.40

[Doug Ledford]

Author: dledford

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

Modified Files:
	openmpi.pc.in openmpi.spec 
Log Message:
* 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
  Enterprise Linux



Index: openmpi.pc.in
===================================================================
RCS file: /cvs/extras/rpms/openmpi/F-11/openmpi.pc.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- openmpi.pc.in	22 Apr 2009 15:02:29 -0000	1.4
+++ openmpi.pc.in	15 Jan 2010 14:30:56 -0000	1.5
@@ -3,5 +3,5 @@ Name: 		@NAME@
 Description:	Open Message Passing Interface headers and libraries
 URL:		http://www.open-mpi.org/
 Version:	@VERSION at -@CC@
-Libs:		-L at LIBDIR@/@MPIDIR@/lib -lmpi
-Cflags: 	-I at LIBDIR@/@MPIDIR@/include @MODEFLAG@
+Libs:		-L at LIBDIR@ -lmpi
+Cflags: 	-I at INCDIR@ @MODEFLAG@


Index: openmpi.spec
===================================================================
RCS file: /cvs/extras/rpms/openmpi/F-11/openmpi.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- openmpi.spec	13 Jan 2010 18:33:31 -0000	1.39
+++ openmpi.spec	15 Jan 2010 14:30:56 -0000	1.40
@@ -19,7 +19,7 @@
 
 Name:			openmpi%{?_cc_name_suffix}
 Version:		1.4
-Release:		1%{?dist}
+Release:		3%{?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, opensm-devel > 3.3.0
+BuildRequires:		libibverbs-devel >= 1.1.2, opensm-devel > 3.3.0
 BuildRequires:		librdmacm librdmacm-devel libibcm libibcm-devel
 #%ifnarch ppc
 #BuildRequires:		compat-dapl-devel
@@ -146,7 +146,7 @@ mkdir %{buildroot}%{_mandir}/%{namearch}
 
 # Make the pkgconfig file
 mkdir -p %{buildroot}%{_libdir}/pkgconfig
-sed 's#@NAME@#'%{name}'#g;s#@VERSION@#'%{version}'#g;s#@LIBDIR@#'%{_libdir}'#g;s#@CC@#'%{opt_cc}'#g;s#@MPIDIR@#'%{name}'#g;s#@MODEFLAG@#'%{?modeflag}'#g' < %SOURCE1 > %{buildroot}/%{_libdir}/pkgconfig/%{name}.pc
+sed 's#@NAME@#'%{name}'#g;s#@VERSION@#'%{version}'#g;s#@LIBDIR@#'%{_libdir}/%{name}/lib'#g;s#@CC@#'%{opt_cc}'#g;s#@INCDIR@#'%{_includedir}/%{namearch}'#g;s#@MODEFLAG@#'%{?modeflag}'#g' < %SOURCE1 > %{buildroot}/%{_libdir}/pkgconfig/%{name}.pc
 # Make the environment-modules file
 mkdir -p %{buildroot}%{_sysconfdir}/modulefiles
 # Since we're doing our own substitution here, use our own definitions.
@@ -216,6 +216,11 @@ rm -rf %{buildroot}
 %{_sysconfdir}/rpm/macros.%{namearch}
 
 %changelog
+* 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
+  Enterprise Linux
+
 * Wed Jan 13 2010 Doug Ledford <dledford at redhat.com> - 1.4-1
 - Update to latest upstream stable version
 - Add support for libibcm usage