| |
@@ -11,7 +11,7 @@
|
| |
|
| |
Name: python-%{realname}
|
| |
Version: 0.11.4
|
| |
- Release: 8%{?dist}
|
| |
+ Release: 9%{?dist}
|
| |
Summary: ROS System Dependency Installer
|
| |
|
| |
License: BSD
|
| |
@@ -110,14 +110,6 @@
|
| |
|
| |
%install
|
| |
rm -rf $RPM_BUILD_ROOT
|
| |
- %if 0%{?with_python3}
|
| |
- pushd %{py3dir}
|
| |
- %{__python3} setup.py install --force --skip-build --root $RPM_BUILD_ROOT
|
| |
- popd
|
| |
-
|
| |
- sed -i 's|#!/usr/bin/env python||' $RPM_BUILD_ROOT%{python3_sitelib}/%{realname}2/*.py
|
| |
- sed -i 's|#!/usr/bin/env python||' $RPM_BUILD_ROOT%{python3_sitelib}/%{realname}2/*.py
|
| |
- %endif # with_python3
|
| |
|
| |
%{__python2} setup.py install --force --skip-build --root $RPM_BUILD_ROOT
|
| |
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
|
| |
@@ -129,6 +121,16 @@
|
| |
sed -i 's|#!/usr/bin/env python||' $RPM_BUILD_ROOT%{python2_sitelib}/%{realname}2/*.py
|
| |
sed -i 's|#!/usr/bin/env python||' $RPM_BUILD_ROOT%{python2_sitelib}/%{realname}2/platforms/*.py
|
| |
|
| |
+ %if 0%{?with_python3}
|
| |
+ pushd %{py3dir}
|
| |
+ %{__python3} setup.py install --force --skip-build --root $RPM_BUILD_ROOT
|
| |
+ popd
|
| |
+
|
| |
+ # Get rid of non-executable-script errors from rpmlint
|
| |
+ sed -i 's|#!/usr/bin/env python||' $RPM_BUILD_ROOT%{python3_sitelib}/%{realname}2/*.py
|
| |
+ sed -i 's|#!/usr/bin/env python||' $RPM_BUILD_ROOT%{python3_sitelib}/%{realname}2/platforms/*.py
|
| |
+ %endif # with_python3
|
| |
+
|
| |
# Get rid of hidden file in documentation folder
|
| |
rm -f doc/_build/.buildinfo
|
| |
|
| |
@@ -141,7 +143,9 @@
|
| |
%files -n python2-%{realname}
|
| |
%license LICENSE
|
| |
%doc README.md doc/_build/html
|
| |
+ %if !0%{?with_python3}
|
| |
%{_bindir}/*
|
| |
+ %endif
|
| |
%{python2_sitelib}/%{realname}-%{version}-py?.?.egg-info
|
| |
%{python2_sitelib}/%{realname}2
|
| |
%{_mandir}/man1/*.gz
|
| |
@@ -152,11 +156,15 @@
|
| |
%if 0%{?with_python3}
|
| |
%files -n python3-%{realname}
|
| |
%license LICENSE
|
| |
+ %{_bindir}/*
|
| |
%{python3_sitelib}/%{realname}-%{version}-py?.?.egg-info
|
| |
%{python3_sitelib}/%{realname}2
|
| |
%endif
|
| |
|
| |
%changelog
|
| |
+ * Fri Oct 13 2017 Jan Beran <jberan@redhat.com> - 0.11.4-9
|
| |
+ - Fix of missing Python 3 executables
|
| |
+
|
| |
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.11.4-8
|
| |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
| |
|
| |
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1432570