Hello community, here is the log from the commit of package python-networkx for openSUSE:Factory checked in at 2015-08-01 11:36:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-networkx (Old) and /work/SRC/openSUSE:Factory/.python-networkx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-networkx" Changes: -------- --- /work/SRC/openSUSE:Factory/python-networkx/python-networkx.changes 2015-05-02 21:37:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-networkx.new/python-networkx.changes 2015-08-01 11:36:58.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Jul 25 12:36:58 UTC 2015 - [email protected] + +- fix rhel build by conditionalizing "Recommends:" tags +- do not hardcode /usr/share/doc/packages but use %_docdir + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-networkx.spec ++++++ --- /var/tmp/diff_new_pack.GbkkRh/_old 2015-08-01 11:36:59.000000000 +0200 +++ /var/tmp/diff_new_pack.GbkkRh/_new 2015-08-01 11:36:59.000000000 +0200 @@ -38,6 +38,8 @@ 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-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 @@ %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
