#1 Fix of missing Python 3 executables
Closed 6 years ago by aries. Opened 6 years ago by aries.
Unknown source master  into  master

file modified
+12 -6
@@ -10,7 +10,7 @@

  %global realname rosinstall

  Name:           python-rosinstall

  Version:        0.7.7

- Release:        8%{?dist}

+ Release:        9%{?dist}

  Summary:        ROS installation utilities

  

  License:        BSD
@@ -102,17 +102,17 @@

  %endif # with_python3

  

  %install

+ %{__python2} setup.py install --force --skip-build --root $RPM_BUILD_ROOT

+ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1

+ install -p -m 0644 doc/_build/man/%{realname}.1 $RPM_BUILD_ROOT%{_mandir}/man1/

+ rm -rf doc/_build/html/.buildinfo

+ 

  %if 0%{?with_python3}

  pushd %{py3dir}

  %{__python3} setup.py install --force --skip-build --root $RPM_BUILD_ROOT

  popd

  %endif

  

- %{__python2} setup.py install --force --skip-build --root $RPM_BUILD_ROOT

- mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1

- install -p -m 0644 doc/_build/man/%{realname}.1 $RPM_BUILD_ROOT%{_mandir}/man1/

- rm -rf doc/_build/html/.buildinfo

- 

  %check

  # python-rosinstall tests reach out to github, which won't work in mock.

  # Disabling for now
@@ -124,7 +124,9 @@

  %files -n python2-%{realname}

  %license LICENSE

  %doc doc/_build/html README.rst

+ %if !0%{?with_python3}

  %{_bindir}/*

+ %endif

  %{python2_sitelib}/%{realname}

  %{python2_sitelib}/%{realname}-%{version}-py?.?.egg-info

  %{_mandir}/man1/%{realname}.1.gz
@@ -132,11 +134,15 @@

  %if 0%{?with_python3}

  %files -n python3-%{realname}

  %license LICENSE

+ %{_bindir}/*

  %{python3_sitelib}/%{realname}

  %{python3_sitelib}/%{realname}-%{version}-py?.?.egg-info

  %endif

  

  %changelog

+ * Fri Oct 13 2017 Jan Beran <jberan@redhat.com> - 0.7.7-9

+ - Fix of missing Python 3 executables

+ 

  * Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.7.7-8

  - Python 2 binary package renamed to python2-rosinstall

    See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3

2 new commits added

  • Update python-rosinstall.spec - small corrections
  • Update python-rosinstall.spec
6 years ago

Pull-Request has been closed by aries

6 years ago
Metadata