rmattes pushed to python-rosinstall (f22). "Make sure scripts in bindir use python2 instead of python3"

notifications at fedoraproject.org notifications at fedoraproject.org
Sun Apr 19 16:02:13 UTC 2015


>From 8761cace6981d03e4406a978f42fd899f54ab7c1 Mon Sep 17 00:00:00 2001
From: Rich Mattes <richmattes at gmail.com>
Date: Sun, 19 Apr 2015 11:46:08 -0400
Subject: Make sure scripts in bindir use python2 instead of python3


diff --git a/python-rosinstall.spec b/python-rosinstall.spec
index 5d30b21..a0ebb9f 100644
--- a/python-rosinstall.spec
+++ b/python-rosinstall.spec
@@ -10,7 +10,7 @@
 %global realname rosinstall
 Name:           python-rosinstall
 Version:        0.7.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        ROS installation utilities
 
 License:        BSD
@@ -88,11 +88,11 @@ popd
 %install
 %if 0%{?with_python3}
 pushd %{py3dir}
-%{__python3} setup.py install --skip-build --root $RPM_BUILD_ROOT
+%{__python3} setup.py install --force --skip-build --root $RPM_BUILD_ROOT
 popd
 %endif
 
-%{__python2} setup.py install --skip-build --root $RPM_BUILD_ROOT
+%{__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
@@ -113,6 +113,9 @@ rm -rf doc/_build/html/.buildinfo
 %endif
 
 %changelog
+* Sun Apr 19 2015 Rich Mattes <richmattes at gmail.com> - 0.7.5-2
+- Make sure scripts in bindir use python2 instead of python3
+
 * Wed Mar 04 2015 Rich Mattes <richmattes at gmail.com> - 0.7.5-1
 - Update to release 0.7.5 (rhbz#1195536)
 - Add python3 package
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/python-rosinstall.git/commit/?h=f22&id=8761cace6981d03e4406a978f42fd899f54ab7c1


More information about the scm-commits mailing list