- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -52,3 +52,8 @@ openmpi-1.4.1-RH.tar.bz2
 /openmpi-4.0.3.tar.bz2
 /openmpi-4.0.4rc1.tar.bz2
 /openmpi-4.0.4.tar.bz2
+/openmpi-4.0.5.tar.bz2
+/openmpi-4.1.0.tar.bz2
+/openmpi-4.1.1rc1.tar.bz2
+/openmpi-4.1.1rc2.tar.bz2
+/openmpi-4.1.1.tar.bz2

openmpi.spec

@@ -1,17 +1,3 @@
-%global _hardened_build 1
-# We only compile with gcc, but other people may want other compilers.
-# Set the compiler here.
-%global opt_cc gcc
-# Optional CFLAGS to use with the specific compiler...gcc doesn't need any,
-# so uncomment and define to use
-#global opt_cflags
-%global opt_cxx g++
-#global opt_cxxflags
-%global opt_f77 gfortran
-#global opt_fflags
-%global opt_fc gfortran
-#global opt_fcflags
-
 # Optional name suffix to use...we leave it off when compiling with gcc, but
 # for other compiled versions to install side by side, it will need a
 # suffix in order to keep the names from conflicting.
@@ -39,70 +25,79 @@
 %bcond_without rdma
 %endif
 
-Name:            openmpi%{?_cc_name_suffix}
-Version:         4.0.4
-Release:         1%{?dist}
-Summary:         Open Message Passing Interface
-License:         BSD and MIT and Romio
-URL:             http://www.open-mpi.org/
+# Run autogen - needed for some patches
+%bcond_with autogen
+
+Name:           openmpi%{?_cc_name_suffix}
+Version:        4.1.1
+Release:        3%{?dist}
+Summary:        Open Message Passing Interface
+License:        BSD and MIT and Romio
+URL:            http://www.open-mpi.org/
 
 # We can't use %%{name} here because of _cc_name_suffix
-Source0:         https://www.open-mpi.org/software/ompi/v4.0/downloads/openmpi-%{version}.tar.bz2
-Source1:         openmpi.module.in
-Source2:         openmpi.pth.py2
-Source3:         openmpi.pth.py3
-Source4:         macros.openmpi
+Source0:        https://www.open-mpi.org/software/ompi/v4.1/downloads/openmpi-%{version}.tar.bz2
+Source1:        openmpi.module.in
+Source2:        openmpi.pth.py2
+Source3:        openmpi.pth.py3
+Source4:        macros.openmpi
 
-BuildRequires:   gcc-c++
-BuildRequires:   gcc-gfortran
-BuildRequires:   valgrind-devel
+BuildRequires:  gcc-c++
+BuildRequires:  gcc-gfortran
+BuildRequires:  make
+%if %{with autogen}
+BuildRequires:  libtool
+BuildRequires:  perl(Data::Dumper)
+BuildRequires:  perl(File::Find)
+%endif
+BuildRequires:  valgrind-devel
 %if %{with rdma}
-BuildRequires:   opensm-devel > 3.3.0
-BuildRequires:   rdma-core-devel
+BuildRequires:  opensm-devel > 3.3.0
+BuildRequires:  rdma-core-devel
 %endif
 # Doesn't compile:
 # vt_dyn.cc:958:28: error: 'class BPatch_basicBlockLoop' has no member named 'getLoopHead'
 #                      loop->getLoopHead()->getStartAddress(), loop_stmts );
-#BuildRequires:   dyninst-devel
-BuildRequires:   hwloc-devel
+#BuildRequires:  dyninst-devel
+BuildRequires:  hwloc-devel
 # So configure can find lstopo
-BuildRequires:   hwloc-gui
-BuildRequires:   java-devel
+BuildRequires:  hwloc-gui
+BuildRequires:  java-devel
 # Old libevent causes issues
 %if !0%{?el7}
-BuildRequires:   libevent-devel
+BuildRequires:  libevent-devel
 %endif
-BuildRequires:   libfabric-devel
+BuildRequires:  libfabric-devel
 %ifnarch s390 s390x
-BuildRequires:   papi-devel
+BuildRequires:  papi-devel
 %endif
-BuildRequires:   orangefs-devel
-BuildRequires:   perl-generators
-BuildRequires:   perl-interpreter
-BuildRequires:   perl(Getopt::Long)
-BuildRequires:   pmix-devel
-BuildRequires:   python%{python3_pkgversion}-devel
+BuildRequires:  orangefs-devel
+BuildRequires:  perl-generators
+BuildRequires:  perl-interpreter
+BuildRequires:  perl(Getopt::Long)
+BuildRequires:  pmix-devel
+BuildRequires:  python%{python3_pkgversion}-devel
 %ifarch x86_64
-BuildRequires:   infinipath-psm-devel
-BuildRequires:   libpsm2-devel
+BuildRequires:  infinipath-psm-devel
+BuildRequires:  libpsm2-devel
 %endif
 %if %{with ucx}
-BuildRequires:   ucx-devel
+BuildRequires:  ucx-devel
 %endif
-BuildRequires:   zlib-devel
+BuildRequires:  zlib-devel
 %if !0%{?el7}
-BuildRequires:   rpm-mpi-hooks
+BuildRequires:  rpm-mpi-hooks
 %endif
 
-Provides:        mpi
-%if 0%{?rhel}
+Provides:       mpi
+%if 0%{?rhel} == 7
 # Need this for /etc/profile.d/modules.sh
-Requires:        environment-modules
+Requires:       environment-modules
 %endif
-Requires:        environment(modules)
+Requires:       environment(modules)
 # openmpi currently requires ssh to run
 # https://svn.open-mpi.org/trac/ompi/ticket/4228
-Requires:        openssh-clients
+Requires:       openssh-clients
 
 # Private openmpi libraries
 %global __provides_exclude_from %{_libdir}/openmpi/lib/(lib(mca|ompi|open-(pal|rte|trace))|openmpi/).*.so
@@ -133,17 +128,17 @@ Requires:	(python(abi) = %{python3_version} if python3)
 Contains development headers and libraries for openmpi.
 
 %package java
-Summary:    Java library
-Requires:   %{name} = %{version}-%{release}
-Requires:   java-headless
+Summary:        Java library
+Requires:       %{name} = %{version}-%{release}
+Requires:       java-headless
 
 %description java
 Java library.
 
 %package java-devel
-Summary:    Java development files for openmpi
-Requires:   %{name}-java = %{version}-%{release}
-Requires:   java-devel
+Summary:        Java development files for openmpi
+Requires:       %{name}-java = %{version}-%{release}
+Requires:       java-devel
 
 %description java-devel
 Contains development wrapper for compiling Java with openmpi.
@@ -154,28 +149,33 @@ Contains development wrapper for compiling Java with openmpi.
 
 %if %{with python2}
 %package -n python2-openmpi
-Summary:    OpenMPI support for Python 2
-BuildRequires: python2-devel
-Requires:   %{name} = %{version}-%{release}
-Requires:   python(abi) = %{python2_version}
+Summary:        OpenMPI support for Python 2
+BuildRequires:  python2-devel
+Requires:       %{name} = %{version}-%{release}
+Requires:       python(abi) = %{python2_version}
 
 %description -n python2-openmpi
 OpenMPI support for Python 2.
 %endif
 
 %package -n python%{python3_pkgversion}-openmpi
-Summary:    OpenMPI support for Python 3
-Requires:   %{name} = %{version}-%{release}
-Requires:   python(abi) = %{python3_version}
+Summary:        OpenMPI support for Python 3
+Requires:       %{name} = %{version}-%{release}
+Requires:       python(abi) = %{python3_version}
 
 %description -n python%{python3_pkgversion}-openmpi
 OpenMPI support for Python 3.
 
 
 %prep
-%autosetup -p1
+%autosetup -p1 -n %{name}-%{version}
+%if %{with autogen}
+./autogen.pl --force
+%endif
+
 
 %build
+%set_build_flags
 ./configure --prefix=%{_libdir}/%{name} \
 	--mandir=%{_mandir}/%{namearch} \
 	--includedir=%{_includedir}/%{namearch} \
@@ -193,12 +193,6 @@ OpenMPI support for Python 3.
 	--with-libevent=external \
 	--with-pmix=external \
 %endif
-	CC=%{opt_cc} CXX=%{opt_cxx} \
-	LDFLAGS='%{__global_ldflags}' \
-	CFLAGS="%{?opt_cflags} %{!?opt_cflags:$RPM_OPT_FLAGS}" \
-	CXXFLAGS="%{?opt_cxxflags} %{!?opt_cxxflags:$RPM_OPT_FLAGS}" \
-	FC=%{opt_fc} FCFLAGS="%{?opt_fcflags} %{!?opt_fcflags:$RPM_OPT_FLAGS}"
-#        --with-contrib-vt-flags='CXXFLAGS="-I%{_includedir}/dyninst -L%{_libdir}/dyninst"' \
 
 %make_build V=1
 
@@ -281,6 +275,7 @@ make check
 %{_libdir}/%{name}/bin/shmemrun
 %endif
 %{_libdir}/%{name}/lib/*.so.40*
+%{_libdir}/%{name}/lib/libmca_common_ofi.so.10*
 %{_libdir}/%{name}/lib/libmca*.so.41*
 %{_libdir}/%{name}/lib/libmca*.so.50*
 %if 0%{?el7}
@@ -362,6 +357,49 @@ make check
 
 
 %changelog
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 4.1.1-2
+- Rebuilt for Python 3.10
+
+* Tue Apr 27 2021 Orion Poplawski <orion@nwra.com> - 4.1.1-1
+- Update to 4.1.1
+
+* Mon Apr 05 2021 Orion Poplawski <orion@nwra.com> - 4.1.1-0.2.rc2
+- Update to 4.1.1rc2
+
+* Thu Feb 11 2021 Orion Poplawski <orion@nwra.com> - 4.1.1-0.1.rc1
+- Update to 4.1.1rc1
+
+* Thu Jan 28 2021 Orion Poplawski <orion@nwra.com> - 4.1.0-5
+- Add upstream patch for generalized requests
+
+* Thu Jan 28 2021 Orion Poplawski <orion@nwra.com> - 4.1.0-4
+- Add upstream patch to fix AVX library linkage
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Sun Jan 24 2021 Orion Poplawski <orion@nwra.com> - 4.1.0-2
+- Use set_build_flags macro
+- Drop old opt_ macros
+
+* Sun Jan 24 2021 Orion Poplawski <orion@nwra.com> - 4.1.0-1
+- Update to 4.1.0
+
+* Wed Sep 23 2020 Orion Poplawski <orion@nwra.com> - 4.0.5-2
+- Rebuild for libevent 2.1.12
+
+* Wed Sep 02 2020 Orion Poplawski <orion@nwra.com> - 4.0.5-1
+- Update to 4.0.5
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 4.0.4-2
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
 * Wed Jun 17 2020 Orion Poplawski <orion@nwra.com> - 4.0.4-1
 - Update to 4.0.4
 

sources

@@ -1 +1 @@
-SHA512 (openmpi-4.0.4.tar.bz2) = 6c193b4b5cbfd9d48fa5efcef01372c424b51ae5e9727ccf4235e3b14556dfeb010865e41a9473419ccda16559139aa469086b1fff9abfd337e87387fdec1c64
+SHA512 (openmpi-4.1.1.tar.bz2) = 0d85ba45a40c0879f266e5286615e2cf94eb3570f0a705194525821d5c85d460cefc3a2da8207e6e84c479d3d0da656e2342cc2d6f88c4b4577ca22bbeacc89d