rpm/python-astropy
SHA256
1
0
Fork 0
forked from pool/python-astropy
Code Pull Requests Activity

Accepting request 910385 from home:bnavigator:branches:devel:languages:python:numeric

Browse Source 
- Add astropy-pr12006-cfitsio4.patch for cfitsio 4
  gh#astropy/astropy#12006
- Revert the use of bundled cfitsio for non x86 architectures.
  Those just had cfitsio earlier in the repositories than x86.

OBS-URL: https://build.opensuse.org/request/show/910385
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-astropy?expand=0&rev=57
This commit is contained in:
Benjamin Greiner 2021-08-06 00:33:56 +00:00 committed by Git OBS Bridge
parent d78775aa48
commit 8da88db5b2
3 changed files with 6072 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6061
astropy-pr12006-cfitsio4.patch Normal file
View File

File diff suppressed because it is too large Load Diff

8
python-astropy.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Aug 5 23:57:51 UTC 2021 - Ben Greiner <code@bnavigator.de>
- Add astropy-pr12006-cfitsio4.patch for cfitsio 4
gh#astropy/astropy#12006
- Revert the use of bundled cfitsio for non x86 architectures.
Those just had cfitsio earlier in the repositories than x86.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Aug 5 14:04:16 UTC 2021 - Ben Greiner <code@bnavigator.de> Thu Aug 5 14:04:16 UTC 2021 - Ben Greiner <code@bnavigator.de>

9
python-astropy.spec
View File

@ -36,12 +36,7 @@
%bcond_with system_expat %bcond_with system_expat
%bcond_with system_wcslib %bcond_with system_wcslib
%else %else
%ifarch s390x %power64 %arm32 %arm64
# cfitsio 4 not compatible on these platforms (?)
%bcond_with system_cfitsio
%else
%bcond_without system_cfitsio %bcond_without system_cfitsio
%endif
%bcond_without system_expat %bcond_without system_expat
%bcond_without system_wcslib %bcond_without system_wcslib
%endif %endif
@ -57,7 +52,7 @@
%endif %endif
%define unbundle_libs %{?unbundle_cfitsio} \ %define unbundle_libs %{?unbundle_cfitsio} \
%{?unbundle_expat} \ %{?unbundle_expat} \
%{?unbundle_wcs} %{?unbundle_wcs}
%{?!python_module:%define python_module() python3-%{**}} %{?!python_module:%define python_module() python3-%{**}}
%define skip_python2 1 %define skip_python2 1
@ -74,6 +69,8 @@ Source: https://files.pythonhosted.org/packages/source/a/astropy/astropy
# These are used by the python files so they must be available. # These are used by the python files so they must be available.
Source100: python-astropy-rpmlintrc Source100: python-astropy-rpmlintrc
# https://docs.astropy.org/en/v4.3post1/install.html#requirements # https://docs.astropy.org/en/v4.3post1/install.html#requirements
# PATCH-FIX-UPSTREAM astropy-pr12006-cfitsio4.patch gh#astropy/astropy#12006
Patch1: https://github.com/astropy/astropy/pull/12006.patch#/astropy-pr12006-cfitsio4.patch
BuildRequires: %{python_module Cython >= 0.29.22} BuildRequires: %{python_module Cython >= 0.29.22}
BuildRequires: %{python_module Jinja2} BuildRequires: %{python_module Jinja2}
BuildRequires: %{python_module devel >= 3.7} BuildRequires: %{python_module devel >= 3.7}