- Fix pkgconfig file substitution

- Bump version so we are later than the equivalent version from Red Hat
    Enterprise Linux
This commit is contained in:
Doug Ledford 2010-01-15 14:12:08 +00:00
parent 92d1170186
commit b7f8a670ec
2 changed files with 2 additions and 2 deletions

View File

@ -3,5 +3,5 @@ Name: @NAME@
Description: Open Message Passing Interface headers and libraries Description: Open Message Passing Interface headers and libraries
URL: http://www.open-mpi.org/ URL: http://www.open-mpi.org/
Version: @VERSION@-@CC@ Version: @VERSION@-@CC@
Libs: -L@LIBDIR@/@MPIDIR@/lib -lmpi Libs: -L@LIBDIR@ -lmpi
Cflags: -I@INCDIR@ @MODEFLAG@ Cflags: -I@INCDIR@ @MODEFLAG@

View File

@ -146,7 +146,7 @@ mkdir %{buildroot}%{_mandir}/%{namearch}/man{2,4,5,6,8,9,n}
# Make the pkgconfig file # Make the pkgconfig file
mkdir -p %{buildroot}%{_libdir}/pkgconfig 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#@INCDIR@#'%{_includedir}/%{namearch}'#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 # Make the environment-modules file
mkdir -p %{buildroot}%{_sysconfdir}/modulefiles mkdir -p %{buildroot}%{_sysconfdir}/modulefiles
# Since we're doing our own substitution here, use our own definitions. # Since we're doing our own substitution here, use our own definitions.