Fix gdal and pydot dependencies.

This commit is contained in:
Jerry James 2016-04-03 16:06:04 -06:00
parent 0a95056739
commit e73c47303f

View File

@ -5,18 +5,11 @@
%global with_gdal 1 %global with_gdal 1
%endif %endif
# see https://fedoraproject.org/wiki/Packaging:Python#Macros
%if 0%{?rhel} && 0%{?rhel} <= 6
%{!?__python2: %global __python2 /usr/bin/python2}
%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%endif
%global srcname networkx %global srcname networkx
Name: python-%{srcname} Name: python-%{srcname}
Version: 1.11 Version: 1.11
Release: 1%{?dist} Release: 2%{?dist}
Summary: Creates and Manipulates Graphs and Networks Summary: Creates and Manipulates Graphs and Networks
License: BSD License: BSD
URL: http://networkx.github.io/ URL: http://networkx.github.io/
@ -90,10 +83,11 @@ This package provides GDAL I/O support.
Summary: visual representations for graphs and networks Summary: visual representations for graphs and networks
Requires: python2-%{srcname}-core = %{version}-%{release} Requires: python2-%{srcname}-core = %{version}-%{release}
BuildRequires: graphviz-python BuildRequires: graphviz-python
BuildRequires: pydot BuildRequires: python2-matplotlib
BuildRequires: python2-pydot
Requires: graphviz-python Requires: graphviz-python
Requires: pydot Requires: python2-matplotlib
Requires: python-matplotlib Requires: python2-pydot
%{?python_provide:%python_provide python2-%{srcname}-drawing} %{?python_provide:%python_provide python2-%{srcname}-drawing}
@ -142,8 +136,8 @@ study of the structure, dynamics, and functions of complex networks.
%package -n python3-%{srcname}-geo %package -n python3-%{srcname}-geo
Summary: GDAL I/O Summary: GDAL I/O
Requires: python3-%{srcname}-core = %{version}-%{release} Requires: python3-%{srcname}-core = %{version}-%{release}
BuildRequires: gdal-python BuildRequires: gdal-python3
Requires: gdal-python Requires: gdal-python3
%{?python_provide:%python_provide python3-%{srcname}-geo} %{?python_provide:%python_provide python3-%{srcname}-geo}
@ -157,11 +151,11 @@ This package provides GDAL I/O support.
Summary: visual representations for graphs and networks Summary: visual representations for graphs and networks
Requires: python3-%{srcname}-core = %{version}-%{release} Requires: python3-%{srcname}-core = %{version}-%{release}
BuildRequires: graphviz-python BuildRequires: graphviz-python
BuildRequires: pydot
BuildRequires: python3-matplotlib BuildRequires: python3-matplotlib
BuildRequires: python3-pydot
Requires: graphviz-python Requires: graphviz-python
Requires: pydot
Requires: python3-matplotlib Requires: python3-matplotlib
Requires: python3-pydot
%{?python_provide:%python_provide python3-%{srcname}-drawing} %{?python_provide:%python_provide python3-%{srcname}-drawing}
@ -192,7 +186,7 @@ BuildRequires: python-numpydoc
BuildRequires: pydot BuildRequires: pydot
BuildRequires: tex(latex) BuildRequires: tex(latex)
BuildRequires: tex-preview BuildRequires: tex-preview
BuildRequires: python-matplotlib BuildRequires: python2-matplotlib
Provides: bundled(jquery) Provides: bundled(jquery)
@ -320,6 +314,9 @@ PYTHONPATH=$PWD/site-packages python -c "import networkx; networkx.test()"
%changelog %changelog
* Sat Apr 2 2016 Jerry James <loganjerry@gmail.com> - 1.11-2
- Fix gdal and pydot dependencies
* Sat Mar 5 2016 Jerry James <loganjerry@gmail.com> - 1.11-1 * Sat Mar 5 2016 Jerry James <loganjerry@gmail.com> - 1.11-1
- New upstream version - New upstream version
- Drop upstreamed -numpy patch - Drop upstreamed -numpy patch