Architecture specific change in rpms/openmpi.git

The package rpms/openmpi.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/openmpi.git/commit/?id=75e8b871eb9b6...
https://src.fedoraproject.org/cgit/rpms/openmpi.git/commit/?id=f679d3e0afbc4...
https://src.fedoraproject.org/cgit/rpms/openmpi.git/commit/?id=a1fb0a6ce855c....

Change:
+%ifarch aarch64 ppc64le x86_64
+%ifarch aarch64 ppc64le x86_64
+%ifnarch s390

Thanks.

Full change:
============

commit 2a99253c2cece928ee99cc93adf361d7fafe7b23
Merge: f8f2601 b27bff5
Author: Orion Poplawski 
Date:   Sun Apr 28 14:01:07 2019 -0600

Merge branch '4.0'

Update to 4.0.1

Conflicts:
    	.gitignore
    	openmpi.spec
    	sources

diff --cc .gitignore
index 50d993d,e5ef2bc..3aa8772
--- a/.gitignore
+++ b/.gitignore
@@@ -41,4 -41,5 +41,6 @@@ openmpi-1.4.1-RH.tar.bz
  /openmpi-2.1.6rc1.tar.bz2
  /openmpi-2.1.6.tar.bz2
  /openmpi-3.1.3.tar.bz2
 +/openmpi-3.1.4.tar.bz2
+ /openmpi-4.0.0.tar.bz2
+ /openmpi-4.0.1.tar.bz2
diff --cc openmpi.spec
index 5fa9d4d,a3e274c..41a0c25
--- a/openmpi.spec
+++ b/openmpi.spec
@@@ -320,23 -332,19 +332,26 @@@ make chec

%changelog
 -* Sat Mar 30 2019 Orion Poplawski  - 4.0.1-1
++* Sun Apr 28 2019 Orion Poplawski  - 4.0.1-1
+ - Update to 4.0.1
+ 
 -* Sun Mar 10 2019 Orion Poplawski  - 4.0.0-2
 +* Sun Apr 28 2019 Orion Poplawski  - 3.1.4-1
 +- Update to 3.1.4
 +
 +* Mon Apr 22 2019 Bjrn Esser  - 3.1.3-5
 +- rebuilt(opensm)
 +
 +* Wed Apr 17 2019 Christoph Junghans  - 3.1.3-4
 +- Rebuild to fix ibosmcomp linkage
 +
 +* Sat Mar  2 2019 Orion Poplawski  - 3.1.3-3
  - Enable valgrind on s390x
  - Cleanup arch conditionals
 -- Enable PVFS2/OrangeFS MPI-IO support (bug #1655010)
 -- Enable mpi1 compatibility

-* Sat Dec 15 2018 Orion Poplawski  - 4.0.0-1
 -- Update to 4.0.0
 +* Tue Feb 19 2019 Orion Poplawski  - 3.1.3-2
 +- Enable PVFS2/OrangeFS MPI-IO support (bug #1655010)

-* Sat Dec 15 2018 Orion Poplawski  - 3.1.3-1
 +* Wed Feb 13 2019 Orion Poplawski  - 3.1.3-1
  - Update to 3.1.3
  - Drop ppc64le patch fixed upstream
  - Use external libevent and pmix, except on EL7

commit b27bff5713a713b3be52893573b517adc29b7a03
Author: Orion Poplawski 
Date:   Sun Mar 31 10:27:56 2019 -0600

Upload sources

diff --git a/sources b/sources
new file mode 100644
index 0000000..047b1ea
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (openmpi-4.0.1.tar.bz2) = 09f35dc2e44b4f84aab9c5af9d81f90bbdb030e4d90800a5d3ffae88cb32b7faecc9bea0abb113da53c21f73e9d19db68f961f997bc47bdd28d83a87beee0731

commit d1b7aac1de3d153c40cc84f2d6c5b97e012d3914
Author: Orion Poplawski 
Date:   Sat Mar 30 20:28:43 2019 -0600

Update to 4.0.1

diff --git a/sources b/sources
deleted file mode 100644
index 047b1ea..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (openmpi-4.0.1.tar.bz2) = 09f35dc2e44b4f84aab9c5af9d81f90bbdb030e4d90800a5d3ffae88cb32b7faecc9bea0abb113da53c21f73e9d19db68f961f997bc47bdd28d83a87beee0731

commit 1ba31991a3bb740c78cc8a377a2452ba83349c1c
Author: Orion Poplawski 
Date:   Sat Mar 30 19:35:27 2019 -0600

Update to 4.0.1

diff --git a/.gitignore b/.gitignore
index 5bdb48c..e5ef2bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,4 @@ openmpi-1.4.1-RH.tar.bz2
 /openmpi-2.1.6.tar.bz2
 /openmpi-3.1.3.tar.bz2
 /openmpi-4.0.0.tar.bz2
+/openmpi-4.0.1.tar.bz2
diff --git a/openmpi.spec b/openmpi.spec
index e544f44..a3e274c 100644
--- a/openmpi.spec
+++ b/openmpi.spec
@@ -20,8 +20,8 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)

Name:			openmpi%{?_cc_name_suffix}
-Version:		4.0.0
-Release:		2%{?dist}
+Version:		4.0.1
+Release:		1%{?dist}
 Summary:		Open Message Passing Interface
 License:		BSD and MIT and Romio
 URL:			http://www.open-mpi.org/
@@ -332,6 +332,9 @@ make check

%changelog
+* Sat Mar 30 2019 Orion Poplawski  - 4.0.1-1
+- Update to 4.0.1
+
 * Sun Mar 10 2019 Orion Poplawski  - 4.0.0-2
 - Enable valgrind on s390x
 - Cleanup arch conditionals
diff --git a/sources b/sources
index a93c23c..047b1ea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (openmpi-4.0.0.tar.bz2) = 978097dcbb16df2a616dcbbef9536fed0f7be40914daa8f927882d91bdda9265e54334fc12aeef49b41073d8782321b5611a7e9c71182258a45bca5f640e927b
+SHA512 (openmpi-4.0.1.tar.bz2) = 09f35dc2e44b4f84aab9c5af9d81f90bbdb030e4d90800a5d3ffae88cb32b7faecc9bea0abb113da53c21f73e9d19db68f961f997bc47bdd28d83a87beee0731

commit 75e8b871eb9b613b608bf705edc40d834550d590
Merge: a1fb0a6 b76d14c
Author: Orion Poplawski 
Date:   Sun Mar 10 10:32:33 2019 -0600

Merge branch 'master' into 4.0

- Enable PVFS2/OrangeFS MPI-IO support (bug #1655010)
    - Enable mpi1 compatibility

Conflicts:
    	openmpi.spec

diff --cc .gitignore
index 77e4735,a0fbeb3..5bdb48c
--- a/.gitignore
+++ b/.gitignore
@@@ -39,5 -39,5 +39,6 @@@ openmpi-1.4.1-RH.tar.bz
  /openmpi-2.1.1.tar.bz2
  /openmpi-2.1.5.tar.bz2
  /openmpi-2.1.6rc1.tar.bz2
+ /openmpi-2.1.6.tar.bz2
  /openmpi-3.1.3.tar.bz2
 +/openmpi-4.0.0.tar.bz2
diff --cc openmpi.spec
index b4274fc,940d2d3..e544f44
--- a/openmpi.spec
+++ b/openmpi.spec
@@@ -20,10 -20,9 +20,9 @@@
  %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)

Name:			openmpi%{?_cc_name_suffix}
 -Version:		3.1.3
 -Release:		3%{?dist}
 +Version:		4.0.0
- Release:		1%{?dist}
++Release:		2%{?dist}
  Summary:		Open Message Passing Interface
- Group:			Development/Libraries
  License:		BSD and MIT and Romio
  URL:			http://www.open-mpi.org/

@@@ -67,11 -68,10 +68,13 @@@ BuildRequires:          infinipath-psm-
  BuildRequires:          libpsm2-devel
  %endif
  BuildRequires:		torque-devel
 +%ifarch aarch64 ppc64le x86_64
 +BuildRequires:		ucx-devel
 +%endif
  BuildRequires:		zlib-devel
+ %if !0%{?el7}
  BuildRequires:		rpm-mpi-hooks
+ %endif

Provides:		mpi
  %if 0%{?rhel}
@@@ -164,14 -161,14 +164,15 @@@ OpenMPI support for Python 3
    --enable-mpi-cxx \
  %endif
    --enable-mpi-java \
++	--enable-mpi1-compatibility \
    --with-sge \
- %ifnarch s390 s390x
    --with-valgrind \
    --enable-memchecker \
- %endif
    --with-hwloc=/usr \
+ %if !0%{?el7}
    --with-libevent=external \
    --with-pmix=external \
+ %endif
    CC=%{opt_cc} CXX=%{opt_cxx} \
    LDFLAGS='%{__global_ldflags}' \
    CFLAGS="%{?opt_cflags} %{!?opt_cflags:$RPM_OPT_FLAGS}" \
@@@ -327,15 -320,25 +332,21 @@@ make chec

%changelog
 -* Sat Mar  2 2019 Orion Poplawski  - 3.1.3-3
++* Sun Mar 10 2019 Orion Poplawski  - 4.0.0-2
+ - Enable valgrind on s390x
+ - Cleanup arch conditionals
 -
 -* Tue Feb 19 2019 Orion Poplawski  - 3.1.3-2
+ - Enable PVFS2/OrangeFS MPI-IO support (bug #1655010)
++- Enable mpi1 compatibility
++
 +* Sat Dec 15 2018 Orion Poplawski  - 4.0.0-1
 +- Update to 4.0.0

-* Wed Feb 13 2019 Orion Poplawski  - 3.1.3-1
 +* Sat Dec 15 2018 Orion Poplawski  - 3.1.3-1
  - Update to 3.1.3
  - Drop ppc64le patch fixed upstream
- - Use external libevent and pmix
+ - Use external libevent and pmix, except on EL7
  - Fix EPEL7 builds

-* Sat Feb 2 2019 Orion Poplawski  - 2.1.6-1
 -- Update to 2.1.6
 -
 -* Fri Feb 01 2019 Fedora Release Engineering  - 2.1.6-0.2.rc1
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 -
  * Wed Nov 28 2018 Orion Poplawski  - 2.1.6-0.1.rc1
  - Update to 2.1.6rc1

commit a1fb0a6ce855ca1dd23c63816df2ab2cd855d6fd
Author: Orion Poplawski 
Date:   Mon Feb 4 21:41:00 2019 -0700

mca-btl-openib-device-params.ini is now installed on arm32

diff --git a/openmpi.spec b/openmpi.spec
index 1b5a73a..b4274fc 100644
--- a/openmpi.spec
+++ b/openmpi.spec
@@ -273,7 +273,7 @@ make check
 %dir %{_libdir}/%{name}/share/openmpi
 %{_libdir}/%{name}/share/openmpi/amca-param-sets
 %{_libdir}/%{name}/share/openmpi/help*.txt
-%ifnarch s390 %{arm}
+%ifnarch s390
 %{_libdir}/%{name}/share/openmpi/mca-btl-openib-device-params.ini
 %endif

commit f679d3e0afbc4b2c9f881eec8951405bcf2bf43b
Author: Orion Poplawski 
Date:   Sun Nov 25 21:08:06 2018 -0700

Update to 4.0.0

diff --git a/.gitignore b/.gitignore
index 683340a..77e4735 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,4 @@ openmpi-1.4.1-RH.tar.bz2
 /openmpi-2.1.5.tar.bz2
 /openmpi-2.1.6rc1.tar.bz2
 /openmpi-3.1.3.tar.bz2
+/openmpi-4.0.0.tar.bz2
diff --git a/openmpi.spec b/openmpi.spec
index 61617b7..1b5a73a 100644
--- a/openmpi.spec
+++ b/openmpi.spec
@@ -20,7 +20,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)

Name:			openmpi%{?_cc_name_suffix}
-Version:		3.1.3
+Version:		4.0.0
 Release:		1%{?dist}
 Summary:		Open Message Passing Interface
 Group:			Development/Libraries
@@ -28,7 +28,7 @@ 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/v3.1/downloads/openmpi-%%7Bversion%7D...
+Source0:		https://www.open-mpi.org/software/ompi/v4.0/downloads/openmpi-%%7Bversion%7D...
 Source1:		openmpi.module.in
 Source2:		openmpi.pth.py2
 Source3:		openmpi.pth.py3
@@ -67,6 +67,9 @@ BuildRequires:          infinipath-psm-devel
 BuildRequires:          libpsm2-devel
 %endif
 BuildRequires:		torque-devel
+%ifarch aarch64 ppc64le x86_64
+BuildRequires:		ucx-devel
+%endif
 BuildRequires:		zlib-devel
 BuildRequires:		rpm-mpi-hooks

@@ -245,20 +248,22 @@ make check
 %{_libdir}/%{name}/bin/mpi[er]*
 %{_libdir}/%{name}/bin/ompi*
 %{_libdir}/%{name}/bin/orte[-dr_]*
+%ifarch aarch64 ppc64le x86_64
 %{_libdir}/%{name}/bin/oshmem_info
 %{_libdir}/%{name}/bin/oshrun
-%{_libdir}/%{name}/bin/prun
 %{_libdir}/%{name}/bin/shmemrun
+%endif
 %{_libdir}/%{name}/lib/*.so.40*
 %{_libdir}/%{name}/lib/libmca*.so.41*
 %{_libdir}/%{name}/lib/libmca*.so.50*
 %{_mandir}/%{namearch}/man1/mpi[er]*
 %{_mandir}/%{namearch}/man1/ompi*
 %{_mandir}/%{namearch}/man1/orte[-dr_]*
+%ifarch aarch64 ppc64le x86_64
 %{_mandir}/%{namearch}/man1/oshmem_info*
 %{_mandir}/%{namearch}/man1/oshrun*
-%{_mandir}/%{namearch}/man1/prun*
 %{_mandir}/%{namearch}/man1/shmemrun*
+%endif
 %{_mandir}/%{namearch}/man7/ompi_*
 %{_mandir}/%{namearch}/man7/opal_*
 %{_mandir}/%{namearch}/man7/orte*
@@ -278,9 +283,13 @@ make check
 %{_libdir}/%{name}/bin/mpi[cCf]*
 %{_libdir}/%{name}/bin/opal_*
 %{_libdir}/%{name}/bin/orte[cCf]*
+%ifarch aarch64 ppc64le x86_64
 %{_libdir}/%{name}/bin/osh[cCf]*
+%endif
 %{_libdir}/%{name}/bin/profile2mat.pl
+%ifarch aarch64 ppc64le x86_64
 %{_libdir}/%{name}/bin/shmem[cCf]*
+%endif
 %{_includedir}/%{namearch}/*
 %{_fmoddir}/%{name}/
 %{_libdir}/%{name}/lib/*.so
@@ -288,8 +297,10 @@ make check
 %{_libdir}/%{name}/lib/pkgconfig/
 %{_libdir}/pkgconfig/*.pc
 %{_mandir}/%{namearch}/man1/mpi[cCf]*
+%ifarch aarch64 ppc64le x86_64
 %{_mandir}/%{namearch}/man1/osh[cCf]*
 %{_mandir}/%{namearch}/man1/shmem[cCf]*
+%endif
 %{_mandir}/%{namearch}/man1/opal_*
 %{_mandir}/%{namearch}/man3/*
 %{_libdir}/%{name}/share/openmpi/openmpi-valgrind.supp
@@ -316,6 +327,9 @@ make check

%changelog
+* Sat Dec 15 2018 Orion Poplawski  - 4.0.0-1
+- Update to 4.0.0
+
 * Sat Dec 15 2018 Orion Poplawski  - 3.1.3-1
 - Update to 3.1.3
 - Drop ppc64le patch fixed upstream
diff --git a/sources b/sources
index edcaaa5..a93c23c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (openmpi-3.1.3.tar.bz2) = 700821df676de5f85ce2793298242dcaea73f585f89540e30999792a568f193545a9f9b2bcb3ea22effa3bf14744531c4eb5fc4c84a8d7bbe5e5fdd76ab3a04a
+SHA512 (openmpi-4.0.0.tar.bz2) = 978097dcbb16df2a616dcbbef9536fed0f7be40914daa8f927882d91bdda9265e54334fc12aeef49b41073d8782321b5611a7e9c71182258a45bca5f640e927b