From ccde70d4a633003a00c5e7ba61282505c4eb5199 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 18 May 2018 09:52:16 +0200 Subject: [PATCH] Update graphviz dependency There is a plan to package pygraphviz, which is a separate thing from the python-graphviz which is part of graphviz. The python subpackages of graphviz were renemaed back to graphviz-python[23]. Update the Requires to use an unambiguous tag that referes directly to the module name for python2. For python3, the dependency on the python2 module doesn't make sense. Drop it. --- python-networkx.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/python-networkx.spec b/python-networkx.spec index 14f3d72..384d79d 100644 --- a/python-networkx.spec +++ b/python-networkx.spec @@ -9,7 +9,7 @@ Name: python-%{srcname} Version: 1.11 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Creates and Manipulates Graphs and Networks License: BSD URL: http://networkx.github.io/ @@ -85,10 +85,10 @@ This package provides GDAL I/O support. %package -n python2-%{srcname}-drawing Summary: visual representations for graphs and networks Requires: python2-%{srcname}-core = %{version}-%{release} -BuildRequires: python2-graphviz +BuildRequires: python2.7dist(gv) BuildRequires: python2-matplotlib BuildRequires: python2-pydotplus -Requires: python2-graphviz +Requires: python2.7dist(gv) Requires: python2-matplotlib Requires: python2-pydotplus @@ -153,10 +153,8 @@ This package provides GDAL I/O support. %package -n python3-%{srcname}-drawing Summary: visual representations for graphs and networks Requires: python3-%{srcname}-core = %{version}-%{release} -BuildRequires: python2-graphviz BuildRequires: python3-matplotlib BuildRequires: python3-pydotplus -Requires: python2-graphviz Requires: python3-matplotlib Requires: python3-pydotplus @@ -317,6 +315,10 @@ PYTHONPATH=$PWD/site-packages python -c "import networkx; networkx.test()" %changelog +* Fri May 18 2018 Zbigniew Jędrzejewski-Szmek - 1.11-11 +- Update graphviz dependency for python2 +- Drop graphviz dependency for python3 (graphviz doesn't support python3) + * Fri Mar 09 2018 Iryna Shcherbina - 1.11-10 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)