$ git diff --patch-with-stat --summary 22d6e44327c812af1ff30b2ac7d9bc84e7b64333..6455e2039cd04ac99c870d32a55753ca0e58f9a9
.abf.yml | 2 +-
check-update.sh | 5 ----
python-networkx.spec | 66 ++++++++++++++++++++++++----------------------------
3 files changed, 31 insertions(+), 42 deletions(-)
delete mode 100755 check-update.sh
diff --git a/.abf.yml b/.abf.yml
index 4ad4f24..40e7432 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
sources:
- networkx-2.8.7.tar.gz: ca2bfcee5662a59e44a8398feacbeee4ac3f86d6
+ networkx-3.1.tar.gz: d4b1d6117b7c54db61f6cbec8f0ccfb0f7d47293
diff --git a/check-update.sh b/check-update.sh
deleted file mode 100755
index fc51991..0000000
--- a/check-update.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-py_module=networkx
-curl https://pypi.org/project/${py_module}/ 2>/dev/null |grep -A1 "package-header__name" |sed -ne "s,.*${py_module} ,,p"
-
-
diff --git a/python-networkx.spec b/python-networkx.spec
index ce58486..8cbd3e0 100644
--- a/python-networkx.spec
+++ b/python-networkx.spec
@@ -1,51 +1,45 @@
-%global module networkx
-%global fname %(n=%{module}; echo ${n:0:1})
+%{?python_enable_dependency_generator}
-Name: python-%{module}
-Version: 2.8.7
+Name: python-networkx
+Version: 3.1
Release: 1
Summary: Creates and Manipulates Graphs and Networks
License: BSD
-URL: http://networkx.github.io/
-#Source0: https://github.com/networkx/networkx/archive/%{module}-%{version}.tar.gz
-Source0: https://pypi.io/packages/source/%{fname}/%{module}/%{module}-%{version}.tar.gz
+URL: https://networkx.org
+#Source0: https://github.com/networkx/networkx/archive/networkx-%{version}.tar.gz
+Source0: https://pypi.io/packages/source/n/networkx/networkx-%{version}.tar.gz
BuildArch: noarch
-BuildRequires: python3-devel
-BuildRequires: python3dist(decorator)
-BuildRequires: python3dist(gdal)
-BuildRequires: python3dist(lxml)
-BuildRequires: python3dist(matplotlib)
-BuildRequires: python3dist(nose)
-BuildRequires: python3dist(numpy)
-BuildRequires: python3dist(numpydoc)
-BuildRequires: python3dist(pillow)
-BuildRequires: python3dist(pyyaml)
-BuildRequires: python3dist(setuptools)
+BuildRequires: pkgconfig(python)
+BuildRequires: python%{py_ver}dist(decorator)
+BuildRequires: python%{py_ver}dist(gdal)
+BuildRequires: python%{py_ver}dist(lxml)
+BuildRequires: python%{py_ver}dist(matplotlib)
+BuildRequires: python%{py_ver}dist(nose)
+BuildRequires: python%{py_ver}dist(numpy)
+BuildRequires: python%{py_ver}dist(numpydoc)
+BuildRequires: python%{py_ver}dist(pillow)
+BuildRequires: python%{py_ver}dist(pyyaml)
+BuildRequires: python%{py_ver}dist(setuptools)
BuildRequires: xdg-utils
-
-%description
-NetworkX is a Python package for the creation, manipulation, and
-study of the structure, dynamics, and functions of complex networks.
-
-%package -n python3-%{module}
-Summary: Creates and Manipulates Graphs and Networks
-Recommends: python3dist(gdal)
-Recommends: python3dist(lxml)
-Recommends: python3dist(matplotlib)
-Recommends: python3dist(numpy)
-Recommends: python3dist(pillow)
-Recommends: python3dist(pyparsing)
-Recommends: python3dist(pyyaml)
+Recommends: python%{py_ver}dist(gdal)
+Recommends: python%{py_ver}dist(lxml)
+Recommends: python%{py_ver}dist(matplotlib)
+Recommends: python%{py_ver}dist(numpy)
+Recommends: python%{py_ver}dist(pillow)
+Recommends: python%{py_ver}dist(pyparsing)
+Recommends: python%{py_ver}dist(pyyaml)
Recommends: xdg-utils
-Provides: python-%{module} = %{EVRD}
-%description -n python3-%{module}
+#Provides: python-networkx = %{EVRD}
+%rename python3-networkx
+
+%description
NetworkX is a Python 3 package for the creation, manipulation, and
study of the structure, dynamics, and functions of complex networks.
-%files -n python3-networkx
+%files
%doc README.rst installed-docs/*
%license LICENSE.txt
%{python3_sitelib}/networkx*
@@ -53,7 +47,7 @@ study of the structure, dynamics, and functions of complex networks.
#---------------------------------------------------------------------------
%prep
-%autosetup -p1 -n %{module}-%{version}
+%autosetup -p1 -n networkx-%{version}
# Do not use env
for f in $(grep -FRl %{_bindir}/env .); do