From 8b4c782534f5d5ab7f38ee1c3092fe6c637b518c Mon Sep 17 00:00:00 2001
From: Scott K Logan <logans@cottsay.net>
Date: Sep 14 2018 01:25:47 +0000
Subject: Update to 1.1.7 (rhbz#1441445)


---

diff --git a/.gitignore b/.gitignore
index 17c2a45..9c465f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 /rospkg-cf4dba5c6d1ce85bbbb88f2dfa7e9d5c65382eb3.tar.gz
 /rospkg-71df8addfa5040490719c6fd5d912bc2d0cd6555.tar.gz
 /rospkg-fcfad8f2070e326192c0f50546fc2d40b05a4008.tar.gz
+/rospkg-1.1.7.tar.gz
diff --git a/python-rospkg.spec b/python-rospkg.spec
index b9cdcf0..f63bdab 100644
--- a/python-rospkg.spec
+++ b/python-rospkg.spec
@@ -5,22 +5,22 @@
 %{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")}
 %endif
 
-%global commit fcfad8f2070e326192c0f50546fc2d40b05a4008
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global srcname rospkg
 
 Name:           python-%{srcname}
-Version:        1.1.0
-Release:        6%{?dist}
+Version:        1.1.7
+Release:        1%{?dist}
 Summary:        Utilities for ROS package, stack, and distribution information
 
 License:        BSD
 URL:            http://ros.org/wiki/rospkg
-Source0:        https://github.com/ros-infrastructure/%{srcname}/archive/%{commit}/%{srcname}-%{commit}.tar.gz
+Source0:        https://github.com/ros-infrastructure/%{srcname}/archive/%{version}/%{srcname}-%{version}.tar.gz
 BuildArch:      noarch
 
+BuildRequires:  python
 BuildRequires:  python2-devel
 BuildRequires:  python2-setuptools
+BuildRequires:  python2-catkin_pkg
 BuildRequires:  python2-catkin-sphinx
 %if 0%{?rhel} && 0%{?rhel} < 7
 BuildRequires:  python-sphinx10
@@ -44,6 +44,7 @@ release your code for others to use.
 %package -n python2-%{srcname}
 Summary:        Utilities for ROS package, stack, and distribution information
 %{?python_provide:%python_provide python2-%{srcname}}
+Requires:       python2-catkin_pkg
 Requires:       python2-pyyaml
 
 %description -n python2-%{srcname}
@@ -56,6 +57,7 @@ release your code for others to use.
 %package -n python3-%{srcname}
 Summary:        Utilities for ROS package, stack, and distribution information
 
+BuildRequires:  python3-catkin_pkg
 BuildRequires:  python3-coverage
 BuildRequires:  python3-devel
 BuildRequires:  python3-mock
@@ -64,6 +66,7 @@ BuildRequires:  python3-PyYAML
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-sphinx
 BuildRequires:  python3-catkin-sphinx
+Requires:       python3-catkin_pkg
 Requires:       python3-PyYAML
 
 %description -n python3-%{srcname}
@@ -75,15 +78,17 @@ release your code for others to use.
 %endif
 
 %prep
-%setup -qn %{srcname}-%{commit}
+%setup -qn %{srcname}-%{version}
+
+sed -i 's|#!\(/usr/bin/\(env \)\?\)\?python||' src/%{srcname}/*.py
 
 %if 0%{?with_python3}
 rm -rf %{py3dir}
 cp -a . %{py3dir}
-find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|'
+find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!\(/usr/bin/\(env \)\?\)\?python|#!%{__python3}|'
 %endif
 
-find -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python2}|'
+find -name '*.py' | xargs sed -i '1s|^#!\(/usr/bin/\(env \)\?\)\?python|#!%{__python2}|'
 
 %build
 %{__python2} setup.py build
@@ -99,16 +104,13 @@ pushd %{py3dir}
 %{__python3} setup.py build
 # TODO: Disabled until python3-catkin-sphinx is built
 #make -C doc html man SPHINXBUILD=sphinx-build-%{python3_version}
-pushd build/scripts-%{python3_version}
-for f in *; do mv $f python3-$f; done
-popd
 popd
 %endif
 
 %check
 # Tests expect the base folder name to be 'rospkg', so move the source folder
 cd ..
-mv %{srcname}-%{commit} %{srcname}/
+mv %{srcname}-%{version} %{srcname}/
 cd %{srcname}
 # Run the nosetests
 %if 0%{?rhel} && 0%{?rhel} < 7
@@ -118,8 +120,8 @@ LANG=en_US.utf8 PYTHONPATH=%{buildroot}%{python2_sitelib} nosetests -w test
 %endif
 # Put the source folder back to its original name
 cd ..
-mv %{srcname} %{srcname}-%{commit}
-cd %{srcname}-%{commit}
+mv %{srcname} %{srcname}-%{version}
+cd %{srcname}-%{version}
 
 %if 0%{?with_python3}
 # Tests expect the base folder name to be 'rospkg', so move the source folder
@@ -142,11 +144,13 @@ install -p -m 0644 manifest.xml $RPM_BUILD_ROOT%{_datadir}/%{srcname}
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 install -p -m 0644 doc/man/rosversion.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
-sed -i 's|#!/usr/bin/env python||' $RPM_BUILD_ROOT%{python_sitelib}/%{srcname}/*.py
-
 %if 0%{?with_python3}
 pushd %{py3dir}
-%{__python3} setup.py install --skip-build --root %{buildroot}
+%{__python3} setup.py install --skip-build --root %{buildroot} --install-scripts %{_bindir}/python3
+pushd %{buildroot}%{_bindir}/python3
+for i in *; do mv $i ../python3-$i; done
+popd
+rmdir %{buildroot}%{_bindir}/python3
 popd
 %endif
 
@@ -167,6 +171,9 @@ popd
 %endif
 
 %changelog
+* Thu Sep 13 2018 Scott K Logan <logans@cottsay.net> - 1.1.7-1
+- Update to 1.1.7 (rhbz#1441445)
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index efb7f5e..f8f4266 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rospkg-fcfad8f2070e326192c0f50546fc2d40b05a4008.tar.gz) = d53d535f9292c817faed99317823b5f4f050a5316f52393bb7abff96890cfb42ee69ac822022381b61acef51e5bed1199cd7d577831f71f42884da2729fd5013
+SHA512 (rospkg-1.1.7.tar.gz) = 7d6915a32370786384220cd0d62087e0f82648e96f2006853dfb1486ff5b6c3343e32b9ac8a33ad1c1a8c758499475553b081166ca7ee0c72659855a2b09f151