- Remove ringdisabled magic as hdf5 is no longer a ring package.

This should resolve a number of problems in the review channels
  for Factory with packages requiring hdf5 libs.

OBS-URL: https://build.opensuse.org/package/show/science/hdf5?expand=0&rev=102
This commit is contained in:
Egbert Eich 2019-03-01 09:41:54 +00:00 committed by Git OBS Bridge
parent bf9fe186be
commit 0d3c3cc8be
2 changed files with 7 additions and 10 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Mar 1 09:37:54 UTC 2019 - Egbert Eich <eich@suse.com>
- Remove ringdisabled magic as hdf5 is no longer a ring package.
This should resolve a number of problems in the review channels
for Factory with packages requiring hdf5 libs.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 13 10:37:28 UTC 2019 - Egbert Eich <eich@suse.com> Wed Feb 13 10:37:28 UTC 2019 - Egbert Eich <eich@suse.com>

View File

@ -38,8 +38,6 @@
%define src_ver %{version} %define src_ver %{version}
%define pname hdf5 %define pname hdf5
%bcond_with ringdisabled
%if "%{flavor}" == "" %if "%{flavor}" == ""
ExclusiveArch: do_not_build ExclusiveArch: do_not_build
%define package_name %pname %define package_name %pname
@ -177,14 +175,6 @@ ExclusiveArch: do_not_build
%{?with_hpc:%{!?compiler_family:%global compiler_family gnu}} %{?with_hpc:%{!?compiler_family:%global compiler_family gnu}}
%{?with_mpi:%{!?mpi_flavor:error "No MPI family specified!"}} %{?with_mpi:%{!?mpi_flavor:error "No MPI family specified!"}}
# Magic for OBS Staging. Only build the flavors required by
# other packages in the ring.
%if %{with ringdisabled}
%if %{with hpc} || "%{?mpi_flavor}" == "mvapich2"
ExclusiveArch: do_not_build
%endif
%endif
# For compatibility package names # For compatibility package names
%if "%{mpi_flavor}" != "openmpi" || "%{mpi_vers}" != "1" %if "%{mpi_flavor}" != "openmpi" || "%{mpi_vers}" != "1"
%define mpi_ext %{?mpi_vers} %define mpi_ext %{?mpi_vers}