From 4590993220b143a8e3fe1c873c9d2d7f6180a15f Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Mon, 28 Nov 2011 15:50:28 -0700
Subject: [PATCH] New upstream version. Do not use bundled python-decorator.
 Remove Requires: ipython, needed by one example only. Clean junk files left
 in /tmp.

---
 .gitignore           |  5 ++++-
 python-networkx.spec | 48 ++++++++++++++++++++++++++++++++++----------
 sources              |  5 ++++-
 3 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index bab3cbe..5bdb9e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
-/networkx-1.5.tar.gz
+/networkx-1.6.tar.gz
+/networkx_reference.pdf
+/networkx_tutorial.pdf
+/networkx-documentation.zip
diff --git a/python-networkx.spec b/python-networkx.spec
index d746c95..13b0d18 100644
--- a/python-networkx.spec
+++ b/python-networkx.spec
@@ -1,32 +1,35 @@
 Name:           python-networkx
-Version:        1.5
+Version:        1.6
 Release:        1%{?dist}
 Summary:        Creates and Manipulates Graphs and Networks
 Group:          Development/Languages
 License:        BSD
 URL:            http://networkx.lanl.gov/
 Source0:        http://pypi.python.org/packages/source/n/networkx/networkx-%{version}.tar.gz
+Source1:        http://networkx.lanl.gov/networkx_reference.pdf
+Source2:        http://networkx.lanl.gov/networkx_tutorial.pdf
+Source3:        http://networkx.lanl.gov/networkx-documentation.zip
 BuildArch:      noarch
 
 BuildRequires:  gdal-python
 BuildRequires:  graphviz-python
 BuildRequires:  pydot
-BuildRequires:  pyparsing
-BuildRequires:  python3-pyparsing
+BuildRequires:  pyparsing, python3-pyparsing
 BuildRequires:  python2-devel
 BuildRequires:  python3-devel
+BuildRequires:  python-decorator, python3-decorator
 BuildRequires:  python-matplotlib
 BuildRequires:  python-nose
 BuildRequires:  python-sphinx
-BuildRequires:  PyYAML
-BuildRequires:  python3-PyYAML
-BuildRequires:  scipy
+BuildRequires:  PyYAML, python3-PyYAML
+BuildRequires:  scipy, python3-scipy
 BuildRequires:  tex(latex)
+
 Requires:       gdal-python
 Requires:       graphviz-python
-Requires:       ipython
 Requires:       pydot
 Requires:       pyparsing
+Requires:       python-decorator
 Requires:       PyYAML
 Requires:       scipy
 
@@ -39,8 +42,10 @@ study of the structure, dynamics, and functions of complex networks.
 %package -n python3-networkx
 Summary:        Creates and Manipulates Graphs and Networks
 Group:          Development/Languages
+Requires:       python3-decorator
 Requires:       python3-pyparsing
 Requires:       python3-PyYAML
+Requires:       python3-scipy
 
 
 %description -n python3-networkx
@@ -64,11 +69,22 @@ Documentation for networkx
 # Fix permissions
 find examples -type f -perm /0111 | xargs chmod a-x
 
-# Fix line endings
-sed -e 's/\r//' examples/algorithms/hartford_drug.edgelist > hartford
-touch -r examples/algorithms/hartford_drug.edgelist hartford
-mv -f hartford examples/algorithms/hartford_drug.edgelist
+# Overwrite the 0-length doc files with the real doc files
+cp -pf %{SOURCE1} %{SOURCE2} %{SOURCE3} doc/source
 
+# Use the system python-decorator instead of the bundled version
+sed -i '/          "networkx\.external.*",/d' setup.py
+cd networkx
+rm -fr external
+sed "/import networkx\.external/d" __init__.py > init.py
+touch -r __init__.py init.py
+mv -f init.py __init__.py
+for f in utils/decorators.py utils/misc.py; do
+  sed "s/networkx\.external\.//" $f > fixed.py
+  touch -r $f fixed.py
+  mv -f fixed.py $f
+done
+cd ..
 
 %build
 python setup.py build
@@ -104,6 +120,10 @@ grep -FRl /usr/bin/env $RPM_BUILD_ROOT%{python3_sitelib} | xargs chmod a+x
 chmod a-x $RPM_BUILD_ROOT%{python_sitelib}/networkx/algorithms/link_analysis/hits_alg.py
 chmod a-x $RPM_BUILD_ROOT%{python3_sitelib}/networkx/algorithms/link_analysis/hits_alg.py
 
+
+%clean
+rm -f /tmp/tmp??????
+
  
 %check
 mkdir site-packages
@@ -126,6 +146,12 @@ PYTHONPATH=`pwd`/site-packages python -c "import networkx; networkx.test()"
 
 
 %changelog
+* Mon Nov 28 2011 Jerry James <loganjerry@gmail.com> - 1.6-1
+- New upstream version
+- Do not use bundled python-decorator
+- Remove Requires: ipython, needed by one example only
+- Clean junk files left in /tmp
+
 * Wed Jun 22 2011 Jerry James <loganjerry@gmail.com> - 1.5-1
 - New upstream version
 - Drop defattr
diff --git a/sources b/sources
index 11db694..6c04b07 100644
--- a/sources
+++ b/sources
@@ -1 +1,4 @@
-ecfebcc38c0287e81142a32f2ac22c84  networkx-1.5.tar.gz
+a5e62b841b30118574b57d0eaf1917ca  networkx-1.6.tar.gz
+b1e3d5d4825c22f542cb427653b185c5  networkx_reference.pdf
+39f248167e2c800bd1d4d9004cb637b5  networkx_tutorial.pdf
+c9a42bda38401a8d59cd1bc8c4ea8d41  networkx-documentation.zip