Rebuild for howloc soname bump

This commit is contained in:
Peter Robinson 2012-02-15 18:43:42 +00:00
parent dcc7fb2c4b
commit d26a34ee86

View File

@ -19,11 +19,12 @@
Name: openmpi%{?_cc_name_suffix} Name: openmpi%{?_cc_name_suffix}
Version: 1.5.4 Version: 1.5.4
Release: 3%{?dist} Release: 4%{?dist}
Summary: Open Message Passing Interface Summary: Open Message Passing Interface
Group: Development/Libraries Group: Development/Libraries
License: BSD, MIT and Romio License: BSD, MIT and Romio
URL: http://www.open-mpi.org/ URL: http://www.open-mpi.org/
# We can't use %{name} here because of _cc_name_suffix # We can't use %{name} here because of _cc_name_suffix
#Source0: http://www.open-mpi.org/software/ompi/v1.5/downloads/openmpi-%{version}.tar.bz2 #Source0: http://www.open-mpi.org/software/ompi/v1.5/downloads/openmpi-%{version}.tar.bz2
# openmpi-%{version}-clean.tar.bz2 was generated by taking the upstream tarball # openmpi-%{version}-clean.tar.bz2 was generated by taking the upstream tarball
@ -34,7 +35,7 @@ Source1: openmpi.module.in
Source2: macros.openmpi Source2: macros.openmpi
# Patch to handle removed items # Patch to handle removed items
Patch0: openmpi-removed.patch Patch0: openmpi-removed.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gcc-gfortran, libtool, numactl-devel BuildRequires: gcc-gfortran, libtool, numactl-devel
#sparc 64 doesnt have valgrind #sparc 64 doesnt have valgrind
%ifnarch %{sparc} %ifnarch %{sparc}
@ -155,7 +156,6 @@ XFLAGS="-fPIC"
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} make install DESTDIR=%{buildroot}
rm -fr %{buildroot}%{_libdir}/%{name}/lib/pkgconfig rm -fr %{buildroot}%{_libdir}/%{name}/lib/pkgconfig
find %{buildroot}%{_libdir}/%{name}/lib -name \*.la | xargs rm find %{buildroot}%{_libdir}/%{name}/lib -name \*.la | xargs rm
@ -177,9 +177,6 @@ cp %SOURCE2 %{buildroot}/%{_sysconfdir}/rpm/macros.%{namearch}
mkdir -p %{buildroot}/%{_fmoddir}/%{namearch} mkdir -p %{buildroot}/%{_fmoddir}/%{namearch}
mkdir -p %{buildroot}/%{python_sitearch}/openmpi%{?_cc_name_suffix} mkdir -p %{buildroot}/%{python_sitearch}/openmpi%{?_cc_name_suffix}
%clean
rm -rf %{buildroot}
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%dir %{_libdir}/%{name} %dir %{_libdir}/%{name}
@ -239,6 +236,9 @@ rm -rf %{buildroot}
%{_sysconfdir}/rpm/macros.%{namearch} %{_sysconfdir}/rpm/macros.%{namearch}
%changelog %changelog
* Wed Feb 15 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 1.5.4-4
- Rebuild for howloc soname bump
* Fri Jan 20 2012 Doug Ledford <dledford@redhat.com> - 1.5.4-3 * Fri Jan 20 2012 Doug Ledford <dledford@redhat.com> - 1.5.4-3
- Move modules file to mpi directory and make it conflict with any other - Move modules file to mpi directory and make it conflict with any other
mpi module (bug #651074) mpi module (bug #651074)