From 36bf48451aef2458b08473c42c1bdbec790c5d764598c061dc61a1151e8a90d9 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 1 Aug 2015 09:36:57 +0000 Subject: [PATCH] Accepting request 318748 from devel:languages:python 1 OBS-URL: https://build.opensuse.org/request/show/318748 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-networkx?expand=0&rev=7 --- python-networkx.changes | 6 ++++++ python-networkx.spec | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/python-networkx.changes b/python-networkx.changes index f0b068a..61c7f65 100644 --- a/python-networkx.changes +++ b/python-networkx.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Jul 25 12:36:58 UTC 2015 - seife+obs@b1-systems.com + +- fix rhel build by conditionalizing "Recommends:" tags +- do not hardcode /usr/share/doc/packages but use %_docdir + ------------------------------------------------------------------- Wed Apr 29 14:25:15 UTC 2015 - tbechtold@suse.com diff --git a/python-networkx.spec b/python-networkx.spec index c92d917..35377b2 100644 --- a/python-networkx.spec +++ b/python-networkx.spec @@ -38,6 +38,8 @@ BuildRequires: python-matplotlib BuildRequires: python-scipy %endif Requires: python-decorator >= 3.4.0 +# Recommends: is not understood by redhat's RPM version +%if 0%{?suse_version} Recommends: python-pydot Recommends: python-pygraphviz Recommends: python-PyYAML @@ -47,6 +49,7 @@ Recommends: python-numpy Recommends: python-matplotlib Recommends: python-scipy %endif +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} @@ -69,7 +72,9 @@ Features: %prep %setup -q -n networkx-%{version} -sed -i -e "s@share/doc/networkx-.*@share/doc/packages/%{name}'@g" setup.py +sed -i -e "s@share/doc/networkx-.*@%{_docdir}/%{name}'@g" setup.py +# _docdir contains absolute path, strip /usr/ prefix again +sed -i -e "/^docdirbase/s@/usr/@@" setup.py find networkx/ examples/ -name "*.py" -exec sed -i -e '/^#!\s\?\/usr\/bin\/\(env\s\)\?python$/d' {} ';' sed -i 's/\r//' examples/algorithms/hartford_drug.edgelist