From 5bb5c57a694434cc7f63d53acbbceccbcdb9c8bc98b0fdb13b2e4016e0d573fc Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Tue, 17 Oct 2017 13:56:29 +0000 Subject: [PATCH 1/3] - Add magic to limit the number of flavors built in the in the OBS ring. OBS-URL: https://build.opensuse.org/package/show/science:HPC/mpiP?expand=0&rev=4 --- _multibuild | 2 +- mpiP.changes | 6 ++++++ mpiP.spec | 10 ++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/_multibuild b/_multibuild index f4bc44c..1e5398d 100644 --- a/_multibuild +++ b/_multibuild @@ -1,4 +1,4 @@ - + gnu-openmpi-hpc gnu-mvapich2-hpc diff --git a/mpiP.changes b/mpiP.changes index 59dc6c2..1f89525 100644 --- a/mpiP.changes +++ b/mpiP.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 17 13:55:39 UTC 2017 - eich@suse.com + +- Add magic to limit the number of flavors built in the + in the OBS ring. + ------------------------------------------------------------------- Fri Oct 13 11:20:18 UTC 2017 - jengelh@inai.de diff --git a/mpiP.spec b/mpiP.spec index 99a3af4..063969d 100644 --- a/mpiP.spec +++ b/mpiP.spec @@ -22,10 +22,20 @@ %define vers 3.4.1 %define _vers 3_4_1 +%bcond_with ringdisabled + %if "%flavor" == "" ExclusiveArch: do_not_build %endif +# Magic for OBS Staging. Only build the flavors required by +# other packages in the ring. +%if %{with ringdisabled} + %if "%flavor" != "standard" +ExclusiveArch: do_not_build + %endif +%endif + %if "%{flavor}" == "gnu-openmpi-hpc" %global compiler_family gnu %undefine c_f_ver From e38863f6743421615af824c3def20339a58323de81764541b5da092b7a997af0 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Tue, 17 Oct 2017 14:00:35 +0000 Subject: [PATCH 2/3] - Remove last commit as it is not required. OBS-URL: https://build.opensuse.org/package/show/science:HPC/mpiP?expand=0&rev=5 --- mpiP.changes | 6 ------ mpiP.spec | 10 ---------- 2 files changed, 16 deletions(-) diff --git a/mpiP.changes b/mpiP.changes index 1f89525..59dc6c2 100644 --- a/mpiP.changes +++ b/mpiP.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Tue Oct 17 13:55:39 UTC 2017 - eich@suse.com - -- Add magic to limit the number of flavors built in the - in the OBS ring. - ------------------------------------------------------------------- Fri Oct 13 11:20:18 UTC 2017 - jengelh@inai.de diff --git a/mpiP.spec b/mpiP.spec index 063969d..99a3af4 100644 --- a/mpiP.spec +++ b/mpiP.spec @@ -22,20 +22,10 @@ %define vers 3.4.1 %define _vers 3_4_1 -%bcond_with ringdisabled - %if "%flavor" == "" ExclusiveArch: do_not_build %endif -# Magic for OBS Staging. Only build the flavors required by -# other packages in the ring. -%if %{with ringdisabled} - %if "%flavor" != "standard" -ExclusiveArch: do_not_build - %endif -%endif - %if "%{flavor}" == "gnu-openmpi-hpc" %global compiler_family gnu %undefine c_f_ver From 7d009711d29a797833e0368c42fc92d244ccef17e98b87babdae5cdcb4fe1af7 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 20 Oct 2017 08:42:41 +0000 Subject: [PATCH 3/3] - Enable the openmpi build since the HPC build for openmpi is now available in Factory. OBS-URL: https://build.opensuse.org/package/show/science:HPC/mpiP?expand=0&rev=7 --- mpiP.changes | 6 ++++++ mpiP.spec | 28 ++++++++++++++-------------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/mpiP.changes b/mpiP.changes index 59dc6c2..2ded593 100644 --- a/mpiP.changes +++ b/mpiP.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Oct 20 07:51:00 UTC 2017 - eich@suse.com + +- Enable the openmpi build since the HPC build for openmpi + is now available in Factory. + ------------------------------------------------------------------- Fri Oct 13 11:20:18 UTC 2017 - jengelh@inai.de diff --git a/mpiP.spec b/mpiP.spec index 99a3af4..2f8b0cd 100644 --- a/mpiP.spec +++ b/mpiP.spec @@ -41,21 +41,21 @@ ExclusiveArch: do_not_build %{?hpc_init:%{hpc_init -c %compiler_family -m %mpi_family %{?c_f_ver:-v %{c_f_ver}} %{?mpi_ver:-V %{mpi_ver}} %{?ext:-e %{ext}}}} -Name: %{?hpc_package_name:%{hpc_package_name %_vers}}%{!?hpc_package_name:%pname} -Summary: A profiling library for MPI applications -Version: %vers -Release: 0 -License: BSD-3-Clause -Group: Development/Tools/Debuggers -URL: http://mpip.sourceforge.net/ -Source0: http://sourceforge.net/projects/mpip/files/mpiP/mpiP-3.4.1/mpiP-%{version}.tar.gz -Patch1: mpip.unwinder.patch +Name: %{?hpc_package_name:%{hpc_package_name %_vers}}%{!?hpc_package_name:%pname} +Summary: A profiling library for MPI applications +License: BSD-3-Clause +Group: Development/Tools/Debuggers +Version: %vers +Release: 0 +Url: http://mpip.sourceforge.net/ +Source0: http://sourceforge.net/projects/mpip/files/mpiP/mpiP-3.4.1/mpiP-%{version}.tar.gz +Patch1: mpip.unwinder.patch BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel BuildRequires: %{mpi_family}%{?mpi_ver}-%{compiler_family}%{?c_f_ver}-hpc-macros-devel BuildRequires: lua-lmod -BuildRequires: suse-hpc BuildRequires: python +BuildRequires: suse-hpc %hpc_requires %description @@ -70,15 +70,15 @@ file. %{hpc_master_package -L} %package devel-static -Summary: Static version of profiling library for MPI applications -Group: Development/Libraries/C and C++ +Summary: Static version of profiling library for MPI applications +Group: Development/Libraries/C and C++ %description devel-static mpiP is a profiling library for MPI applications. %package doc -Summary: Documentation for the mpiP profiling library -Group: Documentation/Other +Summary: Documentation for the mpiP profiling library +Group: Documentation/Other %description doc mpiP is a profiling library for MPI applications.