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

notifications at fedoraproject.org notifications at fedoraproject.org
Sun Apr 19 15:42:26 UTC 2015


>From 60ca9eaf658ee19740ea7d8ff3d4fe8893f98deb Mon Sep 17 00:00:00 2001
From: Rich Mattes <richmattes at gmail.com>
Date: Fri, 10 Apr 2015 23:06:57 -0400
Subject: Make sure scripts in bindir use python2 instead of python3


diff --git a/python-rosdep.spec b/python-rosdep.spec
index 03026f5..6bdae09 100644
--- a/python-rosdep.spec
+++ b/python-rosdep.spec
@@ -99,14 +99,14 @@ popd
 rm -rf $RPM_BUILD_ROOT
 %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
 
 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 --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/man/rosdep.1 $RPM_BUILD_ROOT%{_mandir}/man1
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ros/rosdep/sources.list.d/
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/python-rosdep.git/commit/?h=master&id=60ca9eaf658ee19740ea7d8ff3d4fe8893f98deb


More information about the scm-commits mailing list