From 82e7410fed1ca303c6c6859e25b4ffb1df24edcad37079ce44da42a444a787f7 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Fri, 15 Jan 2021 20:35:21 +0000 Subject: [PATCH] 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 --- python-astropy.changes | 1 + python-astropy.spec | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/python-astropy.changes b/python-astropy.changes index 54522b0..38e5ce1 100644 --- a/python-astropy.changes +++ b/python-astropy.changes @@ -3,6 +3,7 @@ Fri Jan 15 18:01:11 UTC 2021 - Benjamin Greiner - 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 ------------------------------------------------------------------- Fri Jan 1 19:03:47 UTC 2021 - Benjamin Greiner diff --git a/python-astropy.spec b/python-astropy.spec index 121e06d..956ec73 100644 --- a/python-astropy.spec +++ b/python-astropy.spec @@ -1,7 +1,7 @@ # # 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 # 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 +%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 +%endif %if %{with systemlibs} %define unbundle_libs export ASTROPY_USE_SYSTEM_CFITSIO=1 \ export ASTROPY_USE_SYSTEM_EXPAT=1 \ @@ -63,6 +68,7 @@ BuildRequires: pkgconfig BuildRequires: python-rpm-macros Requires: python-dbm Requires: python-numpy >= 1.17 +Requires: python-pyerfa Requires(post): update-alternatives Requires(postun): update-alternatives Recommends: libxml2-tools @@ -85,7 +91,6 @@ Conflicts: perl-Data-ShowTable BuildRequires: pkgconfig(cfitsio) BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(wcslib) >= 7 -Requires: python-pyerfa %endif %if %{with test} # SECTION Optional requirements