Add envvar that will be present during RPM build
Part of a Fedora Change for F28: "Avoid /usr/bin/python in RPM build" https://fedoraproject.org/wiki/Changes/Avoid_usr_bin_python_in_RPM_Build
This commit is contained in:
parent
3f65cd7a41
commit
0670d684d5
@ -0,0 +1,28 @@
|
|||||||
|
From bf636421120aa2c97f9e0fdcee3c211b4241bd86 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Tomas Orsava <torsava@redhat.com>
|
||||||
|
Date: Mon, 29 Jan 2018 16:13:18 +0100
|
||||||
|
Subject: [PATCH] Add envvar that will be present during RPM build
|
||||||
|
|
||||||
|
Part of a Fedora Change for F28:
|
||||||
|
"Avoid /usr/bin/python in RPM build"
|
||||||
|
https://fedoraproject.org/wiki/Changes/Avoid_usr_bin_python_in_RPM_Build
|
||||||
|
---
|
||||||
|
macros.in | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/macros.in b/macros.in
|
||||||
|
index dd6ef67..68449e3 100644
|
||||||
|
--- a/macros.in
|
||||||
|
+++ b/macros.in
|
||||||
|
@@ -804,6 +804,8 @@ package or when debugging this package.\
|
||||||
|
export PKG_CONFIG_PATH\
|
||||||
|
CONFIG_SITE=${CONFIG_SITE:-NONE}\
|
||||||
|
export CONFIG_SITE\
|
||||||
|
+ PYTHON_DISALLOW_AMBIGUOUS_VERSION=warn\
|
||||||
|
+ export PYTHON_DISALLOW_AMBIGUOUS_VERSION\
|
||||||
|
\
|
||||||
|
%{verbose:set -x}%{!verbose:exec > /dev/null}\
|
||||||
|
umask 022\
|
||||||
|
--
|
||||||
|
2.13.6
|
||||||
|
|
14
rpm.spec
14
rpm.spec
@ -23,7 +23,7 @@
|
|||||||
|
|
||||||
%global rpmver 4.14.1
|
%global rpmver 4.14.1
|
||||||
#global snapver rc2
|
#global snapver rc2
|
||||||
%global rel 4
|
%global rel 5
|
||||||
|
|
||||||
%global srcver %{version}%{?snapver:-%{snapver}}
|
%global srcver %{version}%{?snapver:-%{snapver}}
|
||||||
%global srcdir %{?snapver:testing}%{!?snapver:%{name}-%(echo %{version} | cut -d'.' -f1-2).x}
|
%global srcdir %{?snapver:testing}%{!?snapver:%{name}-%(echo %{version} | cut -d'.' -f1-2).x}
|
||||||
@ -60,6 +60,13 @@ Patch5: rpm-4.12.0-rpm2cpio-hack.patch
|
|||||||
# Upstream pull request: https://github.com/rpm-software-management/rpm/pull/383
|
# Upstream pull request: https://github.com/rpm-software-management/rpm/pull/383
|
||||||
Patch6: rpm-4.14.1-python-brp-bytecompile.patch
|
Patch6: rpm-4.14.1-python-brp-bytecompile.patch
|
||||||
|
|
||||||
|
# Downstream-only patch:
|
||||||
|
# Add envvar that will be present during RPM build
|
||||||
|
# - Part of a Fedora Change for F28:
|
||||||
|
# - "Avoid /usr/bin/python in RPM build"
|
||||||
|
# - https://fedoraproject.org/wiki/Changes/Avoid_usr_bin_python_in_RPM_Build
|
||||||
|
Patch6: rpm-4.14.1-Add-envvar-that-will-be-present-during-RPM-build.patch
|
||||||
|
|
||||||
# Patches already upstream:
|
# Patches already upstream:
|
||||||
|
|
||||||
# These are not yet upstream
|
# These are not yet upstream
|
||||||
@ -578,6 +585,11 @@ make check || cat tests/rpmtests.log
|
|||||||
%doc doc/librpm/html/*
|
%doc doc/librpm/html/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jan 30 2018 Tomas Orsava <torsava@redhat.com> - 4.14.1-4
|
||||||
|
- Add envvar that will be present during RPM build,
|
||||||
|
Part of a Fedora Change for F28: "Avoid /usr/bin/python in RPM build"
|
||||||
|
https://fedoraproject.org/wiki/Changes/Avoid_usr_bin_python_in_RPM_Build
|
||||||
|
|
||||||
* Tue Jan 30 2018 Petr Viktorin <pviktori@redhat.com> - 4.14.1-4
|
* Tue Jan 30 2018 Petr Viktorin <pviktori@redhat.com> - 4.14.1-4
|
||||||
- Skip automatic Python byte-compilation if *.py files are not present
|
- Skip automatic Python byte-compilation if *.py files are not present
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user