From 2c4e431cb82e8253dc628f0c524c5e5c025a5673411d11e21111b7122293b119 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Thu, 2 Jun 2011 09:46:46 +0000
Subject: [PATCH] Accepting request 72407 from
 home:saschpe:branches:devel:languages:python

OBS-URL: https://build.opensuse.org/request/show/72407
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pydot?expand=0&rev=2
---
 pydot-1.0.25.tar.gz  |  3 +++
 pydot-1.0.4.tar.gz   |  3 ---
 python-pydot.changes | 15 ++++++++---
 python-pydot.spec    | 64 ++++++++++++++++++++++++++++----------------
 4 files changed, 56 insertions(+), 29 deletions(-)
 create mode 100644 pydot-1.0.25.tar.gz
 delete mode 100644 pydot-1.0.4.tar.gz

diff --git a/pydot-1.0.25.tar.gz b/pydot-1.0.25.tar.gz
new file mode 100644
index 0000000..58054fd
--- /dev/null
+++ b/pydot-1.0.25.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7e2f279a5aea24368dcddb88aa3a1d17a263f049a9af75fc2e7ebd6254aa72bf
+size 19438
diff --git a/pydot-1.0.4.tar.gz b/pydot-1.0.4.tar.gz
deleted file mode 100644
index 40e93df..0000000
--- a/pydot-1.0.4.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:20092ee012649582ba00d585b68796d751c30dfd6c77e30e2dadbae53a80e933
-size 18988
diff --git a/python-pydot.changes b/python-pydot.changes
index 3f1c825..fa2bc3d 100644
--- a/python-pydot.changes
+++ b/python-pydot.changes
@@ -1,11 +1,20 @@
+-------------------------------------------------------------------
+Wed Jun  1 07:34:40 UTC 2011 - saschpe@suse.de
+
+- Update to version 1.0.25
+  * Minor bugfixes
+- Spec file cleanup:
+  * Package examples as 'examples'
+  * Use SUSE version checks for %py_requires and noarch
+
 -------------------------------------------------------------------
 Thu Feb 17 22:24:32 UTC 2011 - jw@novell.com
 
-- update to 1.0.4
-- example-demo.py added.
+- Update to 1.0.4
+- Example-demo.py added.
 
 -------------------------------------------------------------------
 Thu Feb 17 21:35:33 UTC 2011 - jw@novell.com
 
-- taken from home:leo_eraly
+- Taken from home:leo_eraly
 
diff --git a/python-pydot.spec b/python-pydot.spec
index dc5c8f7..55305f8 100644
--- a/python-pydot.spec
+++ b/python-pydot.spec
@@ -1,47 +1,65 @@
-# norootforbuild
+#
+# spec file for package python-pydot
+#
+# Copyright (c) 2011 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
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
 
 Name:           python-pydot
-Version:        1.0.4
-Release:        1
+Version:        1.0.25
+Release:        0
+Url:            http://code.google.com/p/pydot
 Summary:        Create (dot) graphs from python
 License:        MIT
 Group:          Development/Libraries/Python
 Source:         http://pydot.googlecode.com/files/pydot-%{version}.tar.gz
 Source1:	example-demo.py
-Buildarch:      noarch
-BuildRequires:  python-devel
+Source2:	example-rank.py
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Requires:       python-pyparsing graphviz
-%{py_requires}
-
+BuildRequires:  python-devel
+Requires:       python-pyparsing
+Requires:       graphviz
+%if 0%{?suse_version}
+%py_requires
+%if 0%{?suse_version} > 1110
+BuildArch:      noarch
+%endif
+%endif
+%{!?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)")}
 
 %description
 pydot allows to easily create both directed and non directed graphs from Python. 
 Currently all attributes implemented in the Dot language are supported (up to Graphviz 2.16).
 
-
 %prep
 %setup -q -n pydot-%{version}
-cp %{S:1} .
-
+mkdir examples && cp %{SOURCE1} %{SOURCE2} examples
 
 %build
-%{__python} setup.py build
+export CFLAGS="%{optflags}"
+python setup.py build
 
 %install
-%{__python} setup.py install --prefix=%{_prefix} --root=%{buildroot} --record-rpm=INSTALLED_FILES
-#rm -rf %{buildroot}/usr/ChangeLog
-rm -rf %{buildroot}/usr/LICENSE
-rm -rf %{buildroot}/usr/README
-%{__perl} -n -i -e 'print unless m,(README|LICENSE|%dir /usr/.)$,' INSTALLED_FILES
+python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+rm -rf %{buildroot}/usr/{LICENSE,README} # Wronly installed by setup script
 
 %clean  
-rm -rf "$RPM_BUILD_ROOT"  
+rm -rf %{buildroot}
 
-%files -f INSTALLED_FILES
-%defattr(-,root,root)
-%doc README LICENSE example-demo.py
+%files
+%defattr(-,root,root,-)
+%doc README LICENSE examples
+%{python_sitelib}/*
 
 %changelog
-* Thu Dec 31 2009 Leo Eraly <leo@unstable.be> - 1.0.2-1
-- Initial package