diff --git a/.gitignore b/.gitignore index e05dfa4..a01f085 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /rosdep-0.15.2.tar.gz /rosdep-0.16.1.tar.gz /rosdep-0.17.1.tar.gz +/rosdep-0.19.0.tar.gz diff --git a/python-rosdep.spec b/python-rosdep.spec index d03cb54..43f86bb 100644 --- a/python-rosdep.spec +++ b/python-rosdep.spec @@ -4,8 +4,8 @@ %global srcname rosdep Name: python-%{srcname} -Version: 0.17.1 -Release: 2%{?dist} +Version: 0.19.0 +Release: 1%{?dist} Summary: ROS System Dependency Installer License: BSD @@ -50,13 +50,13 @@ Requires: python2-catkin_pkg >= 0.4.0 Requires: python2-pyyaml >= 3.1 Requires: python2-rosdistro >= 0.7.5 Requires: python2-rospkg >= 1.1.10 -%endif # __pythondist_requires +%endif -%if 0%{?fedora} || 0%{?rhel} >= 8 +%if !0%{?rhel} || 0%{?rhel} >= 8 Recommends: python2-pip Recommends: python2-rpm Suggests: %{name}-doc = %{version}-%{release} -%endif # fedora || rhel >= 8 +%endif %description -n python2-%{srcname} rosdep is a command-line tool for installing system dependencies. For @@ -65,7 +65,7 @@ you are building from source. For developers, rosdep simplifies the problem of installing system dependencies on different platforms. Instead of having to figure out which Debian package on Ubuntu Oneiric contains Boost, you can just specify a dependency on 'boost'. -%endif # with_python2 +%endif %if 0%{?with_python3} @@ -86,13 +86,13 @@ Requires: python%{python3_pkgversion}-catkin_pkg >= 0.4.0 Requires: python%{python3_pkgversion}-PyYAML >= 3.1 Requires: python%{python3_pkgversion}-rosdistro >= 0.7.5 Requires: python%{python3_pkgversion}-rospkg >= 1.1.10 -%endif # __pythondist_requires +%endif -%if 0%{?fedora} || 0%{?rhel} >= 8 +%if !0%{?rhel} || 0%{?rhel} >= 8 Recommends: python%{python3_pkgversion}-pip Recommends: python%{python3_pkgversion}-rpm Suggests: %{name}-doc = %{version}-%{release} -%endif # fedora || rhel >= 8 +%endif %description -n python%{python3_pkgversion}-%{srcname} rosdep is a command-line tool for installing system dependencies. For @@ -101,21 +101,24 @@ you are building from source. For developers, rosdep simplifies the problem of installing system dependencies on different platforms. Instead of having to figure out which Debian package on Ubuntu Oneiric contains Boost, you can just specify a dependency on 'boost'. -%endif # with_python3 +%endif %prep %autosetup -p1 -n %{srcname}-%{version} +# ros-infrastructure/rosdep#755 +sed -i '1{s|^#!/usr/bin/\(env \)\?python$||}' src/rosdep2/install.py + %build %if 0%{?with_python2} %py2_build -%endif # with_python2 +%endif %if 0%{?with_python3} %py3_build -%endif # with_python3 +%endif PYTHONPATH=$PWD/src %make_build -C doc man html SPHINXBUILD=sphinx-build-%{python3_version} rm doc/_build/html/.buildinfo @@ -132,10 +135,10 @@ for f in `ls %{buildroot}%{_bindir}/scripts`; do %if !(0%{?with_python3}) ln -s $f-%{python2_version} %{buildroot}%{_bindir}/$f echo "%{_bindir}/$f" >> py2_bins -%endif # with_python3 +%endif echo -e "%{_bindir}/$f-2\n%{_bindir}/$f-%{python2_version}" >> py2_bins done -%endif # with_python2 +%endif %if 0%{?with_python3} %py3_install -- --install-scripts %{_bindir}/scripts @@ -147,7 +150,7 @@ for f in `ls %{buildroot}%{_bindir}/scripts`; do ln -s $f-%{python3_version} %{buildroot}%{_bindir}/$f echo -e "%{_bindir}/$f\n%{_bindir}/$f-3\n%{_bindir}/$f-%{python3_version}" >> py3_bins done -%endif # with_python3 +%endif rm -rf %{buildroot}%{_bindir}/scripts install -D -p -m 0644 doc/man/rosdep.1 %{buildroot}%{_mandir}/man1/rosdep.1 @@ -158,11 +161,11 @@ install -D -p -m 0644 /dev/null %{buildroot}%{_sysconfdir}/ros/rosdep/sources.li %check %if 0%{?with_python2} PYTHONPATH=%{buildroot}%{python2_sitelib} %{__python2} -m nose test.test_rosdep_redhat -%endif # with_python2 +%endif %if 0%{?with_python3} PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m nose test.test_rosdep_redhat -%endif # with_python3 +%endif %files doc @@ -179,7 +182,7 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m nose test.test_rosdep_ %dir %{_sysconfdir}/ros/rosdep/ %dir %{_sysconfdir}/ros/rosdep/sources.list.d/ %ghost %{_sysconfdir}/ros/rosdep/sources.list.d/20-default.list -%endif # with_python2 +%endif %if 0%{?with_python3} %files -n python%{python3_pkgversion}-%{srcname} -f py3_bins @@ -191,10 +194,13 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m nose test.test_rosdep_ %dir %{_sysconfdir}/ros/rosdep/ %dir %{_sysconfdir}/ros/rosdep/sources.list.d/ %ghost %{_sysconfdir}/ros/rosdep/sources.list.d/20-default.list -%endif # with_python3 +%endif %changelog +* Wed Apr 15 2020 Scott K Logan - 0.19.0-1 +- Update to 0.19.0 (rhbz#1774738) + * Thu Jan 30 2020 Fedora Release Engineering - 0.17.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 86f53f4..55f4843 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rosdep-0.17.1.tar.gz) = 58ae34e07ada7f18dd00d6cd2dbe725ab6e8dfa4e70b7e30fc3b1a8c66cbe2020d7c300e17d4d53785f3e77b730a71a8d799bd8a1c7c5b38a292b616c6c43254 +SHA512 (rosdep-0.19.0.tar.gz) = 3e1d5829689646d583da2eaaf3b8bbddec3cb4ca3dc3941ee2697f6367510a4dcff11984fa1792a400f49132778d7869f0a8274e42bc8c04f2e326e6a663c494