Architecture specific change in rpms/cmake.git
by githook-noreply＠fedoraproject.org
The package rpms/cmake.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/cmake.git/commit/?id=422d920ec78e....
Change:
+%ifarch s390x
Thanks.
Full change:
============
commit fb41c005d89a245a2c5a461c1e8b0e1db9c355de
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Tue Mar 24 12:21:04 2020 -0500
Update to cmake-3.17.0
diff --git a/cmake.spec b/cmake.spec
index 9260051..6fd0401 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -57,7 +57,7 @@
%global major_version 3
%global minor_version 17
# Set to RC version if building RC, else %%{nil}
-%global rcsuf rc3
+#global rcsuf rc3
%{?rcsuf:%global relsuf .%{rcsuf}}
%{?rcsuf:%global versuf -%{rcsuf}}
@@ -67,7 +67,7 @@
Name: %{orig_name}%{?name_suffix}
Version: %{major_version}.%{minor_version}.0
-Release: 0.4%{?relsuf}%{?dist}
+Release: 1%{?relsuf}%{?dist}
Summary: Cross-platform make system
# most sources are BSD
@@ -493,6 +493,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
%changelog
+* Tue Mar 24 2020 Rex Dieter <rdieter(a)fedoraproject.org> - 3.17.0-1
+- Update to cmake-3.17.0
+
* Fri Mar 13 2020 Bjrn Esser <besser82(a)fedoraproject.org> - 3.17.0-0.4.rc3
- Update to 3.17.0-rc3
diff --git a/sources b/sources
index 07317a8..fa199f6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cmake-3.17.0-rc3.tar.gz) = db37a74fa5750a4796b6c50e024d0ef739fa1ddce6f9ee63955c4cf2049c47e571fb0bb9141cfbf49df654a88a4162f48b5aa6c15ee05dcfe09b3eccbf06e907
+SHA512 (cmake-3.17.0.tar.gz) = f09440681e0c414f5ca669f3aeba6666d09e0642f30a2e12c3199e7fb3da95a7dd17994fc54475c49638c37f0502ea0a2d8da0f9098805f11088ba7b299bf72a
commit f8c1c1d47b0d4242244df4f1ae7f15754f8f01cc
Author: Bjrn Esser <besser82(a)fedoraproject.org>
Date: Fri Mar 13 11:28:59 2020 +0100
Update to 3.17.0-rc3
diff --git a/cmake.spec b/cmake.spec
index f17b01f..9260051 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -57,7 +57,7 @@
%global major_version 3
%global minor_version 17
# Set to RC version if building RC, else %%{nil}
-%global rcsuf rc2
+%global rcsuf rc3
%{?rcsuf:%global relsuf .%{rcsuf}}
%{?rcsuf:%global versuf -%{rcsuf}}
@@ -67,7 +67,7 @@
Name: %{orig_name}%{?name_suffix}
Version: %{major_version}.%{minor_version}.0
-Release: 0.3%{?relsuf}%{?dist}
+Release: 0.4%{?relsuf}%{?dist}
Summary: Cross-platform make system
# most sources are BSD
@@ -493,6 +493,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
%changelog
+* Fri Mar 13 2020 Bjrn Esser <besser82(a)fedoraproject.org> - 3.17.0-0.4.rc3
+- Update to 3.17.0-rc3
+
* Tue Mar 03 2020 Bjrn Esser <besser82(a)fedoraproject.org> - 3.17.0-0.3.rc2
- Update to 3.17.0-rc2
diff --git a/sources b/sources
index 245108f..07317a8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cmake-3.17.0-rc2.tar.gz) = c91040930a22c0b773ba3edaae6614fdae371214ed3eb44f124521a3201c5fdd0b67b170c46fc9d7b00fe053dbf2a7b7e9d984fde5ecf355eb18a2b5d38f8bb4
+SHA512 (cmake-3.17.0-rc3.tar.gz) = db37a74fa5750a4796b6c50e024d0ef739fa1ddce6f9ee63955c4cf2049c47e571fb0bb9141cfbf49df654a88a4162f48b5aa6c15ee05dcfe09b3eccbf06e907
commit 422d920ec78e61d8f69ba527ea6407ca63020e2b
Author: Bjrn Esser <besser82(a)fedoraproject.org>
Date: Tue Mar 3 12:14:25 2020 +0100
kwsys.testProcess-{4,5} are flaky on s390x
diff --git a/cmake.spec b/cmake.spec
index ced3632..f17b01f 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -417,6 +417,10 @@ pushd %{_vpath_builddir}
# CTestTestUpload require internet access
# CPackComponentsForAll-RPM-IgnoreGroup failing wih rpm 4.15 - https://gitlab.kitware.com/cmake/cmake/issues/19983
NO_TEST="CTestTestUpload|CPackComponentsForAll-RPM-IgnoreGroup"
+# kwsys.testProcess-{4,5} are flaky on s390x.
+%ifarch s390x
+NO_TEST="$NO_TEST|kwsys.testProcess-4|kwsys.testProcess-5"
+%endif
bin/ctest%{?name_suffix} %{?_smp_mflags} -V -E "$NO_TEST" --output-on-failure
# Keep an eye on failing tests
bin/ctest%{?name_suffix} %{?_smp_mflags} -V -R "$NO_TEST" --output-on-failure || :
commit e5db548e34c6f78e7e6e70217d5a3bf05d6a7e1c
Author: Bjrn Esser <besser82(a)fedoraproject.org>
Date: Tue Mar 3 10:58:17 2020 +0100
Update to 3.17.0-rc2
diff --git a/cmake.spec b/cmake.spec
index f916620..ced3632 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -57,7 +57,7 @@
%global major_version 3
%global minor_version 17
# Set to RC version if building RC, else %%{nil}
-%global rcsuf rc1
+%global rcsuf rc2
%{?rcsuf:%global relsuf .%{rcsuf}}
%{?rcsuf:%global versuf -%{rcsuf}}
@@ -67,7 +67,7 @@
Name: %{orig_name}%{?name_suffix}
Version: %{major_version}.%{minor_version}.0
-Release: 0.2%{?relsuf}%{?dist}
+Release: 0.3%{?relsuf}%{?dist}
Summary: Cross-platform make system
# most sources are BSD
@@ -489,6 +489,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
%changelog
+* Tue Mar 03 2020 Bjrn Esser <besser82(a)fedoraproject.org> - 3.17.0-0.3.rc2
+- Update to 3.17.0-rc2
+
* Thu Feb 27 2020 Orion Poplawski <orion(a)nwra.com> - 3.17.0-0.2.rc1
- Use python3 for rpm generators
- Use lowercase names for cmake provides in generator (in addition to old names)
diff --git a/sources b/sources
index 1e4a3c7..245108f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cmake-3.17.0-rc1.tar.gz) = 7ff9f21a488658275f61111241dca4e311441827edbc11f44dd4772e114e6f99cb0e3f85d8a8051a23783e7aa47e19683f83b5cf236e75ca9a9724ea9cb2a1c1
+SHA512 (cmake-3.17.0-rc2.tar.gz) = c91040930a22c0b773ba3edaae6614fdae371214ed3eb44f124521a3201c5fdd0b67b170c46fc9d7b00fe053dbf2a7b7e9d984fde5ecf355eb18a2b5d38f8bb4
commit 1bb4a5c968439e63bc3eebf9780f497f40d4b673
Author: Orion Poplawski <orion(a)nwra.com>
Date: Wed Feb 26 20:59:26 2020 -0700
Use python3 for rpm generators
Use lowercase names for cmake provides in generator (in addition to old names)
diff --git a/cmake.prov b/cmake.prov
index f569c23..58d3522 100644
--- a/cmake.prov
+++ b/cmake.prov
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# -*- coding:utf-8 -*-
#
# Copyright (C) 2015 Daniel Vrtil <dvratil(a)redhat.com>
@@ -37,9 +37,16 @@ class CMakeParser:
version = self.resolveCMakeModuleVersion(modulePath, cmakeModule, lowercase)
if version:
- print("cmake(%s) = %s" % (cmakeModule, version))
+ string = "cmake(" + cmakeModule + ") = " + version
else:
- print("cmake(%s)" % cmakeModule)
+ string = "cmake(" + cmakeModule + ")"
+ if string == string.lower():
+ print(string)
+ else:
+ # Temporarily print both variants to satisfy requires
+ # by the old version of this generator which made mistakes
+ print(string)
+ print(string.lower())
def parseCmakeModuleConfig(self, configFile):
diff --git a/cmake.req b/cmake.req
index 2a58ca3..9af5c44 100644
--- a/cmake.req
+++ b/cmake.req
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# -*- coding:utf-8 -*-
#
# Copyright (C) 2017 Bjrn Esser <besser82(a)fedoraproject.org>
diff --git a/cmake.spec b/cmake.spec
index 184b6a0..f916620 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -67,7 +67,7 @@
Name: %{orig_name}%{?name_suffix}
Version: %{major_version}.%{minor_version}.0
-Release: 0.1%{?relsuf}%{?dist}
+Release: 0.2%{?relsuf}%{?dist}
Summary: Cross-platform make system
# most sources are BSD
@@ -489,6 +489,10 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
%changelog
+* Thu Feb 27 2020 Orion Poplawski <orion(a)nwra.com> - 3.17.0-0.2.rc1
+- Use python3 for rpm generators
+- Use lowercase names for cmake provides in generator (in addition to old names)
+
* Mon Feb 17 2020 Bjrn Esser <besser82(a)fedoraproject.org> - 3.17.0-0.1.rc1
- Update to 3.17.0-rc1
commit 0d9eb67fedcc67744efcdae45c4c23997d1d5be1
Author: Bjrn Esser <besser82(a)fedoraproject.org>
Date: Tue Feb 18 00:02:09 2020 +0100
Fix release tag
diff --git a/cmake.spec b/cmake.spec
index 929c985..184b6a0 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -67,7 +67,7 @@
Name: %{orig_name}%{?name_suffix}
Version: %{major_version}.%{minor_version}.0
-Release: 1%{?relsuf}%{?dist}
+Release: 0.1%{?relsuf}%{?dist}
Summary: Cross-platform make system
# most sources are BSD
@@ -489,7 +489,7 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
%changelog
-* Mon Feb 17 2020 Bjrn Esser <besser82(a)fedoraproject.org> - 3.17.0-1.rc1
+* Mon Feb 17 2020 Bjrn Esser <besser82(a)fedoraproject.org> - 3.17.0-0.1.rc1
- Update to 3.17.0-rc1
* Wed Feb 05 2020 Bjrn Esser <besser82(a)fedoraproject.org> - 3.16.4-1
commit 1f31468bbd07ed01a53c4c3bb7fcf124e827ed83
Author: Bjrn Esser <besser82(a)fedoraproject.org>
Date: Mon Feb 17 22:47:31 2020 +0100
Update to 3.17.0-rc1
diff --git a/cmake.spec b/cmake.spec
index a618ce1..929c985 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -55,9 +55,9 @@
%{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}}
%global major_version 3
-%global minor_version 16
+%global minor_version 17
# Set to RC version if building RC, else %%{nil}
-#global rcsuf %%{nil}
+%global rcsuf rc1
%{?rcsuf:%global relsuf .%{rcsuf}}
%{?rcsuf:%global versuf -%{rcsuf}}
@@ -66,7 +66,7 @@
%global orig_name cmake
Name: %{orig_name}%{?name_suffix}
-Version: %{major_version}.%{minor_version}.4
+Version: %{major_version}.%{minor_version}.0
Release: 1%{?relsuf}%{?dist}
Summary: Cross-platform make system
@@ -489,6 +489,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
%changelog
+* Mon Feb 17 2020 Bjrn Esser <besser82(a)fedoraproject.org> - 3.17.0-1.rc1
+- Update to 3.17.0-rc1
+
* Wed Feb 05 2020 Bjrn Esser <besser82(a)fedoraproject.org> - 3.16.4-1
- Update to 3.16.4
diff --git a/sources b/sources
index 1541a44..1e4a3c7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cmake-3.16.4.tar.gz) = 4aa36608bac3b9e29ea765003cdc684733c025d7b18fbae057f3be1f726a159d4b0231b8b1be269206aa7dbd7177fe0110d5bac8d72fb0f6ad392bb284b1fce3
+SHA512 (cmake-3.17.0-rc1.tar.gz) = 7ff9f21a488658275f61111241dca4e311441827edbc11f44dd4772e114e6f99cb0e3f85d8a8051a23783e7aa47e19683f83b5cf236e75ca9a9724ea9cb2a1c1
commit 278c697be54bd13de56c5cbdecb2f5ab47eab26f
Author: Bjrn Esser <besser82(a)fedoraproject.org>
Date: Mon Feb 17 23:02:11 2020 +0100
Refresh patches
diff --git a/cmake-fedora-flag_release.patch b/cmake-fedora-flag_release.patch
index 4c03ff5..7b1ad64 100644
--- a/cmake-fedora-flag_release.patch
+++ b/cmake-fedora-flag_release.patch
@@ -1,7 +1,7 @@
-Index: cmake-3.14.0/Modules/Compiler/Absoft-Fortran.cmake
+Index: cmake-3.17.0-rc1/Modules/Compiler/Absoft-Fortran.cmake
===================================================================
---- cmake-3.14.0.orig/Modules/Compiler/Absoft-Fortran.cmake
-+++ cmake-3.14.0/Modules/Compiler/Absoft-Fortran.cmake
+--- cmake-3.17.0-rc1.orig/Modules/Compiler/Absoft-Fortran.cmake
++++ cmake-3.17.0-rc1/Modules/Compiler/Absoft-Fortran.cmake
@@ -1,7 +1,7 @@
string(APPEND CMAKE_Fortran_FLAGS_INIT " ")
string(APPEND CMAKE_Fortran_FLAGS_DEBUG_INIT " -g")
@@ -11,10 +11,10 @@ Index: cmake-3.14.0/Modules/Compiler/Absoft-Fortran.cmake
string(APPEND CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT " -O2 -g")
set(CMAKE_Fortran_MODDIR_FLAG "-YMOD_OUT_DIR=")
set(CMAKE_Fortran_MODPATH_FLAG "-p")
-Index: cmake-3.14.0/Modules/Compiler/G95-Fortran.cmake
+Index: cmake-3.17.0-rc1/Modules/Compiler/G95-Fortran.cmake
===================================================================
---- cmake-3.14.0.orig/Modules/Compiler/G95-Fortran.cmake
-+++ cmake-3.14.0/Modules/Compiler/G95-Fortran.cmake
+--- cmake-3.17.0-rc1.orig/Modules/Compiler/G95-Fortran.cmake
++++ cmake-3.17.0-rc1/Modules/Compiler/G95-Fortran.cmake
@@ -1,7 +1,7 @@
string(APPEND CMAKE_Fortran_FLAGS_INIT " ")
string(APPEND CMAKE_Fortran_FLAGS_DEBUG_INIT " -g")
@@ -24,11 +24,11 @@ Index: cmake-3.14.0/Modules/Compiler/G95-Fortran.cmake
string(APPEND CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT " -O2 -g")
set(CMAKE_Fortran_MODDIR_FLAG "-fmod=")
set(CMAKE_Fortran_VERBOSE_FLAG "-v")
-Index: cmake-3.14.0/Modules/Compiler/GNU.cmake
+Index: cmake-3.17.0-rc1/Modules/Compiler/GNU.cmake
===================================================================
---- cmake-3.14.0.orig/Modules/Compiler/GNU.cmake
-+++ cmake-3.14.0/Modules/Compiler/GNU.cmake
-@@ -50,7 +50,7 @@ macro(__compiler_gnu lang)
+--- cmake-3.17.0-rc1.orig/Modules/Compiler/GNU.cmake
++++ cmake-3.17.0-rc1/Modules/Compiler/GNU.cmake
+@@ -55,7 +55,7 @@ macro(__compiler_gnu lang)
string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g")
string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -Os -DNDEBUG")
@@ -37,10 +37,10 @@ Index: cmake-3.14.0/Modules/Compiler/GNU.cmake
string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG")
set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")
-Index: cmake-3.14.0/Modules/Compiler/GNU-Fortran.cmake
+Index: cmake-3.17.0-rc1/Modules/Compiler/GNU-Fortran.cmake
===================================================================
---- cmake-3.14.0.orig/Modules/Compiler/GNU-Fortran.cmake
-+++ cmake-3.14.0/Modules/Compiler/GNU-Fortran.cmake
+--- cmake-3.17.0-rc1.orig/Modules/Compiler/GNU-Fortran.cmake
++++ cmake-3.17.0-rc1/Modules/Compiler/GNU-Fortran.cmake
@@ -14,7 +14,7 @@ set(CMAKE_Fortran_POSTPROCESS_FLAG "-fpr
# No -DNDEBUG for Fortran.
@@ -50,10 +50,10 @@ Index: cmake-3.14.0/Modules/Compiler/GNU-Fortran.cmake
# No -isystem for Fortran because it will not find .mod files.
unset(CMAKE_INCLUDE_SYSTEM_FLAG_Fortran)
-Index: cmake-3.14.0/Modules/Compiler/Intel.cmake
+Index: cmake-3.17.0-rc1/Modules/Compiler/Intel.cmake
===================================================================
---- cmake-3.14.0.orig/Modules/Compiler/Intel.cmake
-+++ cmake-3.14.0/Modules/Compiler/Intel.cmake
+--- cmake-3.17.0-rc1.orig/Modules/Compiler/Intel.cmake
++++ cmake-3.17.0-rc1/Modules/Compiler/Intel.cmake
@@ -22,7 +22,7 @@ else()
string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g")
@@ -63,11 +63,11 @@ Index: cmake-3.14.0/Modules/Compiler/Intel.cmake
string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -g")
set(CMAKE_${lang}_COMPILER_PREDEFINES_COMMAND "${CMAKE_${lang}_COMPILER}")
-Index: cmake-3.14.0/Modules/Compiler/NVIDIA-CUDA.cmake
+Index: cmake-3.17.0-rc1/Modules/Compiler/NVIDIA-CUDA.cmake
===================================================================
---- cmake-3.14.0.orig/Modules/Compiler/NVIDIA-CUDA.cmake
-+++ cmake-3.14.0/Modules/Compiler/NVIDIA-CUDA.cmake
-@@ -10,7 +10,7 @@ if(NOT "x${CMAKE_CUDA_SIMULATE_ID}" STRE
+--- cmake-3.17.0-rc1.orig/Modules/Compiler/NVIDIA-CUDA.cmake
++++ cmake-3.17.0-rc1/Modules/Compiler/NVIDIA-CUDA.cmake
+@@ -36,7 +36,7 @@ if(NOT "x${CMAKE_CUDA_SIMULATE_ID}" STRE
set(CMAKE_SHARED_LIBRARY_CUDA_FLAGS -fPIC)
string(APPEND CMAKE_CUDA_FLAGS_INIT " ")
string(APPEND CMAKE_CUDA_FLAGS_DEBUG_INIT " -g")
@@ -76,10 +76,10 @@ Index: cmake-3.14.0/Modules/Compiler/NVIDIA-CUDA.cmake
string(APPEND CMAKE_CUDA_FLAGS_MINSIZEREL_INIT " -O1 -DNDEBUG")
string(APPEND CMAKE_CUDA_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG")
endif()
-Index: cmake-3.14.0/Modules/Compiler/PathScale.cmake
+Index: cmake-3.17.0-rc1/Modules/Compiler/PathScale.cmake
===================================================================
---- cmake-3.14.0.orig/Modules/Compiler/PathScale.cmake
-+++ cmake-3.14.0/Modules/Compiler/PathScale.cmake
+--- cmake-3.17.0-rc1.orig/Modules/Compiler/PathScale.cmake
++++ cmake-3.17.0-rc1/Modules/Compiler/PathScale.cmake
@@ -16,6 +16,6 @@ macro(__compiler_pathscale lang)
string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g -O0")
@@ -88,10 +88,10 @@ Index: cmake-3.14.0/Modules/Compiler/PathScale.cmake
+ string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O2")
string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -g -O2")
endmacro()
-Index: cmake-3.14.0/Modules/Compiler/PGI.cmake
+Index: cmake-3.17.0-rc1/Modules/Compiler/PGI.cmake
===================================================================
---- cmake-3.14.0.orig/Modules/Compiler/PGI.cmake
-+++ cmake-3.14.0/Modules/Compiler/PGI.cmake
+--- cmake-3.17.0-rc1.orig/Modules/Compiler/PGI.cmake
++++ cmake-3.17.0-rc1/Modules/Compiler/PGI.cmake
@@ -18,7 +18,7 @@ macro(__compiler_pgi lang)
string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g -O0")
@@ -101,10 +101,10 @@ Index: cmake-3.14.0/Modules/Compiler/PGI.cmake
string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -gopt")
if(CMAKE_HOST_WIN32)
-Index: cmake-3.14.0/Modules/Compiler/SunPro-ASM.cmake
+Index: cmake-3.17.0-rc1/Modules/Compiler/SunPro-ASM.cmake
===================================================================
---- cmake-3.14.0.orig/Modules/Compiler/SunPro-ASM.cmake
-+++ cmake-3.14.0/Modules/Compiler/SunPro-ASM.cmake
+--- cmake-3.17.0-rc1.orig/Modules/Compiler/SunPro-ASM.cmake
++++ cmake-3.17.0-rc1/Modules/Compiler/SunPro-ASM.cmake
@@ -11,7 +11,7 @@ set(CMAKE_SHARED_LIBRARY_SONAME_ASM_FLAG
string(APPEND CMAKE_ASM_FLAGS_INIT " ")
string(APPEND CMAKE_ASM_FLAGS_DEBUG_INIT " -g")
@@ -114,10 +114,10 @@ Index: cmake-3.14.0/Modules/Compiler/SunPro-ASM.cmake
string(APPEND CMAKE_ASM_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG")
# Initialize ASM link type selection flags. These flags are used when
-Index: cmake-3.14.0/Modules/Compiler/SunPro-C.cmake
+Index: cmake-3.17.0-rc1/Modules/Compiler/SunPro-C.cmake
===================================================================
---- cmake-3.14.0.orig/Modules/Compiler/SunPro-C.cmake
-+++ cmake-3.14.0/Modules/Compiler/SunPro-C.cmake
+--- cmake-3.17.0-rc1.orig/Modules/Compiler/SunPro-C.cmake
++++ cmake-3.17.0-rc1/Modules/Compiler/SunPro-C.cmake
@@ -19,7 +19,7 @@ set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "
string(APPEND CMAKE_C_FLAGS_INIT " ")
string(APPEND CMAKE_C_FLAGS_DEBUG_INIT " -g")
@@ -127,10 +127,10 @@ Index: cmake-3.14.0/Modules/Compiler/SunPro-C.cmake
string(APPEND CMAKE_C_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG")
set(CMAKE_DEPFILE_FLAGS_C "-xMD -xMF <DEPFILE>")
-Index: cmake-3.14.0/Modules/Compiler/SunPro-CXX.cmake
+Index: cmake-3.17.0-rc1/Modules/Compiler/SunPro-CXX.cmake
===================================================================
---- cmake-3.14.0.orig/Modules/Compiler/SunPro-CXX.cmake
-+++ cmake-3.14.0/Modules/Compiler/SunPro-CXX.cmake
+--- cmake-3.17.0-rc1.orig/Modules/Compiler/SunPro-CXX.cmake
++++ cmake-3.17.0-rc1/Modules/Compiler/SunPro-CXX.cmake
@@ -19,7 +19,7 @@ set(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG
string(APPEND CMAKE_CXX_FLAGS_INIT " ")
string(APPEND CMAKE_CXX_FLAGS_DEBUG_INIT " -g")
@@ -140,10 +140,10 @@ Index: cmake-3.14.0/Modules/Compiler/SunPro-CXX.cmake
string(APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG")
set(CMAKE_DEPFILE_FLAGS_CXX "-xMD -xMF <DEPFILE>")
-Index: cmake-3.14.0/Modules/Compiler/SunPro-Fortran.cmake
+Index: cmake-3.17.0-rc1/Modules/Compiler/SunPro-Fortran.cmake
===================================================================
---- cmake-3.14.0.orig/Modules/Compiler/SunPro-Fortran.cmake
-+++ cmake-3.14.0/Modules/Compiler/SunPro-Fortran.cmake
+--- cmake-3.17.0-rc1.orig/Modules/Compiler/SunPro-Fortran.cmake
++++ cmake-3.17.0-rc1/Modules/Compiler/SunPro-Fortran.cmake
@@ -17,7 +17,7 @@ set(CMAKE_EXECUTABLE_RUNTIME_Fortran_FLA
string(APPEND CMAKE_Fortran_FLAGS_INIT " ")
string(APPEND CMAKE_Fortran_FLAGS_DEBUG_INIT " -g")
@@ -153,3 +153,16 @@ Index: cmake-3.14.0/Modules/Compiler/SunPro-Fortran.cmake
string(APPEND CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG")
set(CMAKE_Fortran_MODDIR_FLAG "-moddir=")
set(CMAKE_Fortran_MODPATH_FLAG "-M")
+Index: cmake-3.17.0-rc1/Modules/Platform/Windows-Clang.cmake
+===================================================================
+--- cmake-3.17.0-rc1.orig/Modules/Platform/Windows-Clang.cmake
++++ cmake-3.17.0-rc1/Modules/Platform/Windows-Clang.cmake
+@@ -79,7 +79,7 @@ macro(__windows_compiler_clang_gnu lang)
+
+ string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g -Xclang -gcodeview -O0 ${__ADDED_FLAGS_DEBUG}")
+ string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -Os -DNDEBUG ${__ADDED_FLAGS}")
+- string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O3 -DNDEBUG ${__ADDED_FLAGS}")
++ string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O2 -DNDEBUG ${__ADDED_FLAGS}")
+ string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG -Xclang -gcodeview ${__ADDED_FLAGS}")
+ endif()
+ set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-isystem ")
diff --git a/cmake-findruby.patch b/cmake-findruby.patch
index ec28253..b5d4fae 100644
--- a/cmake-findruby.patch
+++ b/cmake-findruby.patch
@@ -1,6 +1,7 @@
-diff -up cmake-3.15.3/Modules/FindRuby.cmake.orig cmake-3.15.3/Modules/FindRuby.cmake
---- cmake-3.15.3/Modules/FindRuby.cmake.orig 2019-09-30 22:18:24.213679271 -0600
-+++ cmake-3.15.3/Modules/FindRuby.cmake 2019-09-30 22:19:24.177961574 -0600
+Index: cmake-3.17.0-rc1/Modules/FindRuby.cmake
+===================================================================
+--- cmake-3.17.0-rc1.orig/Modules/FindRuby.cmake
++++ cmake-3.17.0-rc1/Modules/FindRuby.cmake
@@ -110,14 +110,8 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSIO
_RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR)
_RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR)
diff --git a/cmake-mingw-dl.patch b/cmake-mingw-dl.patch
index a83e378..ef24234 100644
--- a/cmake-mingw-dl.patch
+++ b/cmake-mingw-dl.patch
@@ -1,9 +1,13 @@
-Index: cmake-3.14.0/Modules/Platform/Windows-GNU.cmake
+Index: cmake-3.17.0-rc1/Modules/Platform/Windows-GNU.cmake
===================================================================
---- cmake-3.14.0.orig/Modules/Platform/Windows-GNU.cmake
-+++ cmake-3.14.0/Modules/Platform/Windows-GNU.cmake
-@@ -28,9 +28,11 @@ if(MINGW)
- set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll" ".dll.a" ".a" ".lib")
+--- cmake-3.17.0-rc1.orig/Modules/Platform/Windows-GNU.cmake
++++ cmake-3.17.0-rc1/Modules/Platform/Windows-GNU.cmake
+@@ -25,12 +25,14 @@ endif()
+
+ if(MINGW)
+ set(CMAKE_FIND_LIBRARY_PREFIXES "lib" "")
+- set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll.a" ".a" ".lib")
++ set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll" ".dll.a" ".a" ".lib")
set(CMAKE_C_STANDARD_LIBRARIES_INIT "-lkernel32 -luser32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32")
set(CMAKE_CXX_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}")
+ set(CMAKE_DL_LIBS "dl")
4 years, 1 month
- 1
- 0
Architecture specific change in rpms/cmake.git
by githook-noreply＠fedoraproject.org
The package rpms/cmake.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/cmake.git/commit/?id=422d920ec78e....
Change:
+%ifarch s390x
Thanks.
Full change:
============
commit fb41c005d89a245a2c5a461c1e8b0e1db9c355de
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Tue Mar 24 12:21:04 2020 -0500
Update to cmake-3.17.0
diff --git a/cmake.spec b/cmake.spec
index 9260051..6fd0401 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -57,7 +57,7 @@
%global major_version 3
%global minor_version 17
# Set to RC version if building RC, else %%{nil}
-%global rcsuf rc3
+#global rcsuf rc3
%{?rcsuf:%global relsuf .%{rcsuf}}
%{?rcsuf:%global versuf -%{rcsuf}}
@@ -67,7 +67,7 @@
Name: %{orig_name}%{?name_suffix}
Version: %{major_version}.%{minor_version}.0
-Release: 0.4%{?relsuf}%{?dist}
+Release: 1%{?relsuf}%{?dist}
Summary: Cross-platform make system
# most sources are BSD
@@ -493,6 +493,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
%changelog
+* Tue Mar 24 2020 Rex Dieter <rdieter(a)fedoraproject.org> - 3.17.0-1
+- Update to cmake-3.17.0
+
* Fri Mar 13 2020 Bjrn Esser <besser82(a)fedoraproject.org> - 3.17.0-0.4.rc3
- Update to 3.17.0-rc3
diff --git a/sources b/sources
index 07317a8..fa199f6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cmake-3.17.0-rc3.tar.gz) = db37a74fa5750a4796b6c50e024d0ef739fa1ddce6f9ee63955c4cf2049c47e571fb0bb9141cfbf49df654a88a4162f48b5aa6c15ee05dcfe09b3eccbf06e907
+SHA512 (cmake-3.17.0.tar.gz) = f09440681e0c414f5ca669f3aeba6666d09e0642f30a2e12c3199e7fb3da95a7dd17994fc54475c49638c37f0502ea0a2d8da0f9098805f11088ba7b299bf72a
commit f8c1c1d47b0d4242244df4f1ae7f15754f8f01cc
Author: Bjrn Esser <besser82(a)fedoraproject.org>
Date: Fri Mar 13 11:28:59 2020 +0100
Update to 3.17.0-rc3
diff --git a/cmake.spec b/cmake.spec
index f17b01f..9260051 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -57,7 +57,7 @@
%global major_version 3
%global minor_version 17
# Set to RC version if building RC, else %%{nil}
-%global rcsuf rc2
+%global rcsuf rc3
%{?rcsuf:%global relsuf .%{rcsuf}}
%{?rcsuf:%global versuf -%{rcsuf}}
@@ -67,7 +67,7 @@
Name: %{orig_name}%{?name_suffix}
Version: %{major_version}.%{minor_version}.0
-Release: 0.3%{?relsuf}%{?dist}
+Release: 0.4%{?relsuf}%{?dist}
Summary: Cross-platform make system
# most sources are BSD
@@ -493,6 +493,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
%changelog
+* Fri Mar 13 2020 Bjrn Esser <besser82(a)fedoraproject.org> - 3.17.0-0.4.rc3
+- Update to 3.17.0-rc3
+
* Tue Mar 03 2020 Bjrn Esser <besser82(a)fedoraproject.org> - 3.17.0-0.3.rc2
- Update to 3.17.0-rc2
diff --git a/sources b/sources
index 245108f..07317a8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cmake-3.17.0-rc2.tar.gz) = c91040930a22c0b773ba3edaae6614fdae371214ed3eb44f124521a3201c5fdd0b67b170c46fc9d7b00fe053dbf2a7b7e9d984fde5ecf355eb18a2b5d38f8bb4
+SHA512 (cmake-3.17.0-rc3.tar.gz) = db37a74fa5750a4796b6c50e024d0ef739fa1ddce6f9ee63955c4cf2049c47e571fb0bb9141cfbf49df654a88a4162f48b5aa6c15ee05dcfe09b3eccbf06e907
commit 422d920ec78e61d8f69ba527ea6407ca63020e2b
Author: Bjrn Esser <besser82(a)fedoraproject.org>
Date: Tue Mar 3 12:14:25 2020 +0100
kwsys.testProcess-{4,5} are flaky on s390x
diff --git a/cmake.spec b/cmake.spec
index ced3632..f17b01f 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -417,6 +417,10 @@ pushd %{_vpath_builddir}
# CTestTestUpload require internet access
# CPackComponentsForAll-RPM-IgnoreGroup failing wih rpm 4.15 - https://gitlab.kitware.com/cmake/cmake/issues/19983
NO_TEST="CTestTestUpload|CPackComponentsForAll-RPM-IgnoreGroup"
+# kwsys.testProcess-{4,5} are flaky on s390x.
+%ifarch s390x
+NO_TEST="$NO_TEST|kwsys.testProcess-4|kwsys.testProcess-5"
+%endif
bin/ctest%{?name_suffix} %{?_smp_mflags} -V -E "$NO_TEST" --output-on-failure
# Keep an eye on failing tests
bin/ctest%{?name_suffix} %{?_smp_mflags} -V -R "$NO_TEST" --output-on-failure || :
commit e5db548e34c6f78e7e6e70217d5a3bf05d6a7e1c
Author: Bjrn Esser <besser82(a)fedoraproject.org>
Date: Tue Mar 3 10:58:17 2020 +0100
Update to 3.17.0-rc2
diff --git a/cmake.spec b/cmake.spec
index f916620..ced3632 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -57,7 +57,7 @@
%global major_version 3
%global minor_version 17
# Set to RC version if building RC, else %%{nil}
-%global rcsuf rc1
+%global rcsuf rc2
%{?rcsuf:%global relsuf .%{rcsuf}}
%{?rcsuf:%global versuf -%{rcsuf}}
@@ -67,7 +67,7 @@
Name: %{orig_name}%{?name_suffix}
Version: %{major_version}.%{minor_version}.0
-Release: 0.2%{?relsuf}%{?dist}
+Release: 0.3%{?relsuf}%{?dist}
Summary: Cross-platform make system
# most sources are BSD
@@ -489,6 +489,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
%changelog
+* Tue Mar 03 2020 Bjrn Esser <besser82(a)fedoraproject.org> - 3.17.0-0.3.rc2
+- Update to 3.17.0-rc2
+
* Thu Feb 27 2020 Orion Poplawski <orion(a)nwra.com> - 3.17.0-0.2.rc1
- Use python3 for rpm generators
- Use lowercase names for cmake provides in generator (in addition to old names)
diff --git a/sources b/sources
index 1e4a3c7..245108f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cmake-3.17.0-rc1.tar.gz) = 7ff9f21a488658275f61111241dca4e311441827edbc11f44dd4772e114e6f99cb0e3f85d8a8051a23783e7aa47e19683f83b5cf236e75ca9a9724ea9cb2a1c1
+SHA512 (cmake-3.17.0-rc2.tar.gz) = c91040930a22c0b773ba3edaae6614fdae371214ed3eb44f124521a3201c5fdd0b67b170c46fc9d7b00fe053dbf2a7b7e9d984fde5ecf355eb18a2b5d38f8bb4
commit 1bb4a5c968439e63bc3eebf9780f497f40d4b673
Author: Orion Poplawski <orion(a)nwra.com>
Date: Wed Feb 26 20:59:26 2020 -0700
Use python3 for rpm generators
Use lowercase names for cmake provides in generator (in addition to old names)
diff --git a/cmake.prov b/cmake.prov
index f569c23..58d3522 100644
--- a/cmake.prov
+++ b/cmake.prov
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# -*- coding:utf-8 -*-
#
# Copyright (C) 2015 Daniel Vrtil <dvratil(a)redhat.com>
@@ -37,9 +37,16 @@ class CMakeParser:
version = self.resolveCMakeModuleVersion(modulePath, cmakeModule, lowercase)
if version:
- print("cmake(%s) = %s" % (cmakeModule, version))
+ string = "cmake(" + cmakeModule + ") = " + version
else:
- print("cmake(%s)" % cmakeModule)
+ string = "cmake(" + cmakeModule + ")"
+ if string == string.lower():
+ print(string)
+ else:
+ # Temporarily print both variants to satisfy requires
+ # by the old version of this generator which made mistakes
+ print(string)
+ print(string.lower())
def parseCmakeModuleConfig(self, configFile):
diff --git a/cmake.req b/cmake.req
index 2a58ca3..9af5c44 100644
--- a/cmake.req
+++ b/cmake.req
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# -*- coding:utf-8 -*-
#
# Copyright (C) 2017 Bjrn Esser <besser82(a)fedoraproject.org>
diff --git a/cmake.spec b/cmake.spec
index 184b6a0..f916620 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -67,7 +67,7 @@
Name: %{orig_name}%{?name_suffix}
Version: %{major_version}.%{minor_version}.0
-Release: 0.1%{?relsuf}%{?dist}
+Release: 0.2%{?relsuf}%{?dist}
Summary: Cross-platform make system
# most sources are BSD
@@ -489,6 +489,10 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
%changelog
+* Thu Feb 27 2020 Orion Poplawski <orion(a)nwra.com> - 3.17.0-0.2.rc1
+- Use python3 for rpm generators
+- Use lowercase names for cmake provides in generator (in addition to old names)
+
* Mon Feb 17 2020 Bjrn Esser <besser82(a)fedoraproject.org> - 3.17.0-0.1.rc1
- Update to 3.17.0-rc1
commit 0d9eb67fedcc67744efcdae45c4c23997d1d5be1
Author: Bjrn Esser <besser82(a)fedoraproject.org>
Date: Tue Feb 18 00:02:09 2020 +0100
Fix release tag
diff --git a/cmake.spec b/cmake.spec
index 929c985..184b6a0 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -67,7 +67,7 @@
Name: %{orig_name}%{?name_suffix}
Version: %{major_version}.%{minor_version}.0
-Release: 1%{?relsuf}%{?dist}
+Release: 0.1%{?relsuf}%{?dist}
Summary: Cross-platform make system
# most sources are BSD
@@ -489,7 +489,7 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
%changelog
-* Mon Feb 17 2020 Bjrn Esser <besser82(a)fedoraproject.org> - 3.17.0-1.rc1
+* Mon Feb 17 2020 Bjrn Esser <besser82(a)fedoraproject.org> - 3.17.0-0.1.rc1
- Update to 3.17.0-rc1
* Wed Feb 05 2020 Bjrn Esser <besser82(a)fedoraproject.org> - 3.16.4-1
commit 1f31468bbd07ed01a53c4c3bb7fcf124e827ed83
Author: Bjrn Esser <besser82(a)fedoraproject.org>
Date: Mon Feb 17 22:47:31 2020 +0100
Update to 3.17.0-rc1
diff --git a/cmake.spec b/cmake.spec
index a618ce1..929c985 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -55,9 +55,9 @@
%{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}}
%global major_version 3
-%global minor_version 16
+%global minor_version 17
# Set to RC version if building RC, else %%{nil}
-#global rcsuf %%{nil}
+%global rcsuf rc1
%{?rcsuf:%global relsuf .%{rcsuf}}
%{?rcsuf:%global versuf -%{rcsuf}}
@@ -66,7 +66,7 @@
%global orig_name cmake
Name: %{orig_name}%{?name_suffix}
-Version: %{major_version}.%{minor_version}.4
+Version: %{major_version}.%{minor_version}.0
Release: 1%{?relsuf}%{?dist}
Summary: Cross-platform make system
@@ -489,6 +489,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
%changelog
+* Mon Feb 17 2020 Bjrn Esser <besser82(a)fedoraproject.org> - 3.17.0-1.rc1
+- Update to 3.17.0-rc1
+
* Wed Feb 05 2020 Bjrn Esser <besser82(a)fedoraproject.org> - 3.16.4-1
- Update to 3.16.4
diff --git a/sources b/sources
index 1541a44..1e4a3c7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cmake-3.16.4.tar.gz) = 4aa36608bac3b9e29ea765003cdc684733c025d7b18fbae057f3be1f726a159d4b0231b8b1be269206aa7dbd7177fe0110d5bac8d72fb0f6ad392bb284b1fce3
+SHA512 (cmake-3.17.0-rc1.tar.gz) = 7ff9f21a488658275f61111241dca4e311441827edbc11f44dd4772e114e6f99cb0e3f85d8a8051a23783e7aa47e19683f83b5cf236e75ca9a9724ea9cb2a1c1
commit 278c697be54bd13de56c5cbdecb2f5ab47eab26f
Author: Bjrn Esser <besser82(a)fedoraproject.org>
Date: Mon Feb 17 23:02:11 2020 +0100
Refresh patches
diff --git a/cmake-fedora-flag_release.patch b/cmake-fedora-flag_release.patch
index 4c03ff5..7b1ad64 100644
--- a/cmake-fedora-flag_release.patch
+++ b/cmake-fedora-flag_release.patch
@@ -1,7 +1,7 @@
-Index: cmake-3.14.0/Modules/Compiler/Absoft-Fortran.cmake
+Index: cmake-3.17.0-rc1/Modules/Compiler/Absoft-Fortran.cmake
===================================================================
---- cmake-3.14.0.orig/Modules/Compiler/Absoft-Fortran.cmake
-+++ cmake-3.14.0/Modules/Compiler/Absoft-Fortran.cmake
+--- cmake-3.17.0-rc1.orig/Modules/Compiler/Absoft-Fortran.cmake
++++ cmake-3.17.0-rc1/Modules/Compiler/Absoft-Fortran.cmake
@@ -1,7 +1,7 @@
string(APPEND CMAKE_Fortran_FLAGS_INIT " ")
string(APPEND CMAKE_Fortran_FLAGS_DEBUG_INIT " -g")
@@ -11,10 +11,10 @@ Index: cmake-3.14.0/Modules/Compiler/Absoft-Fortran.cmake
string(APPEND CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT " -O2 -g")
set(CMAKE_Fortran_MODDIR_FLAG "-YMOD_OUT_DIR=")
set(CMAKE_Fortran_MODPATH_FLAG "-p")
-Index: cmake-3.14.0/Modules/Compiler/G95-Fortran.cmake
+Index: cmake-3.17.0-rc1/Modules/Compiler/G95-Fortran.cmake
===================================================================
---- cmake-3.14.0.orig/Modules/Compiler/G95-Fortran.cmake
-+++ cmake-3.14.0/Modules/Compiler/G95-Fortran.cmake
+--- cmake-3.17.0-rc1.orig/Modules/Compiler/G95-Fortran.cmake
++++ cmake-3.17.0-rc1/Modules/Compiler/G95-Fortran.cmake
@@ -1,7 +1,7 @@
string(APPEND CMAKE_Fortran_FLAGS_INIT " ")
string(APPEND CMAKE_Fortran_FLAGS_DEBUG_INIT " -g")
@@ -24,11 +24,11 @@ Index: cmake-3.14.0/Modules/Compiler/G95-Fortran.cmake
string(APPEND CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT " -O2 -g")
set(CMAKE_Fortran_MODDIR_FLAG "-fmod=")
set(CMAKE_Fortran_VERBOSE_FLAG "-v")
-Index: cmake-3.14.0/Modules/Compiler/GNU.cmake
+Index: cmake-3.17.0-rc1/Modules/Compiler/GNU.cmake
===================================================================
---- cmake-3.14.0.orig/Modules/Compiler/GNU.cmake
-+++ cmake-3.14.0/Modules/Compiler/GNU.cmake
-@@ -50,7 +50,7 @@ macro(__compiler_gnu lang)
+--- cmake-3.17.0-rc1.orig/Modules/Compiler/GNU.cmake
++++ cmake-3.17.0-rc1/Modules/Compiler/GNU.cmake
+@@ -55,7 +55,7 @@ macro(__compiler_gnu lang)
string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g")
string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -Os -DNDEBUG")
@@ -37,10 +37,10 @@ Index: cmake-3.14.0/Modules/Compiler/GNU.cmake
string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG")
set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")
-Index: cmake-3.14.0/Modules/Compiler/GNU-Fortran.cmake
+Index: cmake-3.17.0-rc1/Modules/Compiler/GNU-Fortran.cmake
===================================================================
---- cmake-3.14.0.orig/Modules/Compiler/GNU-Fortran.cmake
-+++ cmake-3.14.0/Modules/Compiler/GNU-Fortran.cmake
+--- cmake-3.17.0-rc1.orig/Modules/Compiler/GNU-Fortran.cmake
++++ cmake-3.17.0-rc1/Modules/Compiler/GNU-Fortran.cmake
@@ -14,7 +14,7 @@ set(CMAKE_Fortran_POSTPROCESS_FLAG "-fpr
# No -DNDEBUG for Fortran.
@@ -50,10 +50,10 @@ Index: cmake-3.14.0/Modules/Compiler/GNU-Fortran.cmake
# No -isystem for Fortran because it will not find .mod files.
unset(CMAKE_INCLUDE_SYSTEM_FLAG_Fortran)
-Index: cmake-3.14.0/Modules/Compiler/Intel.cmake
+Index: cmake-3.17.0-rc1/Modules/Compiler/Intel.cmake
===================================================================
---- cmake-3.14.0.orig/Modules/Compiler/Intel.cmake
-+++ cmake-3.14.0/Modules/Compiler/Intel.cmake
+--- cmake-3.17.0-rc1.orig/Modules/Compiler/Intel.cmake
++++ cmake-3.17.0-rc1/Modules/Compiler/Intel.cmake
@@ -22,7 +22,7 @@ else()
string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g")
@@ -63,11 +63,11 @@ Index: cmake-3.14.0/Modules/Compiler/Intel.cmake
string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -g")
set(CMAKE_${lang}_COMPILER_PREDEFINES_COMMAND "${CMAKE_${lang}_COMPILER}")
-Index: cmake-3.14.0/Modules/Compiler/NVIDIA-CUDA.cmake
+Index: cmake-3.17.0-rc1/Modules/Compiler/NVIDIA-CUDA.cmake
===================================================================
---- cmake-3.14.0.orig/Modules/Compiler/NVIDIA-CUDA.cmake
-+++ cmake-3.14.0/Modules/Compiler/NVIDIA-CUDA.cmake
-@@ -10,7 +10,7 @@ if(NOT "x${CMAKE_CUDA_SIMULATE_ID}" STRE
+--- cmake-3.17.0-rc1.orig/Modules/Compiler/NVIDIA-CUDA.cmake
++++ cmake-3.17.0-rc1/Modules/Compiler/NVIDIA-CUDA.cmake
+@@ -36,7 +36,7 @@ if(NOT "x${CMAKE_CUDA_SIMULATE_ID}" STRE
set(CMAKE_SHARED_LIBRARY_CUDA_FLAGS -fPIC)
string(APPEND CMAKE_CUDA_FLAGS_INIT " ")
string(APPEND CMAKE_CUDA_FLAGS_DEBUG_INIT " -g")
@@ -76,10 +76,10 @@ Index: cmake-3.14.0/Modules/Compiler/NVIDIA-CUDA.cmake
string(APPEND CMAKE_CUDA_FLAGS_MINSIZEREL_INIT " -O1 -DNDEBUG")
string(APPEND CMAKE_CUDA_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG")
endif()
-Index: cmake-3.14.0/Modules/Compiler/PathScale.cmake
+Index: cmake-3.17.0-rc1/Modules/Compiler/PathScale.cmake
===================================================================
---- cmake-3.14.0.orig/Modules/Compiler/PathScale.cmake
-+++ cmake-3.14.0/Modules/Compiler/PathScale.cmake
+--- cmake-3.17.0-rc1.orig/Modules/Compiler/PathScale.cmake
++++ cmake-3.17.0-rc1/Modules/Compiler/PathScale.cmake
@@ -16,6 +16,6 @@ macro(__compiler_pathscale lang)
string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g -O0")
@@ -88,10 +88,10 @@ Index: cmake-3.14.0/Modules/Compiler/PathScale.cmake
+ string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O2")
string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -g -O2")
endmacro()
-Index: cmake-3.14.0/Modules/Compiler/PGI.cmake
+Index: cmake-3.17.0-rc1/Modules/Compiler/PGI.cmake
===================================================================
---- cmake-3.14.0.orig/Modules/Compiler/PGI.cmake
-+++ cmake-3.14.0/Modules/Compiler/PGI.cmake
+--- cmake-3.17.0-rc1.orig/Modules/Compiler/PGI.cmake
++++ cmake-3.17.0-rc1/Modules/Compiler/PGI.cmake
@@ -18,7 +18,7 @@ macro(__compiler_pgi lang)
string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g -O0")
@@ -101,10 +101,10 @@ Index: cmake-3.14.0/Modules/Compiler/PGI.cmake
string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -gopt")
if(CMAKE_HOST_WIN32)
-Index: cmake-3.14.0/Modules/Compiler/SunPro-ASM.cmake
+Index: cmake-3.17.0-rc1/Modules/Compiler/SunPro-ASM.cmake
===================================================================
---- cmake-3.14.0.orig/Modules/Compiler/SunPro-ASM.cmake
-+++ cmake-3.14.0/Modules/Compiler/SunPro-ASM.cmake
+--- cmake-3.17.0-rc1.orig/Modules/Compiler/SunPro-ASM.cmake
++++ cmake-3.17.0-rc1/Modules/Compiler/SunPro-ASM.cmake
@@ -11,7 +11,7 @@ set(CMAKE_SHARED_LIBRARY_SONAME_ASM_FLAG
string(APPEND CMAKE_ASM_FLAGS_INIT " ")
string(APPEND CMAKE_ASM_FLAGS_DEBUG_INIT " -g")
@@ -114,10 +114,10 @@ Index: cmake-3.14.0/Modules/Compiler/SunPro-ASM.cmake
string(APPEND CMAKE_ASM_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG")
# Initialize ASM link type selection flags. These flags are used when
-Index: cmake-3.14.0/Modules/Compiler/SunPro-C.cmake
+Index: cmake-3.17.0-rc1/Modules/Compiler/SunPro-C.cmake
===================================================================
---- cmake-3.14.0.orig/Modules/Compiler/SunPro-C.cmake
-+++ cmake-3.14.0/Modules/Compiler/SunPro-C.cmake
+--- cmake-3.17.0-rc1.orig/Modules/Compiler/SunPro-C.cmake
++++ cmake-3.17.0-rc1/Modules/Compiler/SunPro-C.cmake
@@ -19,7 +19,7 @@ set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "
string(APPEND CMAKE_C_FLAGS_INIT " ")
string(APPEND CMAKE_C_FLAGS_DEBUG_INIT " -g")
@@ -127,10 +127,10 @@ Index: cmake-3.14.0/Modules/Compiler/SunPro-C.cmake
string(APPEND CMAKE_C_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG")
set(CMAKE_DEPFILE_FLAGS_C "-xMD -xMF <DEPFILE>")
-Index: cmake-3.14.0/Modules/Compiler/SunPro-CXX.cmake
+Index: cmake-3.17.0-rc1/Modules/Compiler/SunPro-CXX.cmake
===================================================================
---- cmake-3.14.0.orig/Modules/Compiler/SunPro-CXX.cmake
-+++ cmake-3.14.0/Modules/Compiler/SunPro-CXX.cmake
+--- cmake-3.17.0-rc1.orig/Modules/Compiler/SunPro-CXX.cmake
++++ cmake-3.17.0-rc1/Modules/Compiler/SunPro-CXX.cmake
@@ -19,7 +19,7 @@ set(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG
string(APPEND CMAKE_CXX_FLAGS_INIT " ")
string(APPEND CMAKE_CXX_FLAGS_DEBUG_INIT " -g")
@@ -140,10 +140,10 @@ Index: cmake-3.14.0/Modules/Compiler/SunPro-CXX.cmake
string(APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG")
set(CMAKE_DEPFILE_FLAGS_CXX "-xMD -xMF <DEPFILE>")
-Index: cmake-3.14.0/Modules/Compiler/SunPro-Fortran.cmake
+Index: cmake-3.17.0-rc1/Modules/Compiler/SunPro-Fortran.cmake
===================================================================
---- cmake-3.14.0.orig/Modules/Compiler/SunPro-Fortran.cmake
-+++ cmake-3.14.0/Modules/Compiler/SunPro-Fortran.cmake
+--- cmake-3.17.0-rc1.orig/Modules/Compiler/SunPro-Fortran.cmake
++++ cmake-3.17.0-rc1/Modules/Compiler/SunPro-Fortran.cmake
@@ -17,7 +17,7 @@ set(CMAKE_EXECUTABLE_RUNTIME_Fortran_FLA
string(APPEND CMAKE_Fortran_FLAGS_INIT " ")
string(APPEND CMAKE_Fortran_FLAGS_DEBUG_INIT " -g")
@@ -153,3 +153,16 @@ Index: cmake-3.14.0/Modules/Compiler/SunPro-Fortran.cmake
string(APPEND CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG")
set(CMAKE_Fortran_MODDIR_FLAG "-moddir=")
set(CMAKE_Fortran_MODPATH_FLAG "-M")
+Index: cmake-3.17.0-rc1/Modules/Platform/Windows-Clang.cmake
+===================================================================
+--- cmake-3.17.0-rc1.orig/Modules/Platform/Windows-Clang.cmake
++++ cmake-3.17.0-rc1/Modules/Platform/Windows-Clang.cmake
+@@ -79,7 +79,7 @@ macro(__windows_compiler_clang_gnu lang)
+
+ string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g -Xclang -gcodeview -O0 ${__ADDED_FLAGS_DEBUG}")
+ string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -Os -DNDEBUG ${__ADDED_FLAGS}")
+- string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O3 -DNDEBUG ${__ADDED_FLAGS}")
++ string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O2 -DNDEBUG ${__ADDED_FLAGS}")
+ string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG -Xclang -gcodeview ${__ADDED_FLAGS}")
+ endif()
+ set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-isystem ")
diff --git a/cmake-findruby.patch b/cmake-findruby.patch
index ec28253..b5d4fae 100644
--- a/cmake-findruby.patch
+++ b/cmake-findruby.patch
@@ -1,6 +1,7 @@
-diff -up cmake-3.15.3/Modules/FindRuby.cmake.orig cmake-3.15.3/Modules/FindRuby.cmake
---- cmake-3.15.3/Modules/FindRuby.cmake.orig 2019-09-30 22:18:24.213679271 -0600
-+++ cmake-3.15.3/Modules/FindRuby.cmake 2019-09-30 22:19:24.177961574 -0600
+Index: cmake-3.17.0-rc1/Modules/FindRuby.cmake
+===================================================================
+--- cmake-3.17.0-rc1.orig/Modules/FindRuby.cmake
++++ cmake-3.17.0-rc1/Modules/FindRuby.cmake
@@ -110,14 +110,8 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSIO
_RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR)
_RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR)
diff --git a/cmake-mingw-dl.patch b/cmake-mingw-dl.patch
index a83e378..ef24234 100644
--- a/cmake-mingw-dl.patch
+++ b/cmake-mingw-dl.patch
@@ -1,9 +1,13 @@
-Index: cmake-3.14.0/Modules/Platform/Windows-GNU.cmake
+Index: cmake-3.17.0-rc1/Modules/Platform/Windows-GNU.cmake
===================================================================
---- cmake-3.14.0.orig/Modules/Platform/Windows-GNU.cmake
-+++ cmake-3.14.0/Modules/Platform/Windows-GNU.cmake
-@@ -28,9 +28,11 @@ if(MINGW)
- set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll" ".dll.a" ".a" ".lib")
+--- cmake-3.17.0-rc1.orig/Modules/Platform/Windows-GNU.cmake
++++ cmake-3.17.0-rc1/Modules/Platform/Windows-GNU.cmake
+@@ -25,12 +25,14 @@ endif()
+
+ if(MINGW)
+ set(CMAKE_FIND_LIBRARY_PREFIXES "lib" "")
+- set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll.a" ".a" ".lib")
++ set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll" ".dll.a" ".a" ".lib")
set(CMAKE_C_STANDARD_LIBRARIES_INIT "-lkernel32 -luser32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32")
set(CMAKE_CXX_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}")
+ set(CMAKE_DL_LIBS "dl")
4 years, 1 month
- 1
- 0
Architecture specific change in rpms/python39.git
by githook-noreply＠fedoraproject.org
The package rpms/python39.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/python39.git/commit/?id=f6b4d318e....
Change:
-%ifarch %{power64} %{arm}
Thanks.
Full change:
============
commit b89d4ad8e7f06b615d1470caeaf99d71e9fb3544
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Tue Mar 24 18:56:52 2020 +0100
Update to Python 3.9.0a5
Patch 102 is upstreamed (differently), added --with-platlibdir=%{_lib}
diff --git a/00001-rpath.patch b/00001-rpath.patch
index 19186c7..3819c31 100644
--- a/00001-rpath.patch
+++ b/00001-rpath.patch
@@ -1,4 +1,4 @@
-From 85a385ad599f6232286497b3c67b215b3f388c21 Mon Sep 17 00:00:00 2001
+From 5cca0c5e66319d1e7f431b31b2059593d0d581fd Mon Sep 17 00:00:00 2001
From: David Malcolm <dmalcolm(a)redhat.com>
Date: Wed, 13 Jan 2010 21:25:18 +0000
Subject: [PATCH] 00001: Fixup distutils/unixccompiler.py to remove standard
@@ -29,5 +29,5 @@ index d10a78da31..4df4b67810 100644
include_dirs=None, extra_preargs=None, extra_postargs=None):
fixed_args = self._fix_compile_args(None, macros, include_dirs)
--
-2.24.1
+2.26.0.rc2
diff --git a/00102-lib64.patch b/00102-lib64.patch
deleted file mode 100644
index 815058a..0000000
--- a/00102-lib64.patch
+++ /dev/null
@@ -1,261 +0,0 @@
-From de23a0cc0e2471d12aa82813e4fb6cf937ad1a51 Mon Sep 17 00:00:00 2001
-From: David Malcolm <dmalcolm(a)redhat.com>
-Date: Wed, 13 Jan 2010 21:25:18 +0000
-Subject: [PATCH] 00102: Change the various install paths to use /usr/lib64/
- instead or /usr/lib/
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Only used when "%{_lib}" == "lib64".
-
-Co-authored-by: David Malcolm <dmalcolm(a)redhat.com>
-Co-authored-by: Thomas Spura <tomspur(a)fedoraproject.org>
-Co-authored-by: Slavek Kabrda <bkabrda(a)redhat.com>
-Co-authored-by: Matej Stuchlik <mstuchli(a)redhat.com>
-Co-authored-by: Tomas Orsava <torsava(a)redhat.com>
-Co-authored-by: Charalampos Stratakis <cstratak(a)redhat.com>
-Co-authored-by: Petr Viktorin <pviktori(a)redhat.com>
-Co-authored-by: Miro Hronok <miro(a)hroncok.cz>
-Co-authored-by: Iryna Shcherbina <shcherbina.iryna(a)gmail.com>
----
- Lib/distutils/command/install.py | 4 ++--
- Lib/distutils/sysconfig.py | 6 +++++-
- Lib/distutils/tests/test_install.py | 3 ++-
- Lib/site.py | 4 ++++
- Lib/sysconfig.py | 12 ++++++------
- Lib/test/test_site.py | 4 ++--
- Makefile.pre.in | 2 +-
- Modules/getpath.c | 6 +++---
- configure | 4 ++--
- configure.ac | 4 ++--
- setup.py | 6 +++---
- 11 files changed, 32 insertions(+), 23 deletions(-)
-
-diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
-index c625c95bf7..ae4f915669 100644
---- a/Lib/distutils/command/install.py
-+++ b/Lib/distutils/command/install.py
-@@ -30,14 +30,14 @@ WINDOWS_SCHEME = {
- INSTALL_SCHEMES = {
- 'unix_prefix': {
- 'purelib': '$base/lib/python$py_version_short/site-packages',
-- 'platlib': '$platbase/lib/python$py_version_short/site-packages',
-+ 'platlib': '$platbase/lib64/python$py_version_short/site-packages',
- 'headers': '$base/include/python$py_version_short$abiflags/$dist_name',
- 'scripts': '$base/bin',
- 'data' : '$base',
- },
- 'unix_home': {
- 'purelib': '$base/lib/python',
-- 'platlib': '$base/lib/python',
-+ 'platlib': '$base/lib64/python',
- 'headers': '$base/include/python/$dist_name',
- 'scripts': '$base/bin',
- 'data' : '$base',
-diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
-index b51629eb94..9a4892a737 100644
---- a/Lib/distutils/sysconfig.py
-+++ b/Lib/distutils/sysconfig.py
-@@ -146,8 +146,12 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
- prefix = plat_specific and EXEC_PREFIX or PREFIX
-
- if os.name == "posix":
-+ if plat_specific or standard_lib:
-+ lib = "lib64"
-+ else:
-+ lib = "lib"
- libpython = os.path.join(prefix,
-- "lib", "python" + get_python_version())
-+ lib, "python" + get_python_version())
- if standard_lib:
- return libpython
- else:
-diff --git a/Lib/distutils/tests/test_install.py b/Lib/distutils/tests/test_install.py
-index 287ab1989e..d4c05e0ab1 100644
---- a/Lib/distutils/tests/test_install.py
-+++ b/Lib/distutils/tests/test_install.py
-@@ -57,8 +57,9 @@ class InstallTestCase(support.TempdirManager,
- self.assertEqual(got, expected)
-
- libdir = os.path.join(destination, "lib", "python")
-+ platlibdir = os.path.join(destination, "lib64", "python")
- check_path(cmd.install_lib, libdir)
-- check_path(cmd.install_platlib, libdir)
-+ check_path(cmd.install_platlib, platlibdir)
- check_path(cmd.install_purelib, libdir)
- check_path(cmd.install_headers,
- os.path.join(destination, "include", "python", "foopkg"))
-diff --git a/Lib/site.py b/Lib/site.py
-index 2c71798755..653c1d7203 100644
---- a/Lib/site.py
-+++ b/Lib/site.py
-@@ -335,11 +335,15 @@ def getsitepackages(prefixes=None):
- seen.add(prefix)
-
- if os.sep == '/':
-+ sitepackages.append(os.path.join(prefix, "lib64",
-+ "python" + sys.version[:3],
-+ "site-packages"))
- sitepackages.append(os.path.join(prefix, "lib",
- "python%d.%d" % sys.version_info[:2],
- "site-packages"))
- else:
- sitepackages.append(prefix)
-+ sitepackages.append(os.path.join(prefix, "lib64", "site-packages"))
- sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
- return sitepackages
-
-diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
-index 64cf1560d9..f66314b203 100644
---- a/Lib/sysconfig.py
-+++ b/Lib/sysconfig.py
-@@ -20,10 +20,10 @@ __all__ = [
-
- _INSTALL_SCHEMES = {
- 'posix_prefix': {
-- 'stdlib': '{installed_base}/lib/python{py_version_short}',
-- 'platstdlib': '{platbase}/lib/python{py_version_short}',
-+ 'stdlib': '{installed_base}/lib64/python{py_version_short}',
-+ 'platstdlib': '{platbase}/lib64/python{py_version_short}',
- 'purelib': '{base}/lib/python{py_version_short}/site-packages',
-- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
-+ 'platlib': '{platbase}/lib64/python{py_version_short}/site-packages',
- 'include':
- '{installed_base}/include/python{py_version_short}{abiflags}',
- 'platinclude':
-@@ -62,10 +62,10 @@ _INSTALL_SCHEMES = {
- 'data': '{userbase}',
- },
- 'posix_user': {
-- 'stdlib': '{userbase}/lib/python{py_version_short}',
-- 'platstdlib': '{userbase}/lib/python{py_version_short}',
-+ 'stdlib': '{userbase}/lib64/python{py_version_short}',
-+ 'platstdlib': '{userbase}/lib64/python{py_version_short}',
- 'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
-- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
-+ 'platlib': '{userbase}/lib64/python{py_version_short}/site-packages',
- 'include': '{userbase}/include/python{py_version_short}',
- 'scripts': '{userbase}/bin',
- 'data': '{userbase}',
-diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
-index 41c4229919..543c88432a 100644
---- a/Lib/test/test_site.py
-+++ b/Lib/test/test_site.py
-@@ -266,8 +266,8 @@ class HelperFunctionsTests(unittest.TestCase):
- dirs = site.getsitepackages()
- if os.sep == '/':
- # OS X, Linux, FreeBSD, etc
-- self.assertEqual(len(dirs), 1)
-- wanted = os.path.join('xoxo', 'lib',
-+ self.assertEqual(len(dirs), 2)
-+ wanted = os.path.join('xoxo', 'lib64',
- 'python%d.%d' % sys.version_info[:2],
- 'site-packages')
- self.assertEqual(dirs[0], wanted)
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 3199a1aa02..8dc55c158f 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -143,7 +143,7 @@ LIBDIR= @libdir@
- MANDIR= @mandir@
- INCLUDEDIR= @includedir@
- CONFINCLUDEDIR= $(exec_prefix)/include
--SCRIPTDIR= $(prefix)/lib
-+SCRIPTDIR= $(prefix)/lib64
- ABIFLAGS= @ABIFLAGS@
-
- # Detailed destination directories
-diff --git a/Modules/getpath.c b/Modules/getpath.c
-index 8632d1fe6d..09a818609e 100644
---- a/Modules/getpath.c
-+++ b/Modules/getpath.c
-@@ -810,7 +810,7 @@ calculate_exec_prefix(PyCalculatePath *calculate, _PyPathConfig *pathconfig)
- }
-
- calculate->exec_prefix = joinpath2(calculate->exec_prefix_macro,
-- L"lib/lib-dynload");
-+ L"lib64/lib-dynload");
- if (calculate->exec_prefix == NULL) {
- return _PyStatus_NO_MEMORY();
- }
-@@ -1284,7 +1284,7 @@ calculate_read_pyenv(PyCalculatePath *calculate)
- static PyStatus
- calculate_zip_path(PyCalculatePath *calculate)
- {
-- const wchar_t *lib_python = L"lib/python00.zip";
-+ const wchar_t *lib_python = L"lib64/python00.zip";
-
- if (calculate->prefix_found > 0) {
- /* Use the reduced prefix returned by Py_GetPrefix()
-@@ -1435,7 +1435,7 @@ calculate_init(PyCalculatePath *calculate, const PyConfig *config)
- return DECODE_LOCALE_ERR("VPATH macro", len);
- }
-
-- calculate->lib_python = Py_DecodeLocale("lib/python" VERSION, &len);
-+ calculate->lib_python = Py_DecodeLocale("lib64/python" VERSION, &len);
- if (!calculate->lib_python) {
- return DECODE_LOCALE_ERR("EXEC_PREFIX macro", len);
- }
-diff --git a/configure b/configure
-index 846116e112..aaadb30ef9 100755
---- a/configure
-+++ b/configure
-@@ -15233,9 +15233,9 @@ fi
-
-
- if test x$PLATFORM_TRIPLET = x; then
-- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}"
-+ LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}"
- else
-- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
-+ LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
- fi
-
-
-diff --git a/configure.ac b/configure.ac
-index 840caf352d..ac4a44bdb8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -4711,9 +4711,9 @@ fi
- dnl define LIBPL after ABIFLAGS and LDVERSION is defined.
- AC_SUBST(PY_ENABLE_SHARED)
- if test x$PLATFORM_TRIPLET = x; then
-- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}"
-+ LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}"
- else
-- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
-+ LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
- fi
- AC_SUBST(LIBPL)
-
-diff --git a/setup.py b/setup.py
-index 51e67fe4a5..bafa0bf99a 100644
---- a/setup.py
-+++ b/setup.py
-@@ -649,7 +649,7 @@ class PyBuildExt(build_ext):
- # directories (i.e. '.' and 'Include') must be first. See issue
- # 10520.
- if not CROSS_COMPILING:
-- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-+ add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')
- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
- # only change this for cross builds for 3.3, issues on Mageia
- if CROSS_COMPILING:
-@@ -955,11 +955,11 @@ class PyBuildExt(build_ext):
- elif curses_library:
- readline_libs.append(curses_library)
- elif self.compiler.find_library_file(self.lib_dirs +
-- ['/usr/lib/termcap'],
-+ ['/usr/lib64/termcap'],
- 'termcap'):
- readline_libs.append('termcap')
- self.add(Extension('readline', ['readline.c'],
-- library_dirs=['/usr/lib/termcap'],
-+ library_dirs=['/usr/lib64/termcap'],
- extra_link_args=readline_extra_link_args,
- libraries=readline_libs))
- else:
---
-2.24.1
-
diff --git a/00111-no-static-lib.patch b/00111-no-static-lib.patch
index ef7946f..39f6df8 100644
--- a/00111-no-static-lib.patch
+++ b/00111-no-static-lib.patch
@@ -1,4 +1,4 @@
-From c58e1db077a3d7502640d2e5863e683b281fcf7b Mon Sep 17 00:00:00 2001
+From d6d13e87c507c77211dbd340b159ca4410849f13 Mon Sep 17 00:00:00 2001
From: David Malcolm <dmalcolm(a)redhat.com>
Date: Mon, 18 Jan 2010 17:59:07 +0000
Subject: [PATCH] 00111: Don't try to build a libpythonMAJOR.MINOR.a
@@ -21,10 +21,10 @@ Co-authored-by: Miro Hronok <miro(a)hroncok.cz>
1 file changed, 2 insertions(+), 19 deletions(-)
diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 8dc55c158f..e1f021fbab 100644
+index caa1d37648..3178f16000 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -562,7 +562,7 @@ clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c
+@@ -563,7 +563,7 @@ clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c
$(PYTHON_FOR_REGEN) $(srcdir)/Tools/clinic/clinic.py --make --srcdir $(srcdir)
# Build the interpreter
@@ -33,7 +33,7 @@ index 8dc55c158f..e1f021fbab 100644
$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)
platform: $(BUILDPYTHON) pybuilddir.txt
-@@ -610,12 +610,6 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
+@@ -611,12 +611,6 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
@@ -46,7 +46,7 @@ index 8dc55c158f..e1f021fbab 100644
libpython$(LDVERSION).so: $(LIBRARY_OBJS) $(DTRACE_OBJS)
if test $(INSTSONAME) != $(LDLIBRARY); then \
$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM); \
-@@ -693,7 +687,7 @@ Makefile Modules/config.c: Makefile.pre \
+@@ -694,7 +688,7 @@ Makefile Modules/config.c: Makefile.pre \
@echo "The Makefile was updated, you may need to re-run make."
@@ -55,7 +55,7 @@ index 8dc55c158f..e1f021fbab 100644
$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)
############################################################################
-@@ -1567,17 +1561,6 @@ libainstall: @DEF_MAKE_RULE@ python-config
+@@ -1570,17 +1564,6 @@ libainstall: @DEF_MAKE_RULE@ python-config
else true; \
fi; \
done
@@ -74,5 +74,5 @@ index 8dc55c158f..e1f021fbab 100644
$(INSTALL_DATA) Programs/python.o $(DESTDIR)$(LIBPL)/python.o
$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
--
-2.24.1
+2.26.0.rc2
diff --git a/00189-use-rpm-wheels.patch b/00189-use-rpm-wheels.patch
index aaf370e..5b56674 100644
--- a/00189-use-rpm-wheels.patch
+++ b/00189-use-rpm-wheels.patch
@@ -1,4 +1,4 @@
-From 1e8c543d53d2aa0c92381c1e1995a58b57361bef Mon Sep 17 00:00:00 2001
+From 0eb96d45196adaa7dc1362590ae44ddfb175e29c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro(a)hroncok.cz>
Date: Wed, 15 Aug 2018 15:36:29 +0200
Subject: [PATCH] 00189: Instead of bundled wheels, use our RPM packaged wheels
@@ -9,15 +9,16 @@ We keep them in /usr/share/python-wheels
1 file changed, 22 insertions(+), 11 deletions(-)
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
-index 386ed6c25c..dae2ba22e4 100644
+index 545fce656f..f86992c90c 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
-@@ -1,19 +1,33 @@
+@@ -1,3 +1,5 @@
+import distutils.version
+import glob
import os
import os.path
import sys
+@@ -5,16 +7,28 @@ import runpy
import tempfile
from importlib import resources
@@ -50,7 +51,7 @@ index 386ed6c25c..dae2ba22e4 100644
_PROJECTS = [
("setuptools", _SETUPTOOLS_VERSION),
-@@ -98,13 +112,10 @@ def _bootstrap(*, root=None, upgrade=False, user=False,
+@@ -108,13 +122,10 @@ def _bootstrap(*, root=None, upgrade=False, user=False,
# additional paths that need added to sys.path
additional_paths = []
for project, version in _PROJECTS:
@@ -69,5 +70,5 @@ index 386ed6c25c..dae2ba22e4 100644
additional_paths.append(os.path.join(tmpdir, wheel_name))
--
-2.24.1
+2.26.0.rc2
diff --git a/00251-change-user-install-location.patch b/00251-change-user-install-location.patch
index 844f244..3f368c6 100644
--- a/00251-change-user-install-location.patch
+++ b/00251-change-user-install-location.patch
@@ -1,4 +1,4 @@
-From 0d3595ce9f30425aaceaf02c9adb6faa044db18d Mon Sep 17 00:00:00 2001
+From 792ba3f5ca938abfb276b6b938312b6af44619fb Mon Sep 17 00:00:00 2001
From: Michal Cyprian <m.cyprian(a)gmail.com>
Date: Mon, 26 Jun 2017 16:32:56 +0200
Subject: [PATCH] 00251: Change user install location
@@ -14,10 +14,10 @@ Fedora Change: https://fedoraproject.org/wiki/Changes/Making_sudo_pip_safe
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
-index ae4f915669..0e4fd5b74a 100644
+index aaa300efa9..f8d453912a 100644
--- a/Lib/distutils/command/install.py
+++ b/Lib/distutils/command/install.py
-@@ -418,8 +418,19 @@ class install(Command):
+@@ -419,8 +419,19 @@ class install(Command):
raise DistutilsOptionError(
"must not supply exec-prefix without prefix")
@@ -40,10 +40,10 @@ index ae4f915669..0e4fd5b74a 100644
else:
if self.exec_prefix is None:
diff --git a/Lib/site.py b/Lib/site.py
-index 653c1d7203..9098f5762f 100644
+index e981a14208..63e05ff2ad 100644
--- a/Lib/site.py
+++ b/Lib/site.py
-@@ -348,7 +348,14 @@ def getsitepackages(prefixes=None):
+@@ -353,7 +353,14 @@ def getsitepackages(prefixes=None):
return sitepackages
def addsitepackages(known_paths, prefixes=None):
@@ -60,5 +60,5 @@ index 653c1d7203..9098f5762f 100644
if os.path.isdir(sitedir):
addsitedir(sitedir, known_paths)
--
-2.24.1
+2.26.0.rc2
diff --git a/00274-fix-arch-names.patch b/00274-fix-arch-names.patch
index 692c5ef..0792468 100644
--- a/00274-fix-arch-names.patch
+++ b/00274-fix-arch-names.patch
@@ -1,4 +1,4 @@
-From 1da0d675508c66baafaca8cd811fb9ac7719c998 Mon Sep 17 00:00:00 2001
+From df0b3431e564d5f999086c060f1080b59338877a Mon Sep 17 00:00:00 2001
From: Petr Viktorin <pviktori(a)redhat.com>
Date: Mon, 28 Aug 2017 17:16:46 +0200
Subject: [PATCH] 00274: Upstream uses Debian-style architecture naming, change
@@ -29,7 +29,7 @@ index ba37cf99e2..52a9ec6662 100755
ppc64le | powerpc64little)
basic_machine=powerpc64le-unknown
diff --git a/configure.ac b/configure.ac
-index ac4a44bdb8..504618db12 100644
+index 8eed0151eb..73d3b136a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -759,9 +759,9 @@ cat >> conftest.c <<EOF
@@ -82,5 +82,5 @@ index ac4a44bdb8..504618db12 100644
s390x-linux-gnu
# elif defined(__s390__)
--
-2.24.1
+2.26.0.rc2
diff --git a/00328-pyc-timestamp-invalidation-mode.patch b/00328-pyc-timestamp-invalidation-mode.patch
index 7726bb4..a9db568 100644
--- a/00328-pyc-timestamp-invalidation-mode.patch
+++ b/00328-pyc-timestamp-invalidation-mode.patch
@@ -1,4 +1,4 @@
-From 662a4a0ab64b6801a5051b042ddc21224b9cd34e Mon Sep 17 00:00:00 2001
+From 7b5490ad6889846a944f4441eab5007875fcfc9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro(a)hroncok.cz>
Date: Thu, 11 Jul 2019 13:44:13 +0200
Subject: [PATCH] 00328: Restore pyc to TIMESTAMP invalidation mode as default
@@ -51,5 +51,5 @@ index d4a68c9320..ed09874023 100644
return wrapper
--
-2.24.1
+2.26.0.rc2
diff --git a/python39.spec b/python39.spec
index 7713d35..9eda2fe 100644
--- a/python39.spec
+++ b/python39.spec
@@ -14,7 +14,7 @@ URL: https://www.python.org/
# WARNING When rebasing to a new Python version,
# remember to update the python3-docs package as well
%global general_version %{pybasever}.0
-%global prerel a4
+%global prerel a5
%global upstream_version %{general_version}%{?prerel}
Version: %{general_version}%{?prerel:~%{prerel}}
Release: 1%{?dist}
@@ -232,12 +232,6 @@ Source11: idle3.appdata.xml
# Was Patch0 in ivazquez' python3000 specfile:
Patch1: 00001-rpath.patch
-# 00102 #
-# Change the various install paths to use /usr/lib64/ instead or /usr/lib
-# Only used when "%%{_lib}" == "lib64"
-# Not yet sent upstream.
-Patch102: 00102-lib64.patch
-
# 00111 #
# Patch the Makefile.pre.in so that the generated Makefile doesn't try to build
# a libpythonMAJOR.MINOR.a
@@ -604,10 +598,6 @@ rm -r Modules/expat
# Apply patches:
#
%patch1 -p1
-
-%if "%{_lib}" == "lib64"
-%patch102 -p1
-%endif
%patch111 -p1
%if %{with rpmwheels}
@@ -691,6 +681,7 @@ BuildPython() {
export DFLAGS=" "
%configure \
+ --with-platlibdir=%{_lib} \
--enable-ipv6 \
--enable-shared \
--with-computed-gotos=%{computed_gotos_flag} \
@@ -1575,6 +1566,9 @@ CheckPython optimized
# ======================================================
%changelog
+* Tue Mar 24 2020 Miro Hronok <mhroncok(a)redhat.com> - 3.9.0~a5-1
+- Update to Python 3.9.0a5
+
* Thu Feb 27 2020 Marcel Plch <mplch(a)redhat.com> - 3.9.0~a4-1
- Update to Python 3.9.0a4
diff --git a/sources b/sources
index 5f806d8..4fe3c2e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (Python-3.9.0a4.tar.xz) = 8f7ca0a891fb7e7868dfe5f040e9ceb7ce14d036bc5d9eae1493570c5a9631832e796a1972590c444d2347c585b0c8216345375dd1476b4da7bd47e187591afc
-SHA512 (Python-3.9.0a4.tar.xz.asc) = 67f55246d3cbe46a71aae2328b36452cc9c33191bbcae13abb083e63a7eb923c4db63731add04456c9cb657bf5126137e7047e90de3afdc24dd082d194aa8837
+SHA512 (Python-3.9.0a5.tar.xz) = b2f884a492eeb9fa7347c664bb6fd1dc3c25f663ebb4f9455b66540e12ce8da845c2ad4960999d5475625bc64c834f3cff28f61cd37881bdf53efa349c44bff3
+SHA512 (Python-3.9.0a5.tar.xz.asc) = c3988caedfa183af563a6fddabc16357863834ce2460ce05d7adaa78de76dc08c5bb6d078f10bb4f58775e1d4b5d9168f59319b488638010f6066c2c2a21a211
commit f6b4d318e9cd3350603505ea422495e6493fa378
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Fri Feb 28 18:34:31 2020 +0100
Enable https://fedoraproject.org/wiki/Changes/PythonNoSemanticInterpositionSpeedup on power and arm
https://bugzilla.redhat.com/show_bug.cgi?id=1795575 is "fixed for almost a month"
diff --git a/python39.spec b/python39.spec
index 9cc61a1..7713d35 100644
--- a/python39.spec
+++ b/python39.spec
@@ -64,12 +64,7 @@ License: Python
%bcond_without optimizations
# https://fedoraproject.org/wiki/Changes/PythonNoSemanticInterpositionSpeedup
-# Disabled on ppc64le and armv7hl: https://bugzilla.redhat.com/show_bug.cgi?id=1795575
-%ifarch %{power64} %{arm}
-%bcond_with no_semantic_interposition
-%else
%bcond_without no_semantic_interposition
-%endif
# Run the test suite in %%check
%bcond_without tests
4 years, 1 month
- 1
- 0
Architecture specific change in rpms/python39.git
by githook-noreply＠fedoraproject.org
The package rpms/python39.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/python39.git/commit/?id=f6b4d318e....
Change:
-%ifarch %{power64} %{arm}
Thanks.
Full change:
============
commit b89d4ad8e7f06b615d1470caeaf99d71e9fb3544
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Tue Mar 24 18:56:52 2020 +0100
Update to Python 3.9.0a5
Patch 102 is upstreamed (differently), added --with-platlibdir=%{_lib}
diff --git a/00001-rpath.patch b/00001-rpath.patch
index 19186c7..3819c31 100644
--- a/00001-rpath.patch
+++ b/00001-rpath.patch
@@ -1,4 +1,4 @@
-From 85a385ad599f6232286497b3c67b215b3f388c21 Mon Sep 17 00:00:00 2001
+From 5cca0c5e66319d1e7f431b31b2059593d0d581fd Mon Sep 17 00:00:00 2001
From: David Malcolm <dmalcolm(a)redhat.com>
Date: Wed, 13 Jan 2010 21:25:18 +0000
Subject: [PATCH] 00001: Fixup distutils/unixccompiler.py to remove standard
@@ -29,5 +29,5 @@ index d10a78da31..4df4b67810 100644
include_dirs=None, extra_preargs=None, extra_postargs=None):
fixed_args = self._fix_compile_args(None, macros, include_dirs)
--
-2.24.1
+2.26.0.rc2
diff --git a/00102-lib64.patch b/00102-lib64.patch
deleted file mode 100644
index 815058a..0000000
--- a/00102-lib64.patch
+++ /dev/null
@@ -1,261 +0,0 @@
-From de23a0cc0e2471d12aa82813e4fb6cf937ad1a51 Mon Sep 17 00:00:00 2001
-From: David Malcolm <dmalcolm(a)redhat.com>
-Date: Wed, 13 Jan 2010 21:25:18 +0000
-Subject: [PATCH] 00102: Change the various install paths to use /usr/lib64/
- instead or /usr/lib/
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Only used when "%{_lib}" == "lib64".
-
-Co-authored-by: David Malcolm <dmalcolm(a)redhat.com>
-Co-authored-by: Thomas Spura <tomspur(a)fedoraproject.org>
-Co-authored-by: Slavek Kabrda <bkabrda(a)redhat.com>
-Co-authored-by: Matej Stuchlik <mstuchli(a)redhat.com>
-Co-authored-by: Tomas Orsava <torsava(a)redhat.com>
-Co-authored-by: Charalampos Stratakis <cstratak(a)redhat.com>
-Co-authored-by: Petr Viktorin <pviktori(a)redhat.com>
-Co-authored-by: Miro Hronok <miro(a)hroncok.cz>
-Co-authored-by: Iryna Shcherbina <shcherbina.iryna(a)gmail.com>
----
- Lib/distutils/command/install.py | 4 ++--
- Lib/distutils/sysconfig.py | 6 +++++-
- Lib/distutils/tests/test_install.py | 3 ++-
- Lib/site.py | 4 ++++
- Lib/sysconfig.py | 12 ++++++------
- Lib/test/test_site.py | 4 ++--
- Makefile.pre.in | 2 +-
- Modules/getpath.c | 6 +++---
- configure | 4 ++--
- configure.ac | 4 ++--
- setup.py | 6 +++---
- 11 files changed, 32 insertions(+), 23 deletions(-)
-
-diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
-index c625c95bf7..ae4f915669 100644
---- a/Lib/distutils/command/install.py
-+++ b/Lib/distutils/command/install.py
-@@ -30,14 +30,14 @@ WINDOWS_SCHEME = {
- INSTALL_SCHEMES = {
- 'unix_prefix': {
- 'purelib': '$base/lib/python$py_version_short/site-packages',
-- 'platlib': '$platbase/lib/python$py_version_short/site-packages',
-+ 'platlib': '$platbase/lib64/python$py_version_short/site-packages',
- 'headers': '$base/include/python$py_version_short$abiflags/$dist_name',
- 'scripts': '$base/bin',
- 'data' : '$base',
- },
- 'unix_home': {
- 'purelib': '$base/lib/python',
-- 'platlib': '$base/lib/python',
-+ 'platlib': '$base/lib64/python',
- 'headers': '$base/include/python/$dist_name',
- 'scripts': '$base/bin',
- 'data' : '$base',
-diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
-index b51629eb94..9a4892a737 100644
---- a/Lib/distutils/sysconfig.py
-+++ b/Lib/distutils/sysconfig.py
-@@ -146,8 +146,12 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
- prefix = plat_specific and EXEC_PREFIX or PREFIX
-
- if os.name == "posix":
-+ if plat_specific or standard_lib:
-+ lib = "lib64"
-+ else:
-+ lib = "lib"
- libpython = os.path.join(prefix,
-- "lib", "python" + get_python_version())
-+ lib, "python" + get_python_version())
- if standard_lib:
- return libpython
- else:
-diff --git a/Lib/distutils/tests/test_install.py b/Lib/distutils/tests/test_install.py
-index 287ab1989e..d4c05e0ab1 100644
---- a/Lib/distutils/tests/test_install.py
-+++ b/Lib/distutils/tests/test_install.py
-@@ -57,8 +57,9 @@ class InstallTestCase(support.TempdirManager,
- self.assertEqual(got, expected)
-
- libdir = os.path.join(destination, "lib", "python")
-+ platlibdir = os.path.join(destination, "lib64", "python")
- check_path(cmd.install_lib, libdir)
-- check_path(cmd.install_platlib, libdir)
-+ check_path(cmd.install_platlib, platlibdir)
- check_path(cmd.install_purelib, libdir)
- check_path(cmd.install_headers,
- os.path.join(destination, "include", "python", "foopkg"))
-diff --git a/Lib/site.py b/Lib/site.py
-index 2c71798755..653c1d7203 100644
---- a/Lib/site.py
-+++ b/Lib/site.py
-@@ -335,11 +335,15 @@ def getsitepackages(prefixes=None):
- seen.add(prefix)
-
- if os.sep == '/':
-+ sitepackages.append(os.path.join(prefix, "lib64",
-+ "python" + sys.version[:3],
-+ "site-packages"))
- sitepackages.append(os.path.join(prefix, "lib",
- "python%d.%d" % sys.version_info[:2],
- "site-packages"))
- else:
- sitepackages.append(prefix)
-+ sitepackages.append(os.path.join(prefix, "lib64", "site-packages"))
- sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
- return sitepackages
-
-diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
-index 64cf1560d9..f66314b203 100644
---- a/Lib/sysconfig.py
-+++ b/Lib/sysconfig.py
-@@ -20,10 +20,10 @@ __all__ = [
-
- _INSTALL_SCHEMES = {
- 'posix_prefix': {
-- 'stdlib': '{installed_base}/lib/python{py_version_short}',
-- 'platstdlib': '{platbase}/lib/python{py_version_short}',
-+ 'stdlib': '{installed_base}/lib64/python{py_version_short}',
-+ 'platstdlib': '{platbase}/lib64/python{py_version_short}',
- 'purelib': '{base}/lib/python{py_version_short}/site-packages',
-- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
-+ 'platlib': '{platbase}/lib64/python{py_version_short}/site-packages',
- 'include':
- '{installed_base}/include/python{py_version_short}{abiflags}',
- 'platinclude':
-@@ -62,10 +62,10 @@ _INSTALL_SCHEMES = {
- 'data': '{userbase}',
- },
- 'posix_user': {
-- 'stdlib': '{userbase}/lib/python{py_version_short}',
-- 'platstdlib': '{userbase}/lib/python{py_version_short}',
-+ 'stdlib': '{userbase}/lib64/python{py_version_short}',
-+ 'platstdlib': '{userbase}/lib64/python{py_version_short}',
- 'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
-- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
-+ 'platlib': '{userbase}/lib64/python{py_version_short}/site-packages',
- 'include': '{userbase}/include/python{py_version_short}',
- 'scripts': '{userbase}/bin',
- 'data': '{userbase}',
-diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
-index 41c4229919..543c88432a 100644
---- a/Lib/test/test_site.py
-+++ b/Lib/test/test_site.py
-@@ -266,8 +266,8 @@ class HelperFunctionsTests(unittest.TestCase):
- dirs = site.getsitepackages()
- if os.sep == '/':
- # OS X, Linux, FreeBSD, etc
-- self.assertEqual(len(dirs), 1)
-- wanted = os.path.join('xoxo', 'lib',
-+ self.assertEqual(len(dirs), 2)
-+ wanted = os.path.join('xoxo', 'lib64',
- 'python%d.%d' % sys.version_info[:2],
- 'site-packages')
- self.assertEqual(dirs[0], wanted)
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 3199a1aa02..8dc55c158f 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -143,7 +143,7 @@ LIBDIR= @libdir@
- MANDIR= @mandir@
- INCLUDEDIR= @includedir@
- CONFINCLUDEDIR= $(exec_prefix)/include
--SCRIPTDIR= $(prefix)/lib
-+SCRIPTDIR= $(prefix)/lib64
- ABIFLAGS= @ABIFLAGS@
-
- # Detailed destination directories
-diff --git a/Modules/getpath.c b/Modules/getpath.c
-index 8632d1fe6d..09a818609e 100644
---- a/Modules/getpath.c
-+++ b/Modules/getpath.c
-@@ -810,7 +810,7 @@ calculate_exec_prefix(PyCalculatePath *calculate, _PyPathConfig *pathconfig)
- }
-
- calculate->exec_prefix = joinpath2(calculate->exec_prefix_macro,
-- L"lib/lib-dynload");
-+ L"lib64/lib-dynload");
- if (calculate->exec_prefix == NULL) {
- return _PyStatus_NO_MEMORY();
- }
-@@ -1284,7 +1284,7 @@ calculate_read_pyenv(PyCalculatePath *calculate)
- static PyStatus
- calculate_zip_path(PyCalculatePath *calculate)
- {
-- const wchar_t *lib_python = L"lib/python00.zip";
-+ const wchar_t *lib_python = L"lib64/python00.zip";
-
- if (calculate->prefix_found > 0) {
- /* Use the reduced prefix returned by Py_GetPrefix()
-@@ -1435,7 +1435,7 @@ calculate_init(PyCalculatePath *calculate, const PyConfig *config)
- return DECODE_LOCALE_ERR("VPATH macro", len);
- }
-
-- calculate->lib_python = Py_DecodeLocale("lib/python" VERSION, &len);
-+ calculate->lib_python = Py_DecodeLocale("lib64/python" VERSION, &len);
- if (!calculate->lib_python) {
- return DECODE_LOCALE_ERR("EXEC_PREFIX macro", len);
- }
-diff --git a/configure b/configure
-index 846116e112..aaadb30ef9 100755
---- a/configure
-+++ b/configure
-@@ -15233,9 +15233,9 @@ fi
-
-
- if test x$PLATFORM_TRIPLET = x; then
-- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}"
-+ LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}"
- else
-- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
-+ LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
- fi
-
-
-diff --git a/configure.ac b/configure.ac
-index 840caf352d..ac4a44bdb8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -4711,9 +4711,9 @@ fi
- dnl define LIBPL after ABIFLAGS and LDVERSION is defined.
- AC_SUBST(PY_ENABLE_SHARED)
- if test x$PLATFORM_TRIPLET = x; then
-- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}"
-+ LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}"
- else
-- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
-+ LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
- fi
- AC_SUBST(LIBPL)
-
-diff --git a/setup.py b/setup.py
-index 51e67fe4a5..bafa0bf99a 100644
---- a/setup.py
-+++ b/setup.py
-@@ -649,7 +649,7 @@ class PyBuildExt(build_ext):
- # directories (i.e. '.' and 'Include') must be first. See issue
- # 10520.
- if not CROSS_COMPILING:
-- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-+ add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')
- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
- # only change this for cross builds for 3.3, issues on Mageia
- if CROSS_COMPILING:
-@@ -955,11 +955,11 @@ class PyBuildExt(build_ext):
- elif curses_library:
- readline_libs.append(curses_library)
- elif self.compiler.find_library_file(self.lib_dirs +
-- ['/usr/lib/termcap'],
-+ ['/usr/lib64/termcap'],
- 'termcap'):
- readline_libs.append('termcap')
- self.add(Extension('readline', ['readline.c'],
-- library_dirs=['/usr/lib/termcap'],
-+ library_dirs=['/usr/lib64/termcap'],
- extra_link_args=readline_extra_link_args,
- libraries=readline_libs))
- else:
---
-2.24.1
-
diff --git a/00111-no-static-lib.patch b/00111-no-static-lib.patch
index ef7946f..39f6df8 100644
--- a/00111-no-static-lib.patch
+++ b/00111-no-static-lib.patch
@@ -1,4 +1,4 @@
-From c58e1db077a3d7502640d2e5863e683b281fcf7b Mon Sep 17 00:00:00 2001
+From d6d13e87c507c77211dbd340b159ca4410849f13 Mon Sep 17 00:00:00 2001
From: David Malcolm <dmalcolm(a)redhat.com>
Date: Mon, 18 Jan 2010 17:59:07 +0000
Subject: [PATCH] 00111: Don't try to build a libpythonMAJOR.MINOR.a
@@ -21,10 +21,10 @@ Co-authored-by: Miro Hronok <miro(a)hroncok.cz>
1 file changed, 2 insertions(+), 19 deletions(-)
diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 8dc55c158f..e1f021fbab 100644
+index caa1d37648..3178f16000 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -562,7 +562,7 @@ clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c
+@@ -563,7 +563,7 @@ clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c
$(PYTHON_FOR_REGEN) $(srcdir)/Tools/clinic/clinic.py --make --srcdir $(srcdir)
# Build the interpreter
@@ -33,7 +33,7 @@ index 8dc55c158f..e1f021fbab 100644
$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)
platform: $(BUILDPYTHON) pybuilddir.txt
-@@ -610,12 +610,6 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
+@@ -611,12 +611,6 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
@@ -46,7 +46,7 @@ index 8dc55c158f..e1f021fbab 100644
libpython$(LDVERSION).so: $(LIBRARY_OBJS) $(DTRACE_OBJS)
if test $(INSTSONAME) != $(LDLIBRARY); then \
$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM); \
-@@ -693,7 +687,7 @@ Makefile Modules/config.c: Makefile.pre \
+@@ -694,7 +688,7 @@ Makefile Modules/config.c: Makefile.pre \
@echo "The Makefile was updated, you may need to re-run make."
@@ -55,7 +55,7 @@ index 8dc55c158f..e1f021fbab 100644
$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)
############################################################################
-@@ -1567,17 +1561,6 @@ libainstall: @DEF_MAKE_RULE@ python-config
+@@ -1570,17 +1564,6 @@ libainstall: @DEF_MAKE_RULE@ python-config
else true; \
fi; \
done
@@ -74,5 +74,5 @@ index 8dc55c158f..e1f021fbab 100644
$(INSTALL_DATA) Programs/python.o $(DESTDIR)$(LIBPL)/python.o
$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
--
-2.24.1
+2.26.0.rc2
diff --git a/00189-use-rpm-wheels.patch b/00189-use-rpm-wheels.patch
index aaf370e..5b56674 100644
--- a/00189-use-rpm-wheels.patch
+++ b/00189-use-rpm-wheels.patch
@@ -1,4 +1,4 @@
-From 1e8c543d53d2aa0c92381c1e1995a58b57361bef Mon Sep 17 00:00:00 2001
+From 0eb96d45196adaa7dc1362590ae44ddfb175e29c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro(a)hroncok.cz>
Date: Wed, 15 Aug 2018 15:36:29 +0200
Subject: [PATCH] 00189: Instead of bundled wheels, use our RPM packaged wheels
@@ -9,15 +9,16 @@ We keep them in /usr/share/python-wheels
1 file changed, 22 insertions(+), 11 deletions(-)
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
-index 386ed6c25c..dae2ba22e4 100644
+index 545fce656f..f86992c90c 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
-@@ -1,19 +1,33 @@
+@@ -1,3 +1,5 @@
+import distutils.version
+import glob
import os
import os.path
import sys
+@@ -5,16 +7,28 @@ import runpy
import tempfile
from importlib import resources
@@ -50,7 +51,7 @@ index 386ed6c25c..dae2ba22e4 100644
_PROJECTS = [
("setuptools", _SETUPTOOLS_VERSION),
-@@ -98,13 +112,10 @@ def _bootstrap(*, root=None, upgrade=False, user=False,
+@@ -108,13 +122,10 @@ def _bootstrap(*, root=None, upgrade=False, user=False,
# additional paths that need added to sys.path
additional_paths = []
for project, version in _PROJECTS:
@@ -69,5 +70,5 @@ index 386ed6c25c..dae2ba22e4 100644
additional_paths.append(os.path.join(tmpdir, wheel_name))
--
-2.24.1
+2.26.0.rc2
diff --git a/00251-change-user-install-location.patch b/00251-change-user-install-location.patch
index 844f244..3f368c6 100644
--- a/00251-change-user-install-location.patch
+++ b/00251-change-user-install-location.patch
@@ -1,4 +1,4 @@
-From 0d3595ce9f30425aaceaf02c9adb6faa044db18d Mon Sep 17 00:00:00 2001
+From 792ba3f5ca938abfb276b6b938312b6af44619fb Mon Sep 17 00:00:00 2001
From: Michal Cyprian <m.cyprian(a)gmail.com>
Date: Mon, 26 Jun 2017 16:32:56 +0200
Subject: [PATCH] 00251: Change user install location
@@ -14,10 +14,10 @@ Fedora Change: https://fedoraproject.org/wiki/Changes/Making_sudo_pip_safe
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
-index ae4f915669..0e4fd5b74a 100644
+index aaa300efa9..f8d453912a 100644
--- a/Lib/distutils/command/install.py
+++ b/Lib/distutils/command/install.py
-@@ -418,8 +418,19 @@ class install(Command):
+@@ -419,8 +419,19 @@ class install(Command):
raise DistutilsOptionError(
"must not supply exec-prefix without prefix")
@@ -40,10 +40,10 @@ index ae4f915669..0e4fd5b74a 100644
else:
if self.exec_prefix is None:
diff --git a/Lib/site.py b/Lib/site.py
-index 653c1d7203..9098f5762f 100644
+index e981a14208..63e05ff2ad 100644
--- a/Lib/site.py
+++ b/Lib/site.py
-@@ -348,7 +348,14 @@ def getsitepackages(prefixes=None):
+@@ -353,7 +353,14 @@ def getsitepackages(prefixes=None):
return sitepackages
def addsitepackages(known_paths, prefixes=None):
@@ -60,5 +60,5 @@ index 653c1d7203..9098f5762f 100644
if os.path.isdir(sitedir):
addsitedir(sitedir, known_paths)
--
-2.24.1
+2.26.0.rc2
diff --git a/00274-fix-arch-names.patch b/00274-fix-arch-names.patch
index 692c5ef..0792468 100644
--- a/00274-fix-arch-names.patch
+++ b/00274-fix-arch-names.patch
@@ -1,4 +1,4 @@
-From 1da0d675508c66baafaca8cd811fb9ac7719c998 Mon Sep 17 00:00:00 2001
+From df0b3431e564d5f999086c060f1080b59338877a Mon Sep 17 00:00:00 2001
From: Petr Viktorin <pviktori(a)redhat.com>
Date: Mon, 28 Aug 2017 17:16:46 +0200
Subject: [PATCH] 00274: Upstream uses Debian-style architecture naming, change
@@ -29,7 +29,7 @@ index ba37cf99e2..52a9ec6662 100755
ppc64le | powerpc64little)
basic_machine=powerpc64le-unknown
diff --git a/configure.ac b/configure.ac
-index ac4a44bdb8..504618db12 100644
+index 8eed0151eb..73d3b136a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -759,9 +759,9 @@ cat >> conftest.c <<EOF
@@ -82,5 +82,5 @@ index ac4a44bdb8..504618db12 100644
s390x-linux-gnu
# elif defined(__s390__)
--
-2.24.1
+2.26.0.rc2
diff --git a/00328-pyc-timestamp-invalidation-mode.patch b/00328-pyc-timestamp-invalidation-mode.patch
index 7726bb4..a9db568 100644
--- a/00328-pyc-timestamp-invalidation-mode.patch
+++ b/00328-pyc-timestamp-invalidation-mode.patch
@@ -1,4 +1,4 @@
-From 662a4a0ab64b6801a5051b042ddc21224b9cd34e Mon Sep 17 00:00:00 2001
+From 7b5490ad6889846a944f4441eab5007875fcfc9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro(a)hroncok.cz>
Date: Thu, 11 Jul 2019 13:44:13 +0200
Subject: [PATCH] 00328: Restore pyc to TIMESTAMP invalidation mode as default
@@ -51,5 +51,5 @@ index d4a68c9320..ed09874023 100644
return wrapper
--
-2.24.1
+2.26.0.rc2
diff --git a/python39.spec b/python39.spec
index 7713d35..9eda2fe 100644
--- a/python39.spec
+++ b/python39.spec
@@ -14,7 +14,7 @@ URL: https://www.python.org/
# WARNING When rebasing to a new Python version,
# remember to update the python3-docs package as well
%global general_version %{pybasever}.0
-%global prerel a4
+%global prerel a5
%global upstream_version %{general_version}%{?prerel}
Version: %{general_version}%{?prerel:~%{prerel}}
Release: 1%{?dist}
@@ -232,12 +232,6 @@ Source11: idle3.appdata.xml
# Was Patch0 in ivazquez' python3000 specfile:
Patch1: 00001-rpath.patch
-# 00102 #
-# Change the various install paths to use /usr/lib64/ instead or /usr/lib
-# Only used when "%%{_lib}" == "lib64"
-# Not yet sent upstream.
-Patch102: 00102-lib64.patch
-
# 00111 #
# Patch the Makefile.pre.in so that the generated Makefile doesn't try to build
# a libpythonMAJOR.MINOR.a
@@ -604,10 +598,6 @@ rm -r Modules/expat
# Apply patches:
#
%patch1 -p1
-
-%if "%{_lib}" == "lib64"
-%patch102 -p1
-%endif
%patch111 -p1
%if %{with rpmwheels}
@@ -691,6 +681,7 @@ BuildPython() {
export DFLAGS=" "
%configure \
+ --with-platlibdir=%{_lib} \
--enable-ipv6 \
--enable-shared \
--with-computed-gotos=%{computed_gotos_flag} \
@@ -1575,6 +1566,9 @@ CheckPython optimized
# ======================================================
%changelog
+* Tue Mar 24 2020 Miro Hronok <mhroncok(a)redhat.com> - 3.9.0~a5-1
+- Update to Python 3.9.0a5
+
* Thu Feb 27 2020 Marcel Plch <mplch(a)redhat.com> - 3.9.0~a4-1
- Update to Python 3.9.0a4
diff --git a/sources b/sources
index 5f806d8..4fe3c2e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (Python-3.9.0a4.tar.xz) = 8f7ca0a891fb7e7868dfe5f040e9ceb7ce14d036bc5d9eae1493570c5a9631832e796a1972590c444d2347c585b0c8216345375dd1476b4da7bd47e187591afc
-SHA512 (Python-3.9.0a4.tar.xz.asc) = 67f55246d3cbe46a71aae2328b36452cc9c33191bbcae13abb083e63a7eb923c4db63731add04456c9cb657bf5126137e7047e90de3afdc24dd082d194aa8837
+SHA512 (Python-3.9.0a5.tar.xz) = b2f884a492eeb9fa7347c664bb6fd1dc3c25f663ebb4f9455b66540e12ce8da845c2ad4960999d5475625bc64c834f3cff28f61cd37881bdf53efa349c44bff3
+SHA512 (Python-3.9.0a5.tar.xz.asc) = c3988caedfa183af563a6fddabc16357863834ce2460ce05d7adaa78de76dc08c5bb6d078f10bb4f58775e1d4b5d9168f59319b488638010f6066c2c2a21a211
commit f6b4d318e9cd3350603505ea422495e6493fa378
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Fri Feb 28 18:34:31 2020 +0100
Enable https://fedoraproject.org/wiki/Changes/PythonNoSemanticInterpositionSpeedup on power and arm
https://bugzilla.redhat.com/show_bug.cgi?id=1795575 is "fixed for almost a month"
diff --git a/python39.spec b/python39.spec
index 9cc61a1..7713d35 100644
--- a/python39.spec
+++ b/python39.spec
@@ -64,12 +64,7 @@ License: Python
%bcond_without optimizations
# https://fedoraproject.org/wiki/Changes/PythonNoSemanticInterpositionSpeedup
-# Disabled on ppc64le and armv7hl: https://bugzilla.redhat.com/show_bug.cgi?id=1795575
-%ifarch %{power64} %{arm}
-%bcond_with no_semantic_interposition
-%else
%bcond_without no_semantic_interposition
-%endif
# Run the test suite in %%check
%bcond_without tests
4 years, 1 month
- 1
- 0
Architecture specific change in rpms/python39.git
by githook-noreply＠fedoraproject.org
The package rpms/python39.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/python39.git/commit/?id=f6b4d318e....
Change:
-%ifarch %{power64} %{arm}
Thanks.
Full change:
============
commit b89d4ad8e7f06b615d1470caeaf99d71e9fb3544
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Tue Mar 24 18:56:52 2020 +0100
Update to Python 3.9.0a5
Patch 102 is upstreamed (differently), added --with-platlibdir=%{_lib}
diff --git a/00001-rpath.patch b/00001-rpath.patch
index 19186c7..3819c31 100644
--- a/00001-rpath.patch
+++ b/00001-rpath.patch
@@ -1,4 +1,4 @@
-From 85a385ad599f6232286497b3c67b215b3f388c21 Mon Sep 17 00:00:00 2001
+From 5cca0c5e66319d1e7f431b31b2059593d0d581fd Mon Sep 17 00:00:00 2001
From: David Malcolm <dmalcolm(a)redhat.com>
Date: Wed, 13 Jan 2010 21:25:18 +0000
Subject: [PATCH] 00001: Fixup distutils/unixccompiler.py to remove standard
@@ -29,5 +29,5 @@ index d10a78da31..4df4b67810 100644
include_dirs=None, extra_preargs=None, extra_postargs=None):
fixed_args = self._fix_compile_args(None, macros, include_dirs)
--
-2.24.1
+2.26.0.rc2
diff --git a/00102-lib64.patch b/00102-lib64.patch
deleted file mode 100644
index 815058a..0000000
--- a/00102-lib64.patch
+++ /dev/null
@@ -1,261 +0,0 @@
-From de23a0cc0e2471d12aa82813e4fb6cf937ad1a51 Mon Sep 17 00:00:00 2001
-From: David Malcolm <dmalcolm(a)redhat.com>
-Date: Wed, 13 Jan 2010 21:25:18 +0000
-Subject: [PATCH] 00102: Change the various install paths to use /usr/lib64/
- instead or /usr/lib/
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Only used when "%{_lib}" == "lib64".
-
-Co-authored-by: David Malcolm <dmalcolm(a)redhat.com>
-Co-authored-by: Thomas Spura <tomspur(a)fedoraproject.org>
-Co-authored-by: Slavek Kabrda <bkabrda(a)redhat.com>
-Co-authored-by: Matej Stuchlik <mstuchli(a)redhat.com>
-Co-authored-by: Tomas Orsava <torsava(a)redhat.com>
-Co-authored-by: Charalampos Stratakis <cstratak(a)redhat.com>
-Co-authored-by: Petr Viktorin <pviktori(a)redhat.com>
-Co-authored-by: Miro Hronok <miro(a)hroncok.cz>
-Co-authored-by: Iryna Shcherbina <shcherbina.iryna(a)gmail.com>
----
- Lib/distutils/command/install.py | 4 ++--
- Lib/distutils/sysconfig.py | 6 +++++-
- Lib/distutils/tests/test_install.py | 3 ++-
- Lib/site.py | 4 ++++
- Lib/sysconfig.py | 12 ++++++------
- Lib/test/test_site.py | 4 ++--
- Makefile.pre.in | 2 +-
- Modules/getpath.c | 6 +++---
- configure | 4 ++--
- configure.ac | 4 ++--
- setup.py | 6 +++---
- 11 files changed, 32 insertions(+), 23 deletions(-)
-
-diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
-index c625c95bf7..ae4f915669 100644
---- a/Lib/distutils/command/install.py
-+++ b/Lib/distutils/command/install.py
-@@ -30,14 +30,14 @@ WINDOWS_SCHEME = {
- INSTALL_SCHEMES = {
- 'unix_prefix': {
- 'purelib': '$base/lib/python$py_version_short/site-packages',
-- 'platlib': '$platbase/lib/python$py_version_short/site-packages',
-+ 'platlib': '$platbase/lib64/python$py_version_short/site-packages',
- 'headers': '$base/include/python$py_version_short$abiflags/$dist_name',
- 'scripts': '$base/bin',
- 'data' : '$base',
- },
- 'unix_home': {
- 'purelib': '$base/lib/python',
-- 'platlib': '$base/lib/python',
-+ 'platlib': '$base/lib64/python',
- 'headers': '$base/include/python/$dist_name',
- 'scripts': '$base/bin',
- 'data' : '$base',
-diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
-index b51629eb94..9a4892a737 100644
---- a/Lib/distutils/sysconfig.py
-+++ b/Lib/distutils/sysconfig.py
-@@ -146,8 +146,12 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
- prefix = plat_specific and EXEC_PREFIX or PREFIX
-
- if os.name == "posix":
-+ if plat_specific or standard_lib:
-+ lib = "lib64"
-+ else:
-+ lib = "lib"
- libpython = os.path.join(prefix,
-- "lib", "python" + get_python_version())
-+ lib, "python" + get_python_version())
- if standard_lib:
- return libpython
- else:
-diff --git a/Lib/distutils/tests/test_install.py b/Lib/distutils/tests/test_install.py
-index 287ab1989e..d4c05e0ab1 100644
---- a/Lib/distutils/tests/test_install.py
-+++ b/Lib/distutils/tests/test_install.py
-@@ -57,8 +57,9 @@ class InstallTestCase(support.TempdirManager,
- self.assertEqual(got, expected)
-
- libdir = os.path.join(destination, "lib", "python")
-+ platlibdir = os.path.join(destination, "lib64", "python")
- check_path(cmd.install_lib, libdir)
-- check_path(cmd.install_platlib, libdir)
-+ check_path(cmd.install_platlib, platlibdir)
- check_path(cmd.install_purelib, libdir)
- check_path(cmd.install_headers,
- os.path.join(destination, "include", "python", "foopkg"))
-diff --git a/Lib/site.py b/Lib/site.py
-index 2c71798755..653c1d7203 100644
---- a/Lib/site.py
-+++ b/Lib/site.py
-@@ -335,11 +335,15 @@ def getsitepackages(prefixes=None):
- seen.add(prefix)
-
- if os.sep == '/':
-+ sitepackages.append(os.path.join(prefix, "lib64",
-+ "python" + sys.version[:3],
-+ "site-packages"))
- sitepackages.append(os.path.join(prefix, "lib",
- "python%d.%d" % sys.version_info[:2],
- "site-packages"))
- else:
- sitepackages.append(prefix)
-+ sitepackages.append(os.path.join(prefix, "lib64", "site-packages"))
- sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
- return sitepackages
-
-diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
-index 64cf1560d9..f66314b203 100644
---- a/Lib/sysconfig.py
-+++ b/Lib/sysconfig.py
-@@ -20,10 +20,10 @@ __all__ = [
-
- _INSTALL_SCHEMES = {
- 'posix_prefix': {
-- 'stdlib': '{installed_base}/lib/python{py_version_short}',
-- 'platstdlib': '{platbase}/lib/python{py_version_short}',
-+ 'stdlib': '{installed_base}/lib64/python{py_version_short}',
-+ 'platstdlib': '{platbase}/lib64/python{py_version_short}',
- 'purelib': '{base}/lib/python{py_version_short}/site-packages',
-- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
-+ 'platlib': '{platbase}/lib64/python{py_version_short}/site-packages',
- 'include':
- '{installed_base}/include/python{py_version_short}{abiflags}',
- 'platinclude':
-@@ -62,10 +62,10 @@ _INSTALL_SCHEMES = {
- 'data': '{userbase}',
- },
- 'posix_user': {
-- 'stdlib': '{userbase}/lib/python{py_version_short}',
-- 'platstdlib': '{userbase}/lib/python{py_version_short}',
-+ 'stdlib': '{userbase}/lib64/python{py_version_short}',
-+ 'platstdlib': '{userbase}/lib64/python{py_version_short}',
- 'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
-- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
-+ 'platlib': '{userbase}/lib64/python{py_version_short}/site-packages',
- 'include': '{userbase}/include/python{py_version_short}',
- 'scripts': '{userbase}/bin',
- 'data': '{userbase}',
-diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
-index 41c4229919..543c88432a 100644
---- a/Lib/test/test_site.py
-+++ b/Lib/test/test_site.py
-@@ -266,8 +266,8 @@ class HelperFunctionsTests(unittest.TestCase):
- dirs = site.getsitepackages()
- if os.sep == '/':
- # OS X, Linux, FreeBSD, etc
-- self.assertEqual(len(dirs), 1)
-- wanted = os.path.join('xoxo', 'lib',
-+ self.assertEqual(len(dirs), 2)
-+ wanted = os.path.join('xoxo', 'lib64',
- 'python%d.%d' % sys.version_info[:2],
- 'site-packages')
- self.assertEqual(dirs[0], wanted)
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 3199a1aa02..8dc55c158f 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -143,7 +143,7 @@ LIBDIR= @libdir@
- MANDIR= @mandir@
- INCLUDEDIR= @includedir@
- CONFINCLUDEDIR= $(exec_prefix)/include
--SCRIPTDIR= $(prefix)/lib
-+SCRIPTDIR= $(prefix)/lib64
- ABIFLAGS= @ABIFLAGS@
-
- # Detailed destination directories
-diff --git a/Modules/getpath.c b/Modules/getpath.c
-index 8632d1fe6d..09a818609e 100644
---- a/Modules/getpath.c
-+++ b/Modules/getpath.c
-@@ -810,7 +810,7 @@ calculate_exec_prefix(PyCalculatePath *calculate, _PyPathConfig *pathconfig)
- }
-
- calculate->exec_prefix = joinpath2(calculate->exec_prefix_macro,
-- L"lib/lib-dynload");
-+ L"lib64/lib-dynload");
- if (calculate->exec_prefix == NULL) {
- return _PyStatus_NO_MEMORY();
- }
-@@ -1284,7 +1284,7 @@ calculate_read_pyenv(PyCalculatePath *calculate)
- static PyStatus
- calculate_zip_path(PyCalculatePath *calculate)
- {
-- const wchar_t *lib_python = L"lib/python00.zip";
-+ const wchar_t *lib_python = L"lib64/python00.zip";
-
- if (calculate->prefix_found > 0) {
- /* Use the reduced prefix returned by Py_GetPrefix()
-@@ -1435,7 +1435,7 @@ calculate_init(PyCalculatePath *calculate, const PyConfig *config)
- return DECODE_LOCALE_ERR("VPATH macro", len);
- }
-
-- calculate->lib_python = Py_DecodeLocale("lib/python" VERSION, &len);
-+ calculate->lib_python = Py_DecodeLocale("lib64/python" VERSION, &len);
- if (!calculate->lib_python) {
- return DECODE_LOCALE_ERR("EXEC_PREFIX macro", len);
- }
-diff --git a/configure b/configure
-index 846116e112..aaadb30ef9 100755
---- a/configure
-+++ b/configure
-@@ -15233,9 +15233,9 @@ fi
-
-
- if test x$PLATFORM_TRIPLET = x; then
-- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}"
-+ LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}"
- else
-- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
-+ LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
- fi
-
-
-diff --git a/configure.ac b/configure.ac
-index 840caf352d..ac4a44bdb8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -4711,9 +4711,9 @@ fi
- dnl define LIBPL after ABIFLAGS and LDVERSION is defined.
- AC_SUBST(PY_ENABLE_SHARED)
- if test x$PLATFORM_TRIPLET = x; then
-- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}"
-+ LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}"
- else
-- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
-+ LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
- fi
- AC_SUBST(LIBPL)
-
-diff --git a/setup.py b/setup.py
-index 51e67fe4a5..bafa0bf99a 100644
---- a/setup.py
-+++ b/setup.py
-@@ -649,7 +649,7 @@ class PyBuildExt(build_ext):
- # directories (i.e. '.' and 'Include') must be first. See issue
- # 10520.
- if not CROSS_COMPILING:
-- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-+ add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')
- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
- # only change this for cross builds for 3.3, issues on Mageia
- if CROSS_COMPILING:
-@@ -955,11 +955,11 @@ class PyBuildExt(build_ext):
- elif curses_library:
- readline_libs.append(curses_library)
- elif self.compiler.find_library_file(self.lib_dirs +
-- ['/usr/lib/termcap'],
-+ ['/usr/lib64/termcap'],
- 'termcap'):
- readline_libs.append('termcap')
- self.add(Extension('readline', ['readline.c'],
-- library_dirs=['/usr/lib/termcap'],
-+ library_dirs=['/usr/lib64/termcap'],
- extra_link_args=readline_extra_link_args,
- libraries=readline_libs))
- else:
---
-2.24.1
-
diff --git a/00111-no-static-lib.patch b/00111-no-static-lib.patch
index ef7946f..39f6df8 100644
--- a/00111-no-static-lib.patch
+++ b/00111-no-static-lib.patch
@@ -1,4 +1,4 @@
-From c58e1db077a3d7502640d2e5863e683b281fcf7b Mon Sep 17 00:00:00 2001
+From d6d13e87c507c77211dbd340b159ca4410849f13 Mon Sep 17 00:00:00 2001
From: David Malcolm <dmalcolm(a)redhat.com>
Date: Mon, 18 Jan 2010 17:59:07 +0000
Subject: [PATCH] 00111: Don't try to build a libpythonMAJOR.MINOR.a
@@ -21,10 +21,10 @@ Co-authored-by: Miro Hronok <miro(a)hroncok.cz>
1 file changed, 2 insertions(+), 19 deletions(-)
diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 8dc55c158f..e1f021fbab 100644
+index caa1d37648..3178f16000 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -562,7 +562,7 @@ clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c
+@@ -563,7 +563,7 @@ clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c
$(PYTHON_FOR_REGEN) $(srcdir)/Tools/clinic/clinic.py --make --srcdir $(srcdir)
# Build the interpreter
@@ -33,7 +33,7 @@ index 8dc55c158f..e1f021fbab 100644
$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)
platform: $(BUILDPYTHON) pybuilddir.txt
-@@ -610,12 +610,6 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
+@@ -611,12 +611,6 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
@@ -46,7 +46,7 @@ index 8dc55c158f..e1f021fbab 100644
libpython$(LDVERSION).so: $(LIBRARY_OBJS) $(DTRACE_OBJS)
if test $(INSTSONAME) != $(LDLIBRARY); then \
$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM); \
-@@ -693,7 +687,7 @@ Makefile Modules/config.c: Makefile.pre \
+@@ -694,7 +688,7 @@ Makefile Modules/config.c: Makefile.pre \
@echo "The Makefile was updated, you may need to re-run make."
@@ -55,7 +55,7 @@ index 8dc55c158f..e1f021fbab 100644
$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)
############################################################################
-@@ -1567,17 +1561,6 @@ libainstall: @DEF_MAKE_RULE@ python-config
+@@ -1570,17 +1564,6 @@ libainstall: @DEF_MAKE_RULE@ python-config
else true; \
fi; \
done
@@ -74,5 +74,5 @@ index 8dc55c158f..e1f021fbab 100644
$(INSTALL_DATA) Programs/python.o $(DESTDIR)$(LIBPL)/python.o
$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
--
-2.24.1
+2.26.0.rc2
diff --git a/00189-use-rpm-wheels.patch b/00189-use-rpm-wheels.patch
index aaf370e..5b56674 100644
--- a/00189-use-rpm-wheels.patch
+++ b/00189-use-rpm-wheels.patch
@@ -1,4 +1,4 @@
-From 1e8c543d53d2aa0c92381c1e1995a58b57361bef Mon Sep 17 00:00:00 2001
+From 0eb96d45196adaa7dc1362590ae44ddfb175e29c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro(a)hroncok.cz>
Date: Wed, 15 Aug 2018 15:36:29 +0200
Subject: [PATCH] 00189: Instead of bundled wheels, use our RPM packaged wheels
@@ -9,15 +9,16 @@ We keep them in /usr/share/python-wheels
1 file changed, 22 insertions(+), 11 deletions(-)
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
-index 386ed6c25c..dae2ba22e4 100644
+index 545fce656f..f86992c90c 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
-@@ -1,19 +1,33 @@
+@@ -1,3 +1,5 @@
+import distutils.version
+import glob
import os
import os.path
import sys
+@@ -5,16 +7,28 @@ import runpy
import tempfile
from importlib import resources
@@ -50,7 +51,7 @@ index 386ed6c25c..dae2ba22e4 100644
_PROJECTS = [
("setuptools", _SETUPTOOLS_VERSION),
-@@ -98,13 +112,10 @@ def _bootstrap(*, root=None, upgrade=False, user=False,
+@@ -108,13 +122,10 @@ def _bootstrap(*, root=None, upgrade=False, user=False,
# additional paths that need added to sys.path
additional_paths = []
for project, version in _PROJECTS:
@@ -69,5 +70,5 @@ index 386ed6c25c..dae2ba22e4 100644
additional_paths.append(os.path.join(tmpdir, wheel_name))
--
-2.24.1
+2.26.0.rc2
diff --git a/00251-change-user-install-location.patch b/00251-change-user-install-location.patch
index 844f244..3f368c6 100644
--- a/00251-change-user-install-location.patch
+++ b/00251-change-user-install-location.patch
@@ -1,4 +1,4 @@
-From 0d3595ce9f30425aaceaf02c9adb6faa044db18d Mon Sep 17 00:00:00 2001
+From 792ba3f5ca938abfb276b6b938312b6af44619fb Mon Sep 17 00:00:00 2001
From: Michal Cyprian <m.cyprian(a)gmail.com>
Date: Mon, 26 Jun 2017 16:32:56 +0200
Subject: [PATCH] 00251: Change user install location
@@ -14,10 +14,10 @@ Fedora Change: https://fedoraproject.org/wiki/Changes/Making_sudo_pip_safe
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
-index ae4f915669..0e4fd5b74a 100644
+index aaa300efa9..f8d453912a 100644
--- a/Lib/distutils/command/install.py
+++ b/Lib/distutils/command/install.py
-@@ -418,8 +418,19 @@ class install(Command):
+@@ -419,8 +419,19 @@ class install(Command):
raise DistutilsOptionError(
"must not supply exec-prefix without prefix")
@@ -40,10 +40,10 @@ index ae4f915669..0e4fd5b74a 100644
else:
if self.exec_prefix is None:
diff --git a/Lib/site.py b/Lib/site.py
-index 653c1d7203..9098f5762f 100644
+index e981a14208..63e05ff2ad 100644
--- a/Lib/site.py
+++ b/Lib/site.py
-@@ -348,7 +348,14 @@ def getsitepackages(prefixes=None):
+@@ -353,7 +353,14 @@ def getsitepackages(prefixes=None):
return sitepackages
def addsitepackages(known_paths, prefixes=None):
@@ -60,5 +60,5 @@ index 653c1d7203..9098f5762f 100644
if os.path.isdir(sitedir):
addsitedir(sitedir, known_paths)
--
-2.24.1
+2.26.0.rc2
diff --git a/00274-fix-arch-names.patch b/00274-fix-arch-names.patch
index 692c5ef..0792468 100644
--- a/00274-fix-arch-names.patch
+++ b/00274-fix-arch-names.patch
@@ -1,4 +1,4 @@
-From 1da0d675508c66baafaca8cd811fb9ac7719c998 Mon Sep 17 00:00:00 2001
+From df0b3431e564d5f999086c060f1080b59338877a Mon Sep 17 00:00:00 2001
From: Petr Viktorin <pviktori(a)redhat.com>
Date: Mon, 28 Aug 2017 17:16:46 +0200
Subject: [PATCH] 00274: Upstream uses Debian-style architecture naming, change
@@ -29,7 +29,7 @@ index ba37cf99e2..52a9ec6662 100755
ppc64le | powerpc64little)
basic_machine=powerpc64le-unknown
diff --git a/configure.ac b/configure.ac
-index ac4a44bdb8..504618db12 100644
+index 8eed0151eb..73d3b136a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -759,9 +759,9 @@ cat >> conftest.c <<EOF
@@ -82,5 +82,5 @@ index ac4a44bdb8..504618db12 100644
s390x-linux-gnu
# elif defined(__s390__)
--
-2.24.1
+2.26.0.rc2
diff --git a/00328-pyc-timestamp-invalidation-mode.patch b/00328-pyc-timestamp-invalidation-mode.patch
index 7726bb4..a9db568 100644
--- a/00328-pyc-timestamp-invalidation-mode.patch
+++ b/00328-pyc-timestamp-invalidation-mode.patch
@@ -1,4 +1,4 @@
-From 662a4a0ab64b6801a5051b042ddc21224b9cd34e Mon Sep 17 00:00:00 2001
+From 7b5490ad6889846a944f4441eab5007875fcfc9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro(a)hroncok.cz>
Date: Thu, 11 Jul 2019 13:44:13 +0200
Subject: [PATCH] 00328: Restore pyc to TIMESTAMP invalidation mode as default
@@ -51,5 +51,5 @@ index d4a68c9320..ed09874023 100644
return wrapper
--
-2.24.1
+2.26.0.rc2
diff --git a/python39.spec b/python39.spec
index 7713d35..9eda2fe 100644
--- a/python39.spec
+++ b/python39.spec
@@ -14,7 +14,7 @@ URL: https://www.python.org/
# WARNING When rebasing to a new Python version,
# remember to update the python3-docs package as well
%global general_version %{pybasever}.0
-%global prerel a4
+%global prerel a5
%global upstream_version %{general_version}%{?prerel}
Version: %{general_version}%{?prerel:~%{prerel}}
Release: 1%{?dist}
@@ -232,12 +232,6 @@ Source11: idle3.appdata.xml
# Was Patch0 in ivazquez' python3000 specfile:
Patch1: 00001-rpath.patch
-# 00102 #
-# Change the various install paths to use /usr/lib64/ instead or /usr/lib
-# Only used when "%%{_lib}" == "lib64"
-# Not yet sent upstream.
-Patch102: 00102-lib64.patch
-
# 00111 #
# Patch the Makefile.pre.in so that the generated Makefile doesn't try to build
# a libpythonMAJOR.MINOR.a
@@ -604,10 +598,6 @@ rm -r Modules/expat
# Apply patches:
#
%patch1 -p1
-
-%if "%{_lib}" == "lib64"
-%patch102 -p1
-%endif
%patch111 -p1
%if %{with rpmwheels}
@@ -691,6 +681,7 @@ BuildPython() {
export DFLAGS=" "
%configure \
+ --with-platlibdir=%{_lib} \
--enable-ipv6 \
--enable-shared \
--with-computed-gotos=%{computed_gotos_flag} \
@@ -1575,6 +1566,9 @@ CheckPython optimized
# ======================================================
%changelog
+* Tue Mar 24 2020 Miro Hronok <mhroncok(a)redhat.com> - 3.9.0~a5-1
+- Update to Python 3.9.0a5
+
* Thu Feb 27 2020 Marcel Plch <mplch(a)redhat.com> - 3.9.0~a4-1
- Update to Python 3.9.0a4
diff --git a/sources b/sources
index 5f806d8..4fe3c2e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (Python-3.9.0a4.tar.xz) = 8f7ca0a891fb7e7868dfe5f040e9ceb7ce14d036bc5d9eae1493570c5a9631832e796a1972590c444d2347c585b0c8216345375dd1476b4da7bd47e187591afc
-SHA512 (Python-3.9.0a4.tar.xz.asc) = 67f55246d3cbe46a71aae2328b36452cc9c33191bbcae13abb083e63a7eb923c4db63731add04456c9cb657bf5126137e7047e90de3afdc24dd082d194aa8837
+SHA512 (Python-3.9.0a5.tar.xz) = b2f884a492eeb9fa7347c664bb6fd1dc3c25f663ebb4f9455b66540e12ce8da845c2ad4960999d5475625bc64c834f3cff28f61cd37881bdf53efa349c44bff3
+SHA512 (Python-3.9.0a5.tar.xz.asc) = c3988caedfa183af563a6fddabc16357863834ce2460ce05d7adaa78de76dc08c5bb6d078f10bb4f58775e1d4b5d9168f59319b488638010f6066c2c2a21a211
commit f6b4d318e9cd3350603505ea422495e6493fa378
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Fri Feb 28 18:34:31 2020 +0100
Enable https://fedoraproject.org/wiki/Changes/PythonNoSemanticInterpositionSpeedup on power and arm
https://bugzilla.redhat.com/show_bug.cgi?id=1795575 is "fixed for almost a month"
diff --git a/python39.spec b/python39.spec
index 9cc61a1..7713d35 100644
--- a/python39.spec
+++ b/python39.spec
@@ -64,12 +64,7 @@ License: Python
%bcond_without optimizations
# https://fedoraproject.org/wiki/Changes/PythonNoSemanticInterpositionSpeedup
-# Disabled on ppc64le and armv7hl: https://bugzilla.redhat.com/show_bug.cgi?id=1795575
-%ifarch %{power64} %{arm}
-%bcond_with no_semantic_interposition
-%else
%bcond_without no_semantic_interposition
-%endif
# Run the test suite in %%check
%bcond_without tests
4 years, 1 month
- 1
- 0
Architecture specific change in rpms/perl-Parse-DMIDecode.git
by githook-noreply＠fedoraproject.org
The package rpms/perl-Parse-DMIDecode.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/perl-Parse-DMIDecode.git/commit/?....
Change:
+ExclusiveArch: %{ix86} x86_64 ia64 aarch64
Thanks.
Full change:
============
commit 29407c78b059e7c3a95374485d46ac5a4a9c8e30
Author: Tomas Hrcka <thrcka(a)redhat.com>
Date: Wed Mar 25 12:05:32 2020 +0100
Revert "Orphaned for 6+ weeks"
This reverts commit 9eb4f47b754ba67788ff1cfab0ff229f2ab0caaf.
Unretirement request: https://pagure.io/releng/issue/9354
Signed-off-by: Tomas Hrcka <thrcka(a)redhat.com>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6a40447
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/Parse-DMIDecode-0.03.tar.gz
diff --git a/dead.package b/dead.package
deleted file mode 100644
index 5204a84..0000000
--- a/dead.package
+++ /dev/null
@@ -1 +0,0 @@
-Orphaned for 6+ weeks
diff --git a/fix-pod-urls.patch b/fix-pod-urls.patch
new file mode 100644
index 0000000..64ccd1f
--- /dev/null
+++ b/fix-pod-urls.patch
@@ -0,0 +1,45 @@
+--- a/lib/Parse/DMIDecode.pm
++++ b/lib/Parse/DMIDecode.pm
+@@ -466,9 +466,9 @@
+ L<http://perlgirl.org.uk>
+
+ If you like this software, why not show your appreciation by sending the
+-author something nice from her
+-L<Amazon wishlist|http://www.amazon.co.uk/gp/registry/1VZXC59ESWYK0?sort=priority>?
+-( http://www.amazon.co.uk/gp/registry/1VZXC59ESWYK0?sort=priority )
++author something nice from her Amazon wishlist ?
++
++L<http://www.amazon.co.uk/gp/registry/1VZXC59ESWYK0?sort=priority>
+
+ =head1 COPYRIGHT
+
+--- a/lib/Parse/DMIDecode/Constants.pm
++++ b/lib/Parse/DMIDecode/Constants.pm
+@@ -139,9 +139,9 @@
+ L<http://perlgirl.org.uk>
+
+ If you like this software, why not show your appreciation by sending the
+-author something nice from her
+-L<Amazon wishlist|http://www.amazon.co.uk/gp/registry/1VZXC59ESWYK0?sort=priority>?
+-( http://www.amazon.co.uk/gp/registry/1VZXC59ESWYK0?sort=priority )
++author something nice from her Amazon wishlist ?
++
++L<http://www.amazon.co.uk/gp/registry/1VZXC59ESWYK0?sort=priority>
+
+ =head1 COPYRIGHT
+
+--- a/lib/Parse/DMIDecode/Handle.pm
++++ b/lib/Parse/DMIDecode/Handle.pm
+@@ -420,9 +420,9 @@
+ L<http://perlgirl.org.uk>
+
+ If you like this software, why not show your appreciation by sending the
+-author something nice from her
+-L<Amazon wishlist|http://www.amazon.co.uk/gp/registry/1VZXC59ESWYK0?sort=priority>?
+-( http://www.amazon.co.uk/gp/registry/1VZXC59ESWYK0?sort=priority )
++author something nice from her Amazon wishlist ?
++
++L<http://www.amazon.co.uk/gp/registry/1VZXC59ESWYK0?sort=priority>
+
+ =head1 COPYRIGHT
+
diff --git a/perl-Parse-DMIDecode.spec b/perl-Parse-DMIDecode.spec
new file mode 100644
index 0000000..eb5867f
--- /dev/null
+++ b/perl-Parse-DMIDecode.spec
@@ -0,0 +1,123 @@
+Name: perl-Parse-DMIDecode
+Version: 0.03
+Release: 21%{?dist}
+Summary: Interface to SMBIOS using dmidecode
+License: ASL 2.0
+URL: https://metacpan.org/release/Parse-DMIDecode
+Source0: https://cpan.metacpan.org/modules/by-module/Parse/Parse-DMIDecode-%{versi...
+# Pod fixing patch from RT 52296 -> https://rt.cpan.org/Ticket/Attachment/699959/360879/fix-pod-urls.patch
+Patch1: fix-pod-urls.patch
+# This mirrors the ExclusiveArch in the dmidecode spec file
+ExclusiveArch: %{ix86} x86_64 ia64 aarch64
+BuildRequires: dmidecode
+BuildRequires: perl-interpreter
+BuildRequires: perl-generators
+BuildRequires: perl(Carp)
+BuildRequires: perl(Data::Dumper)
+BuildRequires: perl(Exporter)
+BuildRequires: perl(ExtUtils::CBuilder)
+BuildRequires: perl(File::Which) >= 0.05
+BuildRequires: perl(lib)
+BuildRequires: perl(Module::Build)
+BuildRequires: perl(strict)
+BuildRequires: perl(Test::More)
+BuildRequires: perl(Test::Pod) >= 1.2
+BuildRequires: perl(Test::Pod::Coverage) >= 1.06
+BuildRequires: perl(vars)
+BuildRequires: perl(warnings)
+Requires: dmidecode
+Requires: perl(File::Which) >= 0.05
+Requires: perl(Data::Dumper)
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
+%description
+This module provides an OO interface to SMBIOS information through the
+dmidecode command which is known to work under a number of Linux, BSD and
+BeOS variants.
+
+%prep
+%setup -q -n Parse-DMIDecode-%{version}
+%patch1 -p1
+
+%build
+# a debug package is not required as there are no binaries in this package
+%define debug_package %{nil}
+AUTOMATED_TESTING=1 %{__perl} Build.PL installdirs=vendor
+./Build
+
+%install
+./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
+
+%{_fixperms} $RPM_BUILD_ROOT/*
+
+%check
+./Build test
+
+%files
+%doc Changes LICENSE NOTICE README TODO examples
+%{perl_vendorlib}/*
+%{_mandir}/man3/*
+
+%changelog
+* Thu Jan 30 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.03-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.03-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri May 31 2019 Jitka Plesnikova <jplesnik(a)redhat.com> - 0.03-19
+- Perl 5.30 rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.03-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.03-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Jun 28 2018 Jitka Plesnikova <jplesnik(a)redhat.com> - 0.03-16
+- Perl 5.28 rebuild
+
+* Fri Mar 02 2018 Petr Pisar <ppisar(a)redhat.com> - 0.03-15
+- Adapt to removing GCC from a build root (bug #1547165)
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.03-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.03-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.03-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sun Jun 04 2017 Jitka Plesnikova <jplesnik(a)redhat.com> - 0.03-11
+- Perl 5.26 rebuild
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.03-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Sun May 15 2016 Jitka Plesnikova <jplesnik(a)redhat.com> - 0.03-9
+- Perl 5.24 rebuild
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.03-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.03-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Fri Jun 05 2015 Jitka Plesnikova <jplesnik(a)redhat.com> - 0.03-6
+- Perl 5.22 rebuild
+
+* Sat Oct 25 2014 Peter Robinson <pbrobinson(a)fedoraproject.org> 0.03-5
+- dmidecode supported on aarch64
+
+* Wed Aug 27 2014 Jitka Plesnikova <jplesnik(a)redhat.com> - 0.03-4
+- Perl 5.20 rebuild
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.03-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.03-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Wed Apr 23 2014 David Dick <ddick(a)cpan.org> - 0.03-1
+- Initial release
diff --git a/sources b/sources
new file mode 100644
index 0000000..6a8f183
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+5e709625ee53a9672ac75ed9b2fffd7b Parse-DMIDecode-0.03.tar.gz
4 years, 1 month
- 1
- 0
Architecture specific change in rpms/nss_nis.git
by githook-noreply＠fedoraproject.org
The package rpms/nss_nis.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/nss_nis.git/commit/?id=4292ac317e....
Change:
+%ifarch x86_64
Thanks.
Full change:
============
commit 4292ac317eff763e2a68b07b297da56cc8701260
Author: Filip Janu <fjanus(a)redhat.com>
Date: Wed Mar 25 10:10:36 2020 +0100
adding recommendation to install 32-bit version if 32-bit glibc is installed
resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1803161
fedora devel discussion: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.o...
diff --git a/nss_nis.spec b/nss_nis.spec
index 453391f..e590406 100644
--- a/nss_nis.spec
+++ b/nss_nis.spec
@@ -1,6 +1,6 @@
Name: nss_nis
Version: 3.1
-Release: 3%{?dist}
+Release: 2%{?dist}
Summary: Name Service Switch (NSS) module using NIS
License: LGPLv2+
Url: https://github.com/thkukuk/libnss_nis
@@ -14,6 +14,9 @@ BuildRequires: libtirpc-devel
BuildRequires: autoconf, automake, libtool
BuildRequires: systemd
+%ifarch x86_64
+Recommends: (nss_nis(x86-32) if glibc(x86-32))
+%endif
%description
The nss_nis Name Service Switch module uses the Network Information System (NIS)
@@ -53,8 +56,9 @@ make check
%license COPYING
%changelog
-* Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+* Wed Mar 25 2019 Filip Janu <fjanus(a)redhat.com> - 3.1-2
+- addiing: recommending to install 32 bit-version if 32 bit glibc is installed
+- resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1803161
* Wed Aug 14 2019 Matej Muila <mmuzila(a)redhat.com> - 3.1-1
- Update to version 3.1
commit 222a6f90d5c0dfc86aa35929609d823641ebf404
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jan 29 19:16:20 2020 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/nss_nis.spec b/nss_nis.spec
index 052bdbf..453391f 100644
--- a/nss_nis.spec
+++ b/nss_nis.spec
@@ -1,6 +1,6 @@
Name: nss_nis
Version: 3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Name Service Switch (NSS) module using NIS
License: LGPLv2+
Url: https://github.com/thkukuk/libnss_nis
@@ -53,6 +53,9 @@ make check
%license COPYING
%changelog
+* Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
* Wed Aug 14 2019 Matej Muila <mmuzila(a)redhat.com> - 3.1-1
- Update to version 3.1
- Resolves: #1736327
4 years, 1 month
- 1
- 0
Architecture specific change in rpms/nss_nis.git
by githook-noreply＠fedoraproject.org
The package rpms/nss_nis.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/nss_nis.git/commit/?id=718f0b3f5d....
Change:
+%ifarch x86_64
Thanks.
Full change:
============
commit 0c4db64b666f8e57b3d76fd72edb2f86922af6cf
Author: Filip Janu <fjanus(a)redhat.com>
Date: Wed Mar 25 11:36:24 2020 +0100
typo fix
diff --git a/nss_nis.spec b/nss_nis.spec
index 0fb4e51..1c4370a 100644
--- a/nss_nis.spec
+++ b/nss_nis.spec
@@ -56,7 +56,7 @@ make check
%license COPYING
%changelog
-* Wed Mar 25 2019 Filip Janu <fjanus(a)redhat.com> - 3.1.4
+* Wed Mar 25 2019 Filip Janu <fjanus(a)redhat.com> - 3.1-4
- addiing: recommending to install 32 bit-version if 32 bit glibc is installed
- resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1803161
commit 718f0b3f5dfbf28c16c9e3b11842606e046edb56
Author: Filip Janu <fjanus(a)redhat.com>
Date: Wed Mar 25 10:10:36 2020 +0100
adding recommendation to install 32-bit version if 32-bit glibc is installed
resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1803161
fedora devel discussion: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.o...
diff --git a/nss_nis.spec b/nss_nis.spec
index 453391f..0fb4e51 100644
--- a/nss_nis.spec
+++ b/nss_nis.spec
@@ -1,6 +1,6 @@
Name: nss_nis
Version: 3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Name Service Switch (NSS) module using NIS
License: LGPLv2+
Url: https://github.com/thkukuk/libnss_nis
@@ -14,6 +14,9 @@ BuildRequires: libtirpc-devel
BuildRequires: autoconf, automake, libtool
BuildRequires: systemd
+%ifarch x86_64
+Recommends: (nss_nis(x86-32) if glibc(x86-32))
+%endif
%description
The nss_nis Name Service Switch module uses the Network Information System (NIS)
@@ -53,6 +56,10 @@ make check
%license COPYING
%changelog
+* Wed Mar 25 2019 Filip Janu <fjanus(a)redhat.com> - 3.1.4
+- addiing: recommending to install 32 bit-version if 32 bit glibc is installed
+- resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1803161
+
* Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
4 years, 1 month
- 1
- 0
Architecture specific change in rpms/nss_nis.git
by githook-noreply＠fedoraproject.org
The package rpms/nss_nis.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/nss_nis.git/commit/?id=718f0b3f5d....
Change:
+%ifarch x86_64
Thanks.
Full change:
============
commit 718f0b3f5dfbf28c16c9e3b11842606e046edb56
Author: Filip Janu <fjanus(a)redhat.com>
Date: Wed Mar 25 10:10:36 2020 +0100
adding recommendation to install 32-bit version if 32-bit glibc is installed
resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1803161
fedora devel discussion: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.o...
diff --git a/nss_nis.spec b/nss_nis.spec
index 453391f..0fb4e51 100644
--- a/nss_nis.spec
+++ b/nss_nis.spec
@@ -1,6 +1,6 @@
Name: nss_nis
Version: 3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Name Service Switch (NSS) module using NIS
License: LGPLv2+
Url: https://github.com/thkukuk/libnss_nis
@@ -14,6 +14,9 @@ BuildRequires: libtirpc-devel
BuildRequires: autoconf, automake, libtool
BuildRequires: systemd
+%ifarch x86_64
+Recommends: (nss_nis(x86-32) if glibc(x86-32))
+%endif
%description
The nss_nis Name Service Switch module uses the Network Information System (NIS)
@@ -53,6 +56,10 @@ make check
%license COPYING
%changelog
+* Wed Mar 25 2019 Filip Janu <fjanus(a)redhat.com> - 3.1.4
+- addiing: recommending to install 32 bit-version if 32 bit glibc is installed
+- resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1803161
+
* Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
4 years, 1 month
- 1
- 0
Architecture specific change in rpms/java-11-openjdk.git
by githook-noreply＠fedoraproject.org
The package rpms/java-11-openjdk.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/java-11-openjdk.git/commit/?id=8e....
Change:
-%ifarch s390x
Thanks.
Full change:
============
commit 8ebdc0d602ba298a07c8af7368fb1973cdc38ce1
Author: Severin Gehwolf <sgehwolf(a)redhat.com>
Date: Tue Mar 24 13:21:53 2020 +0100
Revert GCC 10 workaround on s390x
Resolves: RHBZ#1799087
diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index 67497c0..26609d4 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -223,7 +223,7 @@
%global top_level_dir_name %{origin}
%global minorver 0
%global buildver 2
-%global rpmrelease 2
+%global rpmrelease 3
#%%global tagsuffix ""
# priority must be 8 digits in total; untill openjdk 1.8 we were using 18..... so when moving to 11 we had to add another digit
%if %is_system_jdk
@@ -1372,16 +1372,11 @@ export ARCH_DATA_MODEL=64
export CFLAGS="$CFLAGS -mieee"
%endif
-GCC_10_WORKAROUND_S390x="-fno-tree-coalesce-vars -fno-tree-copy-prop -fno-tree-dce -fno-tree-dominator-opts -fno-tree-dse -fno-tree-forwprop -fno-tree-fre -fno-tree-loop-distribute-patterns -fno-tree-loop-distribution -fno-tree-loop-vectorize -fno-tree-partial-pre -fno-tree-phiprop -fno-tree-pre -fno-tree-pta -fno-tree-scev-cprop -fno-tree-sink -fno-tree-slp-vectorize -fno-tree-slsr -fno-tree-sra -fno-tree-switch-conversion -fno-tree-tail-merge -fno-tree-ter -fno-tree-vrp -fno-unit-at-a-time -fno-unswitch-loops -fno-vect-cost-model -fno-version-loops-for-strides"
# We use ourcppflags because the OpenJDK build seems to
# pass EXTRA_CFLAGS to the HotSpot C++ compiler...
# Explicitly set the C++ standard as the default has changed on GCC >= 6
EXTRA_CFLAGS="%ourcppflags -std=gnu++98 -Wno-error -fno-delete-null-pointer-checks -fno-lifetime-dse -fcommon"
EXTRA_CPP_FLAGS="%ourcppflags -std=gnu++98 -fno-delete-null-pointer-checks -fno-lifetime-dse -fcommon"
-%ifarch s390x
-EXTRA_CFLAGS="$EXTRA_CFLAGS $GCC_10_WORKAROUND_S390x"
-EXTRA_CPP_FLAGS="$EXTRA_CPP_FLAGS $GCC_10_WORKAROUND_S390x"
-%endif
%ifarch %{power64} ppc
# fix rpmlint warnings
@@ -1855,6 +1850,10 @@ require "copy_jdk_configs.lua"
%changelog
+* Tue Mar 24 2020 Severin Gehwolf <sgehwolf(a)redhat.com> - 1:11.0.7.2-0.3.ea
+- Revert GCC 10 workaround for s390x.
+- Resolves RHBZ#1799087.
+
* Fri Mar 20 2020 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:11.0.7.2-0.2.ea
- Backport JDK-8241296 to fix segfaults when active_handles is NULL (RH1813550)
4 years, 1 month
- 1
- 0