!3 python3: update spec file
Merge pull request !3 from openeuler-basic/test_hxk
This commit is contained in:
commit
8f3aa561af
@ -1,80 +0,0 @@
|
|||||||
From 3b0d3a25576e74c2ac1eb25136ae811bdbdd7c6c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tomas Orsava <torsava@redhat.com>
|
|
||||||
Date: Thu, 14 Feb 2019 16:08:57 +0100
|
|
||||||
Subject: [PATCH] Upstream uses Debian-style architecture naming. Change to
|
|
||||||
match Fedora / RHEL
|
|
||||||
|
|
||||||
---
|
|
||||||
config.sub | 2 +-
|
|
||||||
configure.ac | 16 ++++++++--------
|
|
||||||
2 files changed, 9 insertions(+), 9 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/config.sub b/config.sub
|
|
||||||
index 40ea5df..932128b 100755
|
|
||||||
--- a/config.sub
|
|
||||||
+++ b/config.sub
|
|
||||||
@@ -1045,7 +1045,7 @@ case $basic_machine in
|
|
||||||
;;
|
|
||||||
ppc64) basic_machine=powerpc64-unknown
|
|
||||||
;;
|
|
||||||
- ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
|
|
||||||
+ ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
|
|
||||||
;;
|
|
||||||
ppc64le | powerpc64little)
|
|
||||||
basic_machine=powerpc64le-unknown
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index a075ce3..b7f2ee3 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -788,9 +788,9 @@ cat >> conftest.c <<EOF
|
|
||||||
alpha-linux-gnu
|
|
||||||
# elif defined(__ARM_EABI__) && defined(__ARM_PCS_VFP)
|
|
||||||
# if defined(__ARMEL__)
|
|
||||||
- arm-linux-gnueabihf
|
|
||||||
+ arm-linux-gnueabi
|
|
||||||
# else
|
|
||||||
- armeb-linux-gnueabihf
|
|
||||||
+ armeb-linux-gnueabi
|
|
||||||
# endif
|
|
||||||
# elif defined(__ARM_EABI__) && !defined(__ARM_PCS_VFP)
|
|
||||||
# if defined(__ARMEL__)
|
|
||||||
@@ -810,7 +810,7 @@ cat >> conftest.c <<EOF
|
|
||||||
# elif _MIPS_SIM == _ABIN32
|
|
||||||
mips64el-linux-gnuabin32
|
|
||||||
# elif _MIPS_SIM == _ABI64
|
|
||||||
- mips64el-linux-gnuabi64
|
|
||||||
+ mips64el-linux-gnu
|
|
||||||
# else
|
|
||||||
# error unknown platform triplet
|
|
||||||
# endif
|
|
||||||
@@ -820,22 +820,22 @@ cat >> conftest.c <<EOF
|
|
||||||
# elif _MIPS_SIM == _ABIN32
|
|
||||||
mips64-linux-gnuabin32
|
|
||||||
# elif _MIPS_SIM == _ABI64
|
|
||||||
- mips64-linux-gnuabi64
|
|
||||||
+ mips64-linux-gnu
|
|
||||||
# else
|
|
||||||
# error unknown platform triplet
|
|
||||||
# endif
|
|
||||||
# elif defined(__or1k__)
|
|
||||||
or1k-linux-gnu
|
|
||||||
# elif defined(__powerpc__) && defined(__SPE__)
|
|
||||||
- powerpc-linux-gnuspe
|
|
||||||
+ ppc-linux-gnuspe
|
|
||||||
# elif defined(__powerpc64__)
|
|
||||||
# if defined(__LITTLE_ENDIAN__)
|
|
||||||
- powerpc64le-linux-gnu
|
|
||||||
+ ppc64le-linux-gnu
|
|
||||||
# else
|
|
||||||
- powerpc64-linux-gnu
|
|
||||||
+ ppc64-linux-gnu
|
|
||||||
# endif
|
|
||||||
# elif defined(__powerpc__)
|
|
||||||
- powerpc-linux-gnu
|
|
||||||
+ ppc-linux-gnu
|
|
||||||
# elif defined(__s390x__)
|
|
||||||
s390x-linux-gnu
|
|
||||||
# elif defined(__s390__)
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
||||||
10
python3.spec
10
python3.spec
@ -3,7 +3,7 @@ Summary: Interpreter of the Python3 programming language
|
|||||||
URL: https://www.python.org/
|
URL: https://www.python.org/
|
||||||
|
|
||||||
Version: 3.7.4
|
Version: 3.7.4
|
||||||
Release: 4
|
Release: 5
|
||||||
License: Python
|
License: Python
|
||||||
|
|
||||||
%global branchversion 3.7
|
%global branchversion 3.7
|
||||||
@ -99,7 +99,6 @@ Patch178: 00178-dont-duplicate-flags-in-sysconfig.patch
|
|||||||
Patch189: 00189-use-rpm-wheels.patch
|
Patch189: 00189-use-rpm-wheels.patch
|
||||||
Patch205: 00205-make-libpl-respect-lib64.patch
|
Patch205: 00205-make-libpl-respect-lib64.patch
|
||||||
Patch251: 00251-change-user-install-location.patch
|
Patch251: 00251-change-user-install-location.patch
|
||||||
Patch274: 00274-fix-arch-names.patch
|
|
||||||
Patch316: 00316-mark-bdist_wininst-unsupported.patch
|
Patch316: 00316-mark-bdist_wininst-unsupported.patch
|
||||||
|
|
||||||
Patch6000: CVE-2019-16056.patch
|
Patch6000: CVE-2019-16056.patch
|
||||||
@ -190,7 +189,6 @@ rm -r Modules/expat
|
|||||||
rm Lib/ensurepip/_bundled/*.whl
|
rm Lib/ensurepip/_bundled/*.whl
|
||||||
%patch205 -p1
|
%patch205 -p1
|
||||||
%patch251 -p1
|
%patch251 -p1
|
||||||
%patch274 -p1
|
|
||||||
%patch316 -p1
|
%patch316 -p1
|
||||||
|
|
||||||
rm configure pyconfig.h.in
|
rm configure pyconfig.h.in
|
||||||
@ -792,6 +790,12 @@ export BEP_GTDLIST="$BEP_GTDLIST_TMP"
|
|||||||
%{_mandir}/*/*
|
%{_mandir}/*/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 31 2019 hanxinke<hanxinke@huawei.com> - 3.7.4-5
|
||||||
|
- Type:enhancement
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:update spec file
|
||||||
|
|
||||||
* Thu Dec 24 2019 openEuler Buildteam <buildteam@openeuler.org> - 3.7.4-4
|
* Thu Dec 24 2019 openEuler Buildteam <buildteam@openeuler.org> - 3.7.4-4
|
||||||
- fix CVE-2019-16056 CVE-2019-16935 CVE-2019-17514
|
- fix CVE-2019-16056 CVE-2019-16935 CVE-2019-17514
|
||||||
- Delete the test keys, fix BEP problem
|
- Delete the test keys, fix BEP problem
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user