diff --git a/.gitignore b/.gitignore index a5bce57..91b735c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -/scalasca-2.2.2.tar.gz /scalasca-2.3.tar.gz /scalasca-2.3.1.tar.gz /scalasca-2.4.tar.gz diff --git a/scalasca.spec b/scalasca.spec index 000d8d8..e1ac263 100644 --- a/scalasca.spec +++ b/scalasca.spec @@ -1,5 +1,5 @@ # Copyright (c) 2014, 2015 Dave Love, University of Liverpool -# Copyright (c) 2018 Dave Love, University of Manchester +# Copyright (c) 2018, 2019 Dave Love, University of Manchester # MIT licence, per Fedora policy. # fixme: appdata/desktop files? @@ -20,7 +20,7 @@ Name: scalasca Version: 2.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Toolset for performance analysis of large-scale parallel applications # ScoutPatternParser and SilasConfigParser are GPL @@ -60,7 +60,18 @@ Requires: %_libdir/openmpi/bin/scorep-config %description openmpi %desc -This is the openmpi version. +%if 0%{?el7} +%package openmpi3 +Summary: Toolset for performance analysis of large-scale parallel applications - openmpi3 +BuildRequires: openmpi3-devel +Requires: openmpi3%{?_isa} +Requires: %_libdir/openmpi3/bin/scorep-config + +%description openmpi3 +%desc + +This is the openmpi3 version. +%endif %if %{with mpich} %package mpich @@ -83,7 +94,7 @@ Documentation for %name %prep %setup -q -mkdir openmpi mpich simple +mkdir openmpi mpich simple %{?el7:openmpi3} rm -r vendor/cubew vendor/otf2 # bundled libraries @@ -100,6 +111,13 @@ pushd openmpi %do_build %_openmpi_unload popd +%if 0%{?el7} +pushd openmpi3 +%_openmpi3_load +%do_build +%_openmpi3_unload +popd +%endif %if %{with mpich} pushd mpich %_mpich_load @@ -117,6 +135,7 @@ popd %install %make_install -C openmpi +%{?el7:%make_install -C openmpi3} %if %{with mpich} %make_install -C mpich %endif @@ -154,6 +173,17 @@ make check VERBOSE=1 %_libdir/openmpi/bin/* %_mandir/openmpi-*/man1/* +%if 0%{?el7} +%files openmpi3 +%doc README +%license COPYING +%_libdir/openmpi3/share/%name +%exclude %_libdir/openmpi3/lib/*.so +%_libdir/openmpi3/lib/*.so.* +%_libdir/openmpi3/bin/* +%_mandir/openmpi3-*/man1/* +%endif + %if %{with mpich} %files mpich %doc README @@ -162,7 +192,7 @@ make check VERBOSE=1 %exclude %_libdir/mpich/lib/*.so %_libdir/mpich/lib/*.so.* %_libdir/mpich/bin/* -%_mandir/mpich-*/man1/* +%_mandir/mpich*/man1/* %endif %files doc @@ -171,6 +201,9 @@ make check VERBOSE=1 %changelog +* Tue Sep 3 2019 Dave love - 2.5-3 +- Modify for el7 + * Fri Jul 26 2019 Fedora Release Engineering - 2.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild