From 0dc6fbe0dab0082d227da565e08270448b2b79ad Mon Sep 17 00:00:00 2001
From: Jerry James <jamesjer@betterlinux.com>
Date: Mon, 29 Jul 2013 16:23:08 -0600
Subject: [PATCH] New upstream version. Add tex-preview BR for documentation.

---
 .gitignore           |  2 +-
 python-networkx.spec | 17 ++++++++++-------
 sources              |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4ff8244..a274c80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 /networkx_reference.pdf
 /networkx_tutorial.pdf
 /networkx-documentation.zip
-/networkx-1.7.tar.gz
+/networkx-1.8.tar.gz
diff --git a/python-networkx.spec b/python-networkx.spec
index fb8fa5e..813a388 100644
--- a/python-networkx.spec
+++ b/python-networkx.spec
@@ -1,6 +1,6 @@
 Name:           python-networkx
-Version:        1.7
-Release:        2%{?dist}
+Version:        1.8
+Release:        1%{?dist}
 Summary:        Creates and Manipulates Graphs and Networks
 Group:          Development/Languages
 License:        BSD
@@ -24,6 +24,7 @@ BuildRequires:  python-sphinx
 BuildRequires:  PyYAML, python3-PyYAML
 BuildRequires:  scipy, python3-scipy
 BuildRequires:  tex(latex)
+BuildRequires:  tex-preview
 
 Requires:       gdal-python
 Requires:       graphviz-python
@@ -73,7 +74,9 @@ find examples -type f -perm /0111 | xargs chmod a-x
 cp -pf %{SOURCE1} %{SOURCE2} %{SOURCE3} doc/source
 
 # Use the system python-decorator instead of the bundled version
-sed -i '/          "networkx\.external.*",/d' setup.py
+sed -e '/          "networkx\.external.*",/d' \
+    -e "/sys\.version >= '3'/,/^$/d" \
+    -i setup.py
 cd networkx
 rm -fr external
 sed "/import networkx\.external/d" __init__.py > init.py
@@ -127,10 +130,6 @@ for f in `grep -FRl /usr/bin/env $RPM_BUILD_ROOT%{python3_sitelib}`; do
   mv -f $f.new $f
 done
 
-# Except unfix the one where the shebang was muffed
-chmod a-x $RPM_BUILD_ROOT%{python2_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??????
@@ -157,6 +156,10 @@ PYTHONPATH=`pwd`/site-packages python -c "import networkx; networkx.test()"
 
 
 %changelog
+* Mon Jul 29 2013 Jerry James <loganjerry@gmail.com> - 1.8-1
+- New upstream version
+- Add tex-preview BR for documentation
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index d24c6d5..0b0da05 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-1a73da9d571a206aa40f6ef69254f7b4  networkx-1.7.tar.gz
+be1be4c5ec20c955b0e593d640662599  networkx-1.8.tar.gz
 5c74458f88c8290616f1b0ce4d1d1db3  networkx_reference.pdf
 91cf17ce3c5ec23dfa7e1a00eaf8c564  networkx_tutorial.pdf
 0b374fb1b50ba62ec37f2f9baf0a4691  networkx-documentation.zip