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

[notifications at fedoraproject.org]

>From f2ae27f3d8baa6661ea88ab8e95f5e23f66e1a88 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

Conflicts:
	python-rosinstall.spec

diff --git a/python-rosinstall.spec b/python-rosinstall.spec
index b943d10..4531ec3 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
@@ -90,11 +90,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
 # el6 doesn't have a manpage generator
 %if ! 0%{?rhel}
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
@@ -120,6 +120,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=el6&id=f2ae27f3d8baa6661ea88ab8e95f5e23f66e1a88