diff --git a/.gitignore b/.gitignore index 920e600..f46a000 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /pyproj-2.3.1.tar.gz +/pyproj-2.4.1.tar.gz diff --git a/pyproj.spec b/pyproj.spec index 517e88c..f53c284 100644 --- a/pyproj.spec +++ b/pyproj.spec @@ -1,4 +1,3 @@ - # avoid providing the private libs: %if 0%{?fedora} || 0%{?rhel} >= 7 @@ -13,10 +12,11 @@ } %endif +%global minimal_needed_proj_version 6.2.0 Name: pyproj -Version: 2.3.1 -Release: 2%{?dist} +Version: 2.4.1 +Release: 1%{?dist} Summary: Cython wrapper to provide python interfaces to Proj License: MIT @@ -26,8 +26,12 @@ Source0: https://pypi.python.org/packages/source/p/%{name}/%{name}-%{version}.ta # with: https://files.pythonhosted.org/packages/source/p/%%{name}/%%{name}-%%{version}.tar.gz BuildRequires: gcc -BuildRequires: proj-devel >= 6.2.0 -BuildRequires: proj >= 6.2.0 +BuildRequires: proj-devel >= %{minimal_needed_proj_version} +BuildRequires: proj >= %{minimal_needed_proj_version} + +# needed to run the tests +BuildRequires: python3-pytest +BuildRequires: python3-mock # needed to remove the hardcoded path '/usr/lib' from the _proj.so file BuildRequires: chrpath @@ -58,7 +62,7 @@ BuildRequires: python3-Cython BuildRequires: python3-nose2 #?? BuildRequires: python3-mock -Requires: proj >= 6.2.0 +Requires: proj >= %{minimal_needed_proj_version} # ensure python provides are provided when python3 becomes the default runtime %{?python_provide:%python_provide python3-%{name}} @@ -94,9 +98,11 @@ export PROJ_DIR="%{_usr}/" # generate documentation cd docs -# need to point to the build dir so sphinx can import the module -# note that %%{_arch} does not work for all architectures -# so some if thens are needed here +# Need to point to the build dir so sphinx can import the module +# before it is installed. +# Note that %%{_arch} does not work for all architectures +# so some if/then's are needed here, since I could not find any +# standard macro that solves this. %ifarch x86_64 aarch64 ppc64le s390x %global py_build_libdir lib.linux-%{_arch}-%{python3_version} %endif @@ -136,11 +142,8 @@ chrpath -d %{buildroot}/%{python3_sitearch}/%{name}/*.so %check -# run old tests based on doctest (see README.md) -cd # make sure original source not in the PATH PYTHONPATH="%{buildroot}%{python3_sitearch}" \ - %{__python3} -c 'import pyproj;pyproj.test()' -v - +py.test-3 %files -n python3-%{name} %doc docs README.md @@ -152,6 +155,9 @@ PYTHONPATH="%{buildroot}%{python3_sitearch}" \ %changelog +* Sat Nov 9 2019 Jos de Kloe 2.4.1-1 +- Update to 2.4.1 + * Sun Sep 08 2019 Jos de Kloe 2.3.1-2 - add documentation generation, fix python usage in it and add a doc subpackage diff --git a/sources b/sources index 4682703..e4f88bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pyproj-2.3.1.tar.gz) = e845a67fa5d7bc49c58b55ab799421768a6d25edb318c60bd2af428eb7b2fc8b1412a687c853bc942618f67216daf4e83883f5330789495f47498a17a684fe57 +SHA512 (pyproj-2.4.1.tar.gz) = c8bc987991b8136951f038f504cb6ffa5f69663b9ba447b586ab29d30e91b05661c46726132ac2cbfd756d92842606b1d5a5167b84c66878688e5ac4e5259353