diff --git a/.gitignore b/.gitignore index ad24f25..9532493 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /rospkg-1.1.8.tar.gz /rospkg-1.1.9.tar.gz /rospkg-1.1.10.tar.gz +/rospkg-1.2.4.tar.gz diff --git a/python-rospkg.spec b/python-rospkg.spec index c772074..80160af 100644 --- a/python-rospkg.spec +++ b/python-rospkg.spec @@ -4,7 +4,7 @@ %global srcname rospkg Name: python-%{srcname} -Version: 1.1.10 +Version: 1.2.4 Release: 1%{?dist} Summary: Utilities for ROS package, stack, and distribution information @@ -45,18 +45,18 @@ BuildRequires: python2-setuptools %if %{undefined __pythondist_requires} Requires: python2-catkin_pkg Requires: python2-pyyaml -%endif # __pythondist_requires +%endif %if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: %{name}-doc = %{version}-%{release} -%endif # fedora || rhel >= 8 +%endif %description -n python2-%{srcname} The ROS packaging system simplifies development and distribution of code libraries. It enables you to easily specify dependencies between code libraries, easily interact with those libraries from the command-line, and release your code for others to use. -%endif # with_python2 +%endif %if 0%{?with_python3} @@ -64,6 +64,7 @@ release your code for others to use. Summary: %{summary} BuildRequires: python%{python3_pkgversion}-catkin_pkg BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-distro BuildRequires: python%{python3_pkgversion}-mock BuildRequires: python%{python3_pkgversion}-nose BuildRequires: python%{python3_pkgversion}-PyYAML @@ -72,19 +73,20 @@ BuildRequires: python%{python3_pkgversion}-setuptools %if %{undefined __pythondist_requires} Requires: python%{python3_pkgversion}-catkin_pkg +Requires: python%{python3_pkgversion}-distro Requires: python%{python3_pkgversion}-PyYAML -%endif # __pythondist_requires +%endif %if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: %{name}-doc = %{version}-%{release} -%endif # fedora || rhel >= 8 +%endif %description -n python%{python3_pkgversion}-%{srcname} The ROS packaging system simplifies development and distribution of code libraries. It enables you to easily specify dependencies between code libraries, easily interact with those libraries from the command-line, and release your code for others to use. -%endif # with_python3 +%endif %prep @@ -92,17 +94,17 @@ release your code for others to use. %if !(0%{?with_python2}) find test -type f | xargs sed -i '1{s@^#!/usr/bin/env python@#!%{__python3}@}' -%endif # !with_python2 +%endif %build %if 0%{?with_python2} %py2_build -%endif # with_python2 +%endif %if 0%{?with_python3} %py3_build -%endif # with_python3 +%endif %make_build -C doc html man SPHINXBUILD=sphinx-build-%{python3_version} rm doc/_build/html/.buildinfo @@ -112,7 +114,7 @@ rm doc/_build/html/.buildinfo %if 0%{?with_python2} %py2_install install -p -m0644 -D doc/man/rosversion.1 %{buildroot}%{_mandir}/man1/rosversion.1 -%endif # with_python2 +%endif %if 0%{?with_python3} %py3_install -- --install-scripts %{_bindir}/python3 @@ -121,7 +123,7 @@ for i in *; do mv $i ../python3-$i; done popd rmdir %{buildroot}%{_bindir}/python3 install -p -m0644 -D doc/man/rosversion.1 %{buildroot}%{_mandir}/man1/python3-rosversion.1 -%endif # with_python3 +%endif install -p -m0644 -D manifest.xml %{buildroot}%{_datadir}/%{srcname}/manifest.xml @@ -129,20 +131,20 @@ install -p -m0644 -D manifest.xml %{buildroot}%{_datadir}/%{srcname}/manifest.xm %check %if 0%{?rhel} export LANG=en_US.UTF-8 -%endif # rhel +%endif %if 0%{?with_python2} PYTHONPATH=%{buildroot}%{python2_sitelib} \ %if 0%{?fedora} LANG=C.UTF-8 \ -%endif # fedora +%endif nosetests-%{python2_version} test -%endif # with_python2 +%endif %if 0%{?with_python3} PYTHONPATH=%{buildroot}%{python3_sitelib} \ nosetests-%{python3_version} test -%endif # with_python3 +%endif %files doc @@ -156,7 +158,7 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} \ %{_bindir}/rosversion %{_datadir}/%{srcname} %{_mandir}/man1/rosversion.1.* -%endif # with_python2 +%endif %if 0%{?with_python3} %files -n python%{python3_pkgversion}-%{srcname} @@ -166,10 +168,13 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} \ %{_bindir}/python3-rosversion %{_datadir}/%{srcname} %{_mandir}/man1/python3-rosversion.1.* -%endif # with_python3 +%endif %changelog +* Wed Apr 15 2020 Scott K Logan - 1.2.4-1 +- Update to 1.2.4 (rhbz#1775451) + * Fri Aug 09 2019 Scott K Logan - 1.1.10-1 - Update to 1.1.10 diff --git a/sources b/sources index b6db60c..05fa03a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rospkg-1.1.10.tar.gz) = 54b1b0ca4683b9388989501781239cf35873f2bf2028d176718f624999835b21e44f0cc5988624b37f7172d21f0c01aa336d35a884753c842098e558c37ac6c8 +SHA512 (rospkg-1.2.4.tar.gz) = 66bf844aeec121f5058aef59cf56176091c5c41de357c751c1d2d8a96baa4c961a98fbf81f0f3642c032654fac41552e6c0e942ba741efff0b32d6f9ae6e91a9