1
0

Accepting request 863412 from home:bnavigator:branches:devel:languages:python:backports

- Make sure that the python >= 3.7 requirement is checked on
  build time and let rpm do the rest.
- Use bundled libraries on Leap 15.X

OBS-URL: https://build.opensuse.org/request/show/863412
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-astropy?expand=0&rev=47
This commit is contained in:
Benjamin Greiner 2021-01-15 20:35:21 +00:00 committed by Git OBS Bridge
parent 956a8a7715
commit 82e7410fed
2 changed files with 8 additions and 2 deletions

View File

@ -3,6 +3,7 @@ Fri Jan 15 18:01:11 UTC 2021 - Benjamin Greiner <code@bnavigator.de>
- Make sure that the python >= 3.7 requirement is checked on - Make sure that the python >= 3.7 requirement is checked on
build time and let rpm do the rest. build time and let rpm do the rest.
- Use bundled libraries on Leap 15.X
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jan 1 19:03:47 UTC 2021 - Benjamin Greiner <code@bnavigator.de> Fri Jan 1 19:03:47 UTC 2021 - Benjamin Greiner <code@bnavigator.de>

View File

@ -1,7 +1,7 @@
# #
# spec file for package python-astropy # spec file for package python-astropy
# #
# Copyright (c) 2020 SUSE LLC # Copyright (c) 2021 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -27,7 +27,12 @@
%define binaries fitsdiff fitsheader fitscheck fitsinfo fits2bitmap samp_hub showtable volint wcslint %define binaries fitsdiff fitsheader fitscheck fitsinfo fits2bitmap samp_hub showtable volint wcslint
%if 0%{suse_version} <= 1500
# Use the bundled libraries for Leap 15.X, because the versions in the repos are too old
%bcond_with systemlibs
%else
%bcond_without systemlibs %bcond_without systemlibs
%endif
%if %{with systemlibs} %if %{with systemlibs}
%define unbundle_libs export ASTROPY_USE_SYSTEM_CFITSIO=1 \ %define unbundle_libs export ASTROPY_USE_SYSTEM_CFITSIO=1 \
export ASTROPY_USE_SYSTEM_EXPAT=1 \ export ASTROPY_USE_SYSTEM_EXPAT=1 \
@ -63,6 +68,7 @@ BuildRequires: pkgconfig
BuildRequires: python-rpm-macros BuildRequires: python-rpm-macros
Requires: python-dbm Requires: python-dbm
Requires: python-numpy >= 1.17 Requires: python-numpy >= 1.17
Requires: python-pyerfa
Requires(post): update-alternatives Requires(post): update-alternatives
Requires(postun): update-alternatives Requires(postun): update-alternatives
Recommends: libxml2-tools Recommends: libxml2-tools
@ -85,7 +91,6 @@ Conflicts: perl-Data-ShowTable
BuildRequires: pkgconfig(cfitsio) BuildRequires: pkgconfig(cfitsio)
BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(expat)
BuildRequires: pkgconfig(wcslib) >= 7 BuildRequires: pkgconfig(wcslib) >= 7
Requires: python-pyerfa
%endif %endif
%if %{with test} %if %{with test}
# SECTION Optional requirements # SECTION Optional requirements