From b262efe9d704d4711b5cc850a116a9309c0aabd3 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Nov 06 2018 01:48:33 +0000 Subject: Merge branch 'f29' --- diff --git a/.gitignore b/.gitignore index 9a04a28..0751ac1 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /rasterio-1.0.0.tar.gz /rasterio-1.0.1.tar.gz /rasterio-1.0.2.tar.gz +/rasterio-1.0.9.tar.gz diff --git a/0001-Allow-older-cligj.patch b/0001-Allow-older-cligj.patch new file mode 100644 index 0000000..2d9e77c --- /dev/null +++ b/0001-Allow-older-cligj.patch @@ -0,0 +1,26 @@ +From e1dc43a9bf763f65ccba94e3a92dd723d17eec23 Mon Sep 17 00:00:00 2001 +From: Elliott Sales de Andrade +Date: Mon, 5 Nov 2018 16:53:49 -0500 +Subject: [PATCH] Allow older cligj. + +Signed-off-by: Elliott Sales de Andrade +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index beb4296a..30b4e4a5 100755 +--- a/setup.py ++++ b/setup.py +@@ -332,7 +332,7 @@ with open('README.rst') as f: + + # Runtime requirements. + inst_reqs = [ +- 'affine', 'attrs', 'click>=4.0,<8', 'cligj>=0.5', 'numpy', 'snuggs>=1.4.1', 'click-plugins'] ++ 'affine', 'attrs', 'click>=4.0,<8', 'cligj>=0.4', 'numpy', 'snuggs>=1.4.1', 'click-plugins'] + + if sys.version_info < (3, 4): + inst_reqs.append('enum34') +-- +2.17.1 + diff --git a/python-rasterio.spec b/python-rasterio.spec index d1d9bd7..70ec4df 100644 --- a/python-rasterio.spec +++ b/python-rasterio.spec @@ -1,14 +1,15 @@ %global srcname rasterio Name: python-%{srcname} -Version: 1.0.2 -Release: 3%{?dist} +Version: 1.0.9 +Release: 1%{?dist} Summary: Fast and direct raster I/O for use with Numpy and SciPy License: BSD URL: https://github.com/mapbox/rasterio # PyPI tarball doesn't include test data. Source0: https://github.com/mapbox/rasterio/archive/%{version}/%{srcname}-%{version}.tar.gz +Patch0001: 0001-Allow-older-cligj.patch BuildRequires: gcc-c++ BuildRequires: gdal >= 1.11 @@ -38,14 +39,14 @@ BuildRequires: python3-packaging BuildRequires: python3-attrs BuildRequires: python3-affine BuildRequires: python3-click-plugins -BuildRequires: python3-cligj +BuildRequires: python3-cligj >= 0.4 BuildRequires: python3-numpy BuildRequires: python3-snuggs >= 1.4.1 Requires: python3-affine Requires: python3-attrs Requires: python3-click-plugins -Requires: python3-cligj +Requires: python3-cligj >= 0.4 Requires: python3-numpy Requires: python3-snuggs >= 1.4.1 @@ -53,7 +54,7 @@ Requires: python3-snuggs >= 1.4.1 %prep -%autosetup -n %{srcname}-%{version} +%autosetup -n %{srcname}-%{version} -p1 %build @@ -80,7 +81,10 @@ PYTHONPATH="%{buildroot}%{python3_sitearch}" \ %changelog -* Fri Sep 21 2018 Miro Hrončok +* Mon Nov 05 2018 Elliott Sales de Andrade - 1.0.9-1 +- Update to latest version + +* Fri Sep 21 2018 Miro Hrončok - 1.0.2-3 - Drop Python 2 subpackage * Tue Jul 31 2018 Florian Weimer - 1.0.2-2 diff --git a/sources b/sources index 55e5d02..0ee0a2c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rasterio-1.0.2.tar.gz) = ed1d8e6caba697e2e9391bd11866a33e1fa86346cc2f61025772945f93f05a1356ef371e24b2fca0552a52e3c04701fa1b745bd064cfdc22f2fb2a0d9c48d8df +SHA512 (rasterio-1.0.9.tar.gz) = 010f1ef782962e91987134dc87e95464f5ec01abfbce5bef85d9bb2a4ef3f372aadc4e4b43d134700ff21d5dc8f1db2df06432dc8a4ee046cb12ac14903b341d