From 71e72d6565790d88ce19e11266029366398c9178 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Jan 23 2020 14:09:12 +0000 Subject: Merge branch 'master' into epel8 --- diff --git a/.gitignore b/.gitignore index e432ed5..f2a693c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ basemap-0.99.4-examples.tar.gz /basemap-1.0.6.tar.gz /basemap-1.0.7.tar.gz /basemap-1.2.0.tar.gz +/basemap-1.2.1.tar.gz diff --git a/0001-Fix-the-location-of-basemap_datadir.patch b/0001-Fix-the-location-of-basemap_datadir.patch deleted file mode 100644 index 2bb90b7..0000000 --- a/0001-Fix-the-location-of-basemap_datadir.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 054a785ae8aee515a46f670da41b5e0a2f226f12 Mon Sep 17 00:00:00 2001 -From: Pierre-Yves Chibon -Date: Thu, 15 Jan 2015 11:53:37 +0100 -Subject: [PATCH] Fix the location of basemap_datadir - ---- - lib/mpl_toolkits/basemap/__init__.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/mpl_toolkits/basemap/__init__.py b/lib/mpl_toolkits/basemap/__init__.py -index bd52063..3e724c2 100644 ---- a/lib/mpl_toolkits/basemap/__init__.py -+++ b/lib/mpl_toolkits/basemap/__init__.py -@@ -56,7 +56,7 @@ if 'BASEMAPDATA' in os.environ: - if not os.path.isdir(basemap_datadir): - raise RuntimeError('Path in environment BASEMAPDATA not a directory') - else: -- basemap_datadir = os.sep.join([os.path.dirname(__file__), 'data']) -+ basemap_datadir = "/usr/share/basemap" - - __version__ = '1.1.0' - --- -2.1.0 - diff --git a/0002-Fix-version-number.patch b/0002-Fix-version-number.patch deleted file mode 100644 index 530d728..0000000 --- a/0002-Fix-version-number.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uPNr basemap-1.2.0rel.orig/lib/mpl_toolkits/basemap/__init__.py basemap-1.2.0rel/lib/mpl_toolkits/basemap/__init__.py ---- basemap-1.2.0rel.orig/lib/mpl_toolkits/basemap/__init__.py 2019-05-03 04:47:44.122236807 -0400 -+++ basemap-1.2.0rel/lib/mpl_toolkits/basemap/__init__.py 2019-05-03 04:48:19.754917346 -0400 -@@ -58,7 +58,7 @@ - else: - basemap_datadir = "/usr/share/basemap" - --__version__ = '1.1.0' -+__version__ = '1.2.0' - - # module variable that sets the default value for the 'latlon' kwarg. - # can be set to True by user so plotting functions can take lons,lats diff --git a/python-basemap-0.99-datadir.patch b/python-basemap-0.99-datadir.patch deleted file mode 100644 index a080408..0000000 --- a/python-basemap-0.99-datadir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -r -u basemap-0.99.4/lib/mpl_toolkits/basemap/__init__.py basemap-0.99.4-new/lib/mpl_toolkits/basemap/__init__.py ---- basemap-0.99.4/lib/mpl_toolkits/basemap/__init__.py 2009-08-05 09:28:16.000000000 -0800 -+++ basemap-0.99.4-new/lib/mpl_toolkits/basemap/__init__.py 2010-04-12 19:42:45.000000000 -0800 -@@ -51,7 +51,7 @@ - if not os.path.isdir(basemap_datadir): - raise RuntimeError('Path in environment BASEMAPDATA not a directory') - else: -- basemap_datadir = os.sep.join([os.path.dirname(__file__), 'data']) -+ basemap_datadir = '/usr/share/basemap' - - __version__ = '0.99.4' - diff --git a/python-basemap-0.99-geos-3.0.1-runtime-check.patch b/python-basemap-0.99-geos-3.0.1-runtime-check.patch deleted file mode 100644 index 28b88ed..0000000 --- a/python-basemap-0.99-geos-3.0.1-runtime-check.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff -ur basemap-0.99/src/_geoslib.c basemap-0.99-geos-3.0.1-runtime-check/src/_geoslib.c ---- basemap-0.99/src/_geoslib.c 2008-05-31 16:47:47.000000000 +0200 -+++ basemap-0.99-geos-3.0.1-runtime-check/src/_geoslib.c 2008-10-23 03:39:39.000000000 +0200 -@@ -202,8 +202,8 @@ - /* Implementation of _geoslib */ - - static char __pyx_k_3[] = "0.1"; --static char __pyx_k_4[] = "2.2.3-CAPI-1.1.1"; --static char __pyx_k_5[] = "version 2.2.3 of the geos library is required"; -+static char __pyx_k_4[] = "3.0.1-CAPI-1.4.2"; -+static char __pyx_k_5[] = "version 3.0.1 of the geos library is required"; - - static PyObject *__pyx_n_is_valid; - static PyObject *__pyx_n_geom_type; -@@ -515,7 +515,7 @@ - * cdef geos_version(): - * return PyString_FromString(GEOSversion()) # <<<<<<<<<<<<<< - * __geos_version__ = geos_version() # module variable. -- * if __geos_version__ != "2.2.3-CAPI-1.1.1": -+ * if __geos_version__ != "3.0.1-CAPI-1.4.2": - */ - __pyx_1 = PyString_FromString(GEOSversion()); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L1;} - __pyx_r = __pyx_1; -@@ -2988,8 +2988,8 @@ - * cdef geos_version(): - * return PyString_FromString(GEOSversion()) - * __geos_version__ = geos_version() # module variable. # <<<<<<<<<<<<<< -- * if __geos_version__ != "2.2.3-CAPI-1.1.1": -- * raise ValueError('version 2.2.3 of the geos library is required') -+ * if __geos_version__ != "3.0.1-CAPI-1.4.2": -+ * raise ValueError('version 3.0.1 of the geos library is required') - */ - __pyx_1 = __pyx_f_8_geoslib_geos_version(); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1;} - if (PyObject_SetAttr(__pyx_m, __pyx_n___geos_version__, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1;} -@@ -2998,8 +2998,8 @@ - /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geoslib.pyx":122 - * return PyString_FromString(GEOSversion()) - * __geos_version__ = geos_version() # module variable. -- * if __geos_version__ != "2.2.3-CAPI-1.1.1": # <<<<<<<<<<<<<< -- * raise ValueError('version 2.2.3 of the geos library is required') -+ * if __geos_version__ != "3.0.1-CAPI-1.4.2": # <<<<<<<<<<<<<< -+ * raise ValueError('version 3.0.1 of the geos library is required') - * # intialize GEOS (parameters are notice and error function callbacks). - */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n___geos_version__); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1;} -@@ -3011,8 +3011,8 @@ - - /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geoslib.pyx":123 - * __geos_version__ = geos_version() # module variable. -- * if __geos_version__ != "2.2.3-CAPI-1.1.1": -- * raise ValueError('version 2.2.3 of the geos library is required') # <<<<<<<<<<<<<< -+ * if __geos_version__ != "3.0.1-CAPI-1.4.2": -+ * raise ValueError('version 3.0.1 of the geos library is required') # <<<<<<<<<<<<<< - * # intialize GEOS (parameters are notice and error function callbacks). - * initGEOS(notice_h, error_h) - */ -@@ -3029,7 +3029,7 @@ - __pyx_L5:; - - /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geoslib.pyx":125 -- * raise ValueError('version 2.2.3 of the geos library is required') -+ * raise ValueError('version 3.0.1 of the geos library is required') - * # intialize GEOS (parameters are notice and error function callbacks). - * initGEOS(notice_h, error_h) # <<<<<<<<<<<<<< - * -diff -ur basemap-0.99/src/_geoslib.pyx basemap-0.99-geos-3.0.1-runtime-check/src/_geoslib.pyx ---- basemap-0.99/src/_geoslib.pyx 2008-05-31 16:47:47.000000000 +0200 -+++ basemap-0.99-geos-3.0.1-runtime-check/src/_geoslib.pyx 2008-10-23 03:38:50.000000000 +0200 -@@ -119,8 +119,8 @@ - cdef geos_version(): - return PyString_FromString(GEOSversion()) - __geos_version__ = geos_version() # module variable. --if __geos_version__ != "2.2.3-CAPI-1.1.1": -- raise ValueError('version 2.2.3 of the geos library is required') -+if __geos_version__ != "3.0.1-CAPI-1.4.2": -+ raise ValueError('version 3.0.1 of the geos library is required') - # intialize GEOS (parameters are notice and error function callbacks). - initGEOS(notice_h, error_h) - diff --git a/python-basemap-0.99-setup.cfg.patch b/python-basemap-0.99-setup.cfg.patch deleted file mode 100644 index a497fcf..0000000 --- a/python-basemap-0.99-setup.cfg.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- setup.cfg 2008-05-31 06:55:06.000000000 -0800 -+++ setup.cfg.new 2008-07-02 14:20:55.000000000 -0800 -@@ -6,5 +6,5 @@ - # False: do not install - # auto: install only if the package is unavailable. This - # is the default behavior --pydap = auto --httplib2 = auto -+pydap = False -+httplib2 = False diff --git a/python-basemap-0.99-setup.patch b/python-basemap-0.99-setup.patch deleted file mode 100644 index dc14d97..0000000 --- a/python-basemap-0.99-setup.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- setup.py 2008-07-11 16:18:34.000000000 -0800 -+++ setup.py 2008-12-11 23:40:17.000000000 -0900 -@@ -45,11 +45,11 @@ - - if GEOS_dir is None: - # if GEOS_dir not set, check a few standard locations. -- GEOS_dirs = ['/usr/local','/sw','/opt','/opt/local',os.path.expanduser('~')] -+ GEOS_dirs = ['/usr','/usr/local','/sw','/opt','/opt/local',os.path.expanduser('~')] - for direc in GEOS_dirs: - geos_version = checkversion(direc) - print 'checking for GEOS lib in %s ....' % direc -- if geos_version != '"2.2.3"': -+ if geos_version is not None: - continue - else: - print 'GEOS lib found in %s' % direc diff --git a/python-basemap-1.0.6-datadir.patch b/python-basemap-1.0.6-datadir.patch deleted file mode 100644 index fa9e4ae..0000000 --- a/python-basemap-1.0.6-datadir.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- basemap-1.0.6/lib/mpl_toolkits/basemap/__init__.py~ 2013-01-12 10:55:30.000000000 -0600 -+++ basemap-1.0.6/lib/mpl_toolkits/basemap/__init__.py 2013-02-04 11:06:33.414101599 -0600 -@@ -45,7 +45,7 @@ - if not os.path.isdir(basemap_datadir): - raise RuntimeError('Path in environment BASEMAPDATA not a directory') - else: -- basemap_datadir = os.sep.join([os.path.dirname(__file__), 'data']) -+ basemap_datadir = '/usr/share/basemap' - - __version__ = '1.0.6' - ---- basemap-1.0.6/lib/mpl_toolkits/basemap/pyproj.py~ 2013-01-12 10:55:37.000000000 -0600 -+++ basemap-1.0.6/lib/mpl_toolkits/basemap/pyproj.py 2013-02-04 11:12:04.758094206 -0600 -@@ -235,7 +235,7 @@ - "sphere": {'a':6370997.0,'b':6370997.0,'description':"Normal Sphere"}, - } - --pyproj_datadir = os.sep.join([os.path.dirname(__file__), 'data']) -+pyproj_datadir = '/usr/share/basemap' - if not os.path.isdir(pyproj_datadir): - msg="proj data directory not found. Expecting it at: %s"%pyproj_datadir - raise IOError(msg) diff --git a/python-basemap-1.0.7-datadir.patch b/python-basemap-1.0.7-datadir.patch deleted file mode 100644 index b389f6e..0000000 --- a/python-basemap-1.0.7-datadir.patch +++ /dev/null @@ -1,25 +0,0 @@ -From aa43178c0c5cc3353a5dfad8fa4a80c8b5cfbeba Mon Sep 17 00:00:00 2001 -From: Pierre-Yves Chibon -Date: Wed, 14 Jan 2015 16:34:54 +0100 -Subject: [PATCH] Fix the pyproj_datadir to point to the right location - ---- - lib/mpl_toolkits/basemap/pyproj.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/mpl_toolkits/basemap/pyproj.py b/lib/mpl_toolkits/basemap/pyproj.py -index 097f099..57aa69a 100644 ---- a/lib/mpl_toolkits/basemap/pyproj.py -+++ b/lib/mpl_toolkits/basemap/pyproj.py -@@ -235,7 +235,7 @@ pj_ellps={ - "sphere": {'a':6370997.0,'b':6370997.0,'description':"Normal Sphere"}, - } - --pyproj_datadir = os.sep.join([os.path.dirname(__file__), 'data']) -+pyproj_datadir = "/usr/share/basemap/" - if not os.path.isdir(pyproj_datadir): - msg="proj data directory not found. Expecting it at: %s"%pyproj_datadir - raise IOError(msg) --- -2.1.0 - diff --git a/python-basemap-1.0.7-numpy-hstack.patch b/python-basemap-1.0.7-numpy-hstack.patch deleted file mode 100644 index 0f31b1d..0000000 --- a/python-basemap-1.0.7-numpy-hstack.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/lib/mpl_toolkits/basemap/__init__.py -+++ b/lib/mpl_toolkits/basemap/__init__.py -@@ -3960,10 +3960,14 @@ def drawlsmask(self,land_color="0.8",ocean_color="w",lsmask=None, - if cylproj: - # stack grids side-by-side (in longitiudinal direction), so - # any range of longitudes may be plotted on a world map. -+ # in versions of NumPy later than 1.10.0, concatenate will -+ # not stack these arrays as expected. If axis 1 is outside -+ # the dimensions of the array, concatenate will now raise -+ # an IndexError. Using hstack instead. - lsmask_lons = \ -- np.concatenate((lsmask_lons,lsmask_lons[1:]+360),1) -+ np.hstack((lsmask_lons,lsmask_lons[1:] + 360)) - lsmask = \ -- np.concatenate((lsmask,lsmask[:,1:]),1) -+ np.hstack((lsmask,lsmask[:,1:])) - else: - if lakes: lsmask = np.where(lsmask==2,np.array(0,np.uint8),lsmask) - diff --git a/python-basemap.spec b/python-basemap.spec index ddf742c..1ea5c43 100644 --- a/python-basemap.spec +++ b/python-basemap.spec @@ -1,14 +1,12 @@ %global debug_package %{nil} Name: python-basemap -Version: 1.2.0 -Release: 2%{?dist} +Version: 1.2.1 +Release: 1%{?dist} Summary: Plots data on map projections (with continental and political boundaries) License: LGPLv2+ URL: https://matplotlib.org/basemap/ Source0: https://github.com/matplotlib/basemap/archive/v%{version}rel/basemap-%{version}.tar.gz -Patch1: 0001-Fix-the-location-of-basemap_datadir.patch -Patch2: 0002-Fix-version-number.patch BuildRequires: gcc @@ -36,7 +34,8 @@ BuildRequires: python3-httplib2 BuildRequires: python3-matplotlib >= 0.98 BuildRequires: python3-pyproj Requires: python3-matplotlib >= 0.98 -Requires: python-basemap-data +Provides: python3-basemap-data = %{version}-%{release} +Obsoletes: python3-basemap-data < %{version}-%{release} %description -n python3-basemap Basemap is a matplotlib toolkit that allows you to plot data on map @@ -46,8 +45,6 @@ projections (with continental and political boundaries). %autosetup -n basemap-%{version}rel -p1 # Remove the bundled libraries rm -rf goes-3.3.3/ -# Remove the data files -rm -rf lib/mpl_toolkits/basemap/data/ %build # regenerate Cython generated files @@ -67,13 +64,24 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %doc examples/* %files -n python3-basemap +%license LICENSE_data LICENSE_epsg %doc Changelog README.md %{python3_sitearch}/mpl_toolkits/basemap %{python3_sitearch}/*.egg-info %{python3_sitearch}/basemap-%{version}-py%{python3_version}-nspkg.pth %{python3_sitearch}/_geoslib.cpython-3*.so + %changelog +* Wed Jan 22 2020 Gwyn Ciesla - 1.2.1-1 +- 1.2.1, move -data to this SRPM. + +* Thu Oct 03 2019 Miro Hrončok - 1.2.0-4 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Mon Aug 19 2019 Miro Hrončok - 1.2.0-3 +- Rebuilt for Python 3.8 + * Fri Jul 26 2019 Fedora Release Engineering - 1.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 87dc860..5be416d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (basemap-1.2.0.tar.gz) = 27a6e95ade3db7909c82d7f5779befd0ee381e138a199173d9c11f4bd2b3a0be17ea6ab4ec0a9bb743e14673a02d1bdf48224daf30ddc60e31f0a3ac3c09985a +SHA512 (basemap-1.2.1.tar.gz) = 84c47dacda4f7d5c4dd15903ea76116d6b523858918fca63d77762d2960aaf0970509e764b39ebd0ae4880ca24508fef9d574d54cb244d103239dfa370e963ce