From fa1cf69de6148e05dfe16f50dedb380930cf4d1b66372e485b434a1747160e72 Mon Sep 17 00:00:00 2001
From: Todd R <toddrme2178@gmail.com>
Date: Wed, 15 Jun 2016 17:28:47 +0000
Subject: [PATCH] Accepting request 402455 from
 home:TheBlackCat:branches:devel:languages:python

Update to 1.3.1

OBS-URL: https://build.opensuse.org/request/show/402455
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pygraphviz?expand=0&rev=8
---
 docdir.patch              | 14 +++++++-------
 pygraphviz-1.2.tar.gz     |  3 ---
 pygraphviz-1.3.1.tar.gz   |  3 +++
 python-pygraphviz.changes | 10 ++++++++++
 python-pygraphviz.spec    | 25 +++++++++++++------------
 5 files changed, 33 insertions(+), 22 deletions(-)
 delete mode 100644 pygraphviz-1.2.tar.gz
 create mode 100644 pygraphviz-1.3.1.tar.gz

diff --git a/docdir.patch b/docdir.patch
index f97dfab..4353aad 100644
--- a/docdir.patch
+++ b/docdir.patch
@@ -2,12 +2,12 @@ Index: setup.py
 ===================================================================
 --- setup.py.orig
 +++ setup.py
-@@ -109,7 +109,7 @@ else:
+@@ -36,7 +36,7 @@
  sys.path.pop(0)
  
- packages = ["pygraphviz","pygraphviz.tests"]
--docdirbase  = 'share/doc/pygraphviz-%s' % release.version
-+docdirbase  = 'share/doc/packages/pygraphviz-%s' % release.version
- data = [(docdirbase, glob("*.txt")),
-         (os.path.join(docdirbase, 'examples'),glob("examples/*.py")),
-         (os.path.join(docdirbase, 'examples'),glob("examples/*.dat")),
+ packages = ["pygraphviz", "pygraphviz.tests"]
+-docdirbase = 'share/doc/pygraphviz-%s' % release.version
++docdirbase = 'share/doc/packages/pygraphviz-%s' % release.version
+ data = [
+     (docdirbase, glob("*.txt")),
+     (os.path.join(docdirbase, 'examples'), glob("examples/*.py")),
diff --git a/pygraphviz-1.2.tar.gz b/pygraphviz-1.2.tar.gz
deleted file mode 100644
index 7cccab2..0000000
--- a/pygraphviz-1.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2e8a82a07dcf006b9558d22c5a6357c012193d4cc681776845e515fffeccc6b3
-size 90913
diff --git a/pygraphviz-1.3.1.tar.gz b/pygraphviz-1.3.1.tar.gz
new file mode 100644
index 0000000..b2a9095
--- /dev/null
+++ b/pygraphviz-1.3.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7c294cbc9d88946be671cc0d8602aac176d8c56695c0a7d871eadea75a958408
+size 103336
diff --git a/python-pygraphviz.changes b/python-pygraphviz.changes
index 958f840..5cf8c5b 100644
--- a/python-pygraphviz.changes
+++ b/python-pygraphviz.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Jun 15 17:11:49 UTC 2016 - toddrme2178@gmail.com
+
+- Update to 1.3.1
+  - Update manifest to include missing files
+- Update to 1.3
+  - Python 3 support
+  - Encoding bugfixes
+- Rebase docdir.patch
+
 -------------------------------------------------------------------
 Fri Mar 28 14:42:59 UTC 2014 - speilicke@suse.com
 
diff --git a/python-pygraphviz.spec b/python-pygraphviz.spec
index efd792f..66bc6ee 100644
--- a/python-pygraphviz.spec
+++ b/python-pygraphviz.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-pygraphviz
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           python-pygraphviz
-Version:        1.2
+Version:        1.3.1
 Release:        0
 Url:            http://networkx.lanl.gov/pygraphviz
 Summary:        Python interface to Graphviz
@@ -27,14 +27,14 @@ Source:         https://pypi.python.org/packages/source/p/pygraphviz/pygraphviz-
 # PATCH-FIX-UPSTREAM docdir.patch
 Patch:          docdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  graphviz-devel
+BuildRequires:  graphviz-devel >= 2.16
 BuildRequires:  pkg-config
+BuildRequires:  python-nose
 BuildRequires:  python-devel
-Requires:       graphviz-python
+BuildRequires:  python-setuptools
+Requires:       graphviz >= 2.16
 %if 0%{?suse_version} <= 1110
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-%else
-%py_requires
+%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %endif
 
 %description
@@ -46,19 +46,20 @@ PyGraphviz can be used to create and draw networks and graphs with Graphviz.
 %patch
 
 %build
-export CFLAGS="%{optflags}"
-python setup.py build
+CFLAGS="%{optflags}" python setup.py build
 
 %install
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
 chmod +x %{buildroot}%{python_sitearch}/pygraphviz/tests/test.py
 
-%clean
-rm -rf %{buildroot}
+%check
+pushd examples
+PYTHONPATH=%{buildroot}%{python_sitearch} python -c "import pygraphviz;pygraphviz.test()"
+popd
 
 %files
 %defattr(-,root,root,-)
-%doc doc
+%doc LICENSE README.rst
 %{_docdir}/pygraphviz-%{version}
 %{python_sitearch}/pygraphviz/
 %{python_sitearch}/pygraphviz-%{version}-py*.egg-info