diff --git a/docdir.patch b/docdir.patch index 586f1a1..f97dfab 100644 --- a/docdir.patch +++ b/docdir.patch @@ -2,12 +2,12 @@ Index: setup.py =================================================================== --- setup.py.orig +++ setup.py -@@ -135,7 +135,7 @@ else: - execfile(os.path.join('pygraphviz','release.py')) +@@ -109,7 +109,7 @@ else: + sys.path.pop(0) packages = ["pygraphviz","pygraphviz.tests"] --docdirbase = 'share/doc/pygraphviz-%s' % version -+docdirbase = 'share/doc/packages/pygraphviz-%s' % version +-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")), diff --git a/pygraphviz-0.99.1.tar.bz2 b/pygraphviz-0.99.1.tar.bz2 deleted file mode 100644 index 48897c6..0000000 --- a/pygraphviz-0.99.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:168c5fa9ed101002b9c1308dfe584817d0c1ea936f69dcf9b79f01d994ab0ed1 -size 80089 diff --git a/pygraphviz-1.1.tar.gz b/pygraphviz-1.1.tar.gz new file mode 100644 index 0000000..ef980d2 --- /dev/null +++ b/pygraphviz-1.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2179434df2228bc1b452039dae841700c1733e25011af075383fbded2984db96 +size 90750 diff --git a/python-pygraphviz.changes b/python-pygraphviz.changes index c3cf54e..b5961b6 100644 --- a/python-pygraphviz.changes +++ b/python-pygraphviz.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Wed May 23 11:06:26 UTC 2012 - toddrme2178@gmail.com + +- Clean up spec file +- Update to version 1.1 + * Added unicode support for handling non-ASCII characters + * Better handling of user data on initialization of AGraph() object to guess input type (AGraph object, file, dict-of-dicts, file) + * Add sfdp to layout options +- Update to version 1..0.0 + * Added to_string() and from_string methods + * Interface to graphviz “acyclic” and “tred” + * Better handling of user data on initialization of AGraph() object to guess input type (AGraph object, file, dict-of-dicts, file) + * Add handling of default attributes for subgraphs + * Improved error handling when using non-string data + * Fix bug in default attribute handling + * Make sure file handles are closed correctly + ------------------------------------------------------------------- Sat Mar 26 03:45:26 UTC 2011 - alexandre@exatati.com.br diff --git a/python-pygraphviz.spec b/python-pygraphviz.spec index 6113c15..cc857fb 100644 --- a/python-pygraphviz.spec +++ b/python-pygraphviz.spec @@ -1,7 +1,7 @@ # # spec file for package python-pygraphviz # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,27 +15,24 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - -%define mod_name pygraphviz - -Name: python-%{mod_name} -Version: 0.99.1 +%define modname pygraphviz +Name: python-%{modname} +Version: 1.1 Release: 0 Url: http://networkx.lanl.gov/pygraphviz Summary: Python interface to Graphviz License: BSD Group: Development/Languages/Python -Source: %{mod_name}-%{version}.tar.bz2 +Source: http://networkx.lanl.gov/download/%{modname}/%{modname}-%{version}.tar.gz # PATCH-FIX-UPSTREAM docdir.patch Patch: docdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: graphviz-devel BuildRequires: pkg-config BuildRequires: python-devel -%if 0%{?suse_version} +%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 %endif @@ -44,7 +41,7 @@ A Python wrapper for the Graphviz Agraph data structure. PyGraphviz can be used to create and draw networks and graphs with Graphviz. %prep -%setup -q -n %{mod_name}-%{version} +%setup -q -n %{modname}-%{version} %patch %build @@ -53,6 +50,7 @@ python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} +chmod +x %{buildroot}%{python_sitearch}/%{modname}/tests/test.py %clean rm -rf %{buildroot} @@ -60,8 +58,8 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc doc -%{_docdir}/%{mod_name}-%{version} -%python_sitearch/%{mod_name}* -%python_sitearch/*.egg-info +%{_docdir}/%{modname}-%{version} +%{python_sitearch}/%{modname}/ +%{python_sitearch}/%{modname}-%{version}-py%{py_ver}.egg-info %changelog