summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi Jinjing <jinjingx.li@intel.com>2014-08-20 14:25:02 +0800
committerMarkus Lehtonen <markus.lehtonen@linux.intel.com>2014-08-21 09:00:28 +0300
commit0ae97cbe473603ab03a666082ab26d1a34f96d41 (patch)
tree1d95151d412f5b93967ba01370efb2e1e5235f09
parentef52b32b782b5b5f2dac72b644ec5e9f1f34e5a8 (diff)
downloadgit-buildpackage-0ae97cbe473603ab03a666082ab26d1a34f96d41.tar.gz
git-buildpackage-0ae97cbe473603ab03a666082ab26d1a34f96d41.tar.bz2
git-buildpackage-0ae97cbe473603ab03a666082ab26d1a34f96d41.zip
rpm packaging: use macro for python binary
For fedora distro, when building git-buildpackage rpm packages in the buildroot, /bin/python is called to do python setup.py actions during rpmbuild,which leads to /bin/python is taken as requirement of git-buildpackage-rpm-0.6.15-0.noarch.rpm automatically, resulting in: Install gbs with dnf command in fedora distro will raise error: nothing provides /bin/python needed by git-buildpackage-rpm-0.6.12-59.1.noarch Fixes: DEVT-197 Change-Id: I30169a506d7f92aed759124c40beb2803c196218 Signed-off-by: Li Jinjing <jinjingx.li@intel.com> Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
-rw-r--r--packaging/git-buildpackage.spec6
1 files changed, 3 insertions, 3 deletions
diff --git a/packaging/git-buildpackage.spec b/packaging/git-buildpackage.spec
index 12af022b..b808f119 100644
--- a/packaging/git-buildpackage.spec
+++ b/packaging/git-buildpackage.spec
@@ -135,7 +135,7 @@ Debian and the RPM tool set.
%build
-WITHOUT_NOSETESTS=1 python ./setup.py build
+WITHOUT_NOSETESTS=1 %{__python} ./setup.py build
%if %{with docs}
# Prepare apidocs
@@ -152,13 +152,13 @@ HAVE_SGML2X=0 make -C docs/
GIT_CEILING_DIRECTORIES=%{_builddir} \
GIT_AUTHOR_EMAIL=rpmbuild@example.com GIT_AUTHOR_NAME=rpmbuild \
GIT_COMMITTER_NAME=$GIT_AUTHOR_NAME GIT_COMMITTER_EMAIL=$GIT_AUTHOR_EMAIL \
- python setup.py nosetests
+ %{__python} setup.py nosetests
%endif
%install
rm -rf %{buildroot}
-WITHOUT_NOSETESTS=1 python ./setup.py install --root=%{buildroot} --prefix=/usr
+WITHOUT_NOSETESTS=1 %{__python} ./setup.py install --root=%{buildroot} --prefix=/usr
rm -rf %{buildroot}%{python_sitelib}/*info
%if %{with docs}