From 1108b564fe775f51a6e7e2794af9867f19a47e5653a2a154cbd7642128c0696a Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 29 May 2023 18:52:32 +0000 Subject: [PATCH 1/5] - The condition around libnsl-devel BuildRequires is NOT switching off NIS support on SLE < 15, support for NIS used to be in the glibc itself. Partial revert of sr#1061583. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=362 --- python-base.changes | 7 +++++++ python-base.spec | 6 +++--- python-doc.changes | 7 +++++++ python.changes | 7 +++++++ python.spec | 4 ++-- 5 files changed, 26 insertions(+), 5 deletions(-) diff --git a/python-base.changes b/python-base.changes index 500eec2..588d1d9 100644 --- a/python-base.changes +++ b/python-base.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon May 29 18:49:40 UTC 2023 - Matej Cepl + +- The condition around libnsl-devel BuildRequires is NOT + switching off NIS support on SLE < 15, support for NIS used to + be in the glibc itself. Partial revert of sr#1061583. + ------------------------------------------------------------------- Wed May 24 20:50:27 UTC 2023 - Matej Cepl diff --git a/python-base.spec b/python-base.spec index 7e822db..975c76d 100644 --- a/python-base.spec +++ b/python-base.spec @@ -155,7 +155,9 @@ BuildRequires: automake BuildRequires: fdupes BuildRequires: libbz2-devel BuildRequires: libffi-devel -%if 0%{?suse_version} && 0%{?suse_version} < 1599 +# This is NOT switching off NIS support on SLE < 15, +# support for NIS used to be in the glibc itself +%if 0%{?suse_version} >= 1500 && 0%{?suse_version} < 1599 BuildRequires: libnsl-devel %endif BuildRequires: pkg-config @@ -566,9 +568,7 @@ cp Makefile Makefile.pre.in Makefile.pre %{buildroot}%{_libdir}/python%{python_v %{_libdir}/python%{python_version}/lib-dynload/linuxaudiodev.so %{_libdir}/python%{python_version}/lib-dynload/math.so %{_libdir}/python%{python_version}/lib-dynload/mmap.so -%if 0%{?suse_version} && 0%{?suse_version} < 1599 %{_libdir}/python%{python_version}/lib-dynload/nis.so -%endif %{_libdir}/python%{python_version}/lib-dynload/operator.so %{_libdir}/python%{python_version}/lib-dynload/ossaudiodev.so %{_libdir}/python%{python_version}/lib-dynload/parser.so diff --git a/python-doc.changes b/python-doc.changes index 500eec2..588d1d9 100644 --- a/python-doc.changes +++ b/python-doc.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon May 29 18:49:40 UTC 2023 - Matej Cepl + +- The condition around libnsl-devel BuildRequires is NOT + switching off NIS support on SLE < 15, support for NIS used to + be in the glibc itself. Partial revert of sr#1061583. + ------------------------------------------------------------------- Wed May 24 20:50:27 UTC 2023 - Matej Cepl diff --git a/python.changes b/python.changes index 500eec2..588d1d9 100644 --- a/python.changes +++ b/python.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon May 29 18:49:40 UTC 2023 - Matej Cepl + +- The condition around libnsl-devel BuildRequires is NOT + switching off NIS support on SLE < 15, support for NIS used to + be in the glibc itself. Partial revert of sr#1061583. + ------------------------------------------------------------------- Wed May 24 20:50:27 UTC 2023 - Matej Cepl diff --git a/python.spec b/python.spec index 96c611a..36596e4 100644 --- a/python.spec +++ b/python.spec @@ -155,6 +155,8 @@ BuildRequires: fdupes BuildRequires: gdbm-devel BuildRequires: gmp-devel BuildRequires: libbz2-devel +# This is NOT switching off NIS support on SLE < 15, +# support for NIS used to be in the glibc itself %if 0%{?suse_version} >= 1500 && 0%{?suse_version} < 1599 BuildRequires: libnsl-devel %endif @@ -488,9 +490,7 @@ rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/itertools.so rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/linuxaudiodev.so rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/math.so rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/mmap.so -%if 0%{?suse_version} >= 1500 && 0%{?suse_version} < 1599 rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/nis.so -%endif rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/operator.so rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/ossaudiodev.so rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/parser.so From 352049f843cfa2ff909e717025f8fcaeafdd15791bd5ee891631c8c9dfefb701 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 29 May 2023 19:31:36 +0000 Subject: [PATCH 2/5] Correction OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=363 --- python.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python.spec b/python.spec index 36596e4..1af67a4 100644 --- a/python.spec +++ b/python.spec @@ -490,7 +490,7 @@ rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/itertools.so rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/linuxaudiodev.so rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/math.so rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/mmap.so -rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/nis.so +rm -f %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/nis.so rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/operator.so rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/ossaudiodev.so rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/parser.so From 78634bafca32ec2d8ab6ba401c20369a751ac4216865bd942ccb74ce80d0ce7f Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 30 May 2023 11:53:04 +0000 Subject: [PATCH 3/5] Accepting request 1089783 from home:Andreas_Schwab:Factory - python-2.7.5-multilib.patch: Update for riscv64 - Don't fail if _ctypes or dl extension was not built OBS-URL: https://build.opensuse.org/request/show/1089783 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=364 --- python-2.7.5-multilib.patch | 2 +- python-base.changes | 6 ++++++ python-base.spec | 2 +- python-doc.changes | 6 ++++++ python.changes | 6 ++++++ python.spec | 2 +- 6 files changed, 21 insertions(+), 3 deletions(-) diff --git a/python-2.7.5-multilib.patch b/python-2.7.5-multilib.patch index ed4020f..f129fc7 100644 --- a/python-2.7.5-multilib.patch +++ b/python-2.7.5-multilib.patch @@ -375,7 +375,7 @@ +esac + +case $ARCH:$python_cv_cc_64bit_output in -+aarch64:yes | ppc64:yes | ppc64le:yes | powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes) ++aarch64:yes | ppc64:yes | ppc64le:yes | powerpc64:yes | riscv64:yes | s390x:yes | sparc64:yes | x86_64:yes) + LIB="lib64" + ;; +*:*) diff --git a/python-base.changes b/python-base.changes index 588d1d9..dea7d54 100644 --- a/python-base.changes +++ b/python-base.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 30 10:43:13 UTC 2023 - Andreas Schwab + +- python-2.7.5-multilib.patch: Update for riscv64 +- Don't fail if _ctypes or dl extension was not built + ------------------------------------------------------------------- Mon May 29 18:49:40 UTC 2023 - Matej Cepl diff --git a/python-base.spec b/python-base.spec index 975c76d..35fd910 100644 --- a/python-base.spec +++ b/python-base.spec @@ -585,7 +585,7 @@ cp Makefile Makefile.pre.in Makefile.pre %{buildroot}%{_libdir}/python%{python_v %{_libdir}/python%{python_version}/lib-dynload/_multibytecodec.so %{_libdir}/python%{python_version}/lib-dynload/Python-%{tarversion}-py%{python_version}.egg-info # these modules don't support 64-bit arches (disabled by setup.py) -%ifnarch alpha ia64 x86_64 s390x ppc64 ppc64le sparc64 aarch64 +%ifnarch alpha ia64 x86_64 s390x ppc64 ppc64le sparc64 aarch64 riscv64 # requires sizeof(int) == sizeof(long) == sizeof(char*) %{_libdir}/python%{python_version}/lib-dynload/dl.so %endif diff --git a/python-doc.changes b/python-doc.changes index 588d1d9..dea7d54 100644 --- a/python-doc.changes +++ b/python-doc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 30 10:43:13 UTC 2023 - Andreas Schwab + +- python-2.7.5-multilib.patch: Update for riscv64 +- Don't fail if _ctypes or dl extension was not built + ------------------------------------------------------------------- Mon May 29 18:49:40 UTC 2023 - Matej Cepl diff --git a/python.changes b/python.changes index 588d1d9..dea7d54 100644 --- a/python.changes +++ b/python.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 30 10:43:13 UTC 2023 - Andreas Schwab + +- python-2.7.5-multilib.patch: Update for riscv64 +- Don't fail if _ctypes or dl extension was not built + ------------------------------------------------------------------- Mon May 29 18:49:40 UTC 2023 - Matej Cepl diff --git a/python.spec b/python.spec index 1af67a4..108221b 100644 --- a/python.spec +++ b/python.spec @@ -460,7 +460,7 @@ rm %{buildroot}%{_libdir}/python%{python_version}/site-packages/README rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_bisect.so rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_csv.so rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_collections.so -rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_ctypes.so +rm -f %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_ctypes.so rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_ctypes_test.so rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_elementtree.so rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_functools.so From 6f83c920d0a8810298b05db25dbbe3d7fee22149058e7f9a623854821d59955e Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 3 Jun 2023 09:15:51 +0000 Subject: [PATCH 4/5] No nis.so on Tumbleweed OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=365 --- python-base.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/python-base.spec b/python-base.spec index 35fd910..57e8e60 100644 --- a/python-base.spec +++ b/python-base.spec @@ -568,7 +568,9 @@ cp Makefile Makefile.pre.in Makefile.pre %{buildroot}%{_libdir}/python%{python_v %{_libdir}/python%{python_version}/lib-dynload/linuxaudiodev.so %{_libdir}/python%{python_version}/lib-dynload/math.so %{_libdir}/python%{python_version}/lib-dynload/mmap.so +%if 0%{?suse_version} < 1599 %{_libdir}/python%{python_version}/lib-dynload/nis.so +%endif %{_libdir}/python%{python_version}/lib-dynload/operator.so %{_libdir}/python%{python_version}/lib-dynload/ossaudiodev.so %{_libdir}/python%{python_version}/lib-dynload/parser.so From 55461311b5e134642f06671d469257b10b103cc57ea2d99580b9d1cbb48f439e Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 6 Jun 2023 10:29:31 +0000 Subject: [PATCH 5/5] Remove silly comment in the changelog OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=366 --- python-base.changes | 5 ----- python-base.spec | 2 +- python-doc.changes | 5 ----- python.changes | 5 ----- 4 files changed, 1 insertion(+), 16 deletions(-) diff --git a/python-base.changes b/python-base.changes index dea7d54..12c4cd5 100644 --- a/python-base.changes +++ b/python-base.changes @@ -18,11 +18,6 @@ Wed May 24 20:50:27 UTC 2023 - Matej Cepl the documentation even with the current Sphinx. (SUSE-ONLY PATCH, DO NOT SEND UPSTREAM!) -------------------------------------------------------------------- -Sun Apr 30 18:18:09 UTC 2023 - Matej Cepl - -- Why in the world we download from HTTP? - ------------------------------------------------------------------- Wed Mar 8 21:17:18 UTC 2023 - Matej Cepl diff --git a/python-base.spec b/python-base.spec index 57e8e60..fae3e50 100644 --- a/python-base.spec +++ b/python-base.spec @@ -568,7 +568,7 @@ cp Makefile Makefile.pre.in Makefile.pre %{buildroot}%{_libdir}/python%{python_v %{_libdir}/python%{python_version}/lib-dynload/linuxaudiodev.so %{_libdir}/python%{python_version}/lib-dynload/math.so %{_libdir}/python%{python_version}/lib-dynload/mmap.so -%if 0%{?suse_version} < 1599 +%if 0%{?suse_version} >= 1500 && 0%{?suse_version} < 1599 %{_libdir}/python%{python_version}/lib-dynload/nis.so %endif %{_libdir}/python%{python_version}/lib-dynload/operator.so diff --git a/python-doc.changes b/python-doc.changes index dea7d54..12c4cd5 100644 --- a/python-doc.changes +++ b/python-doc.changes @@ -18,11 +18,6 @@ Wed May 24 20:50:27 UTC 2023 - Matej Cepl the documentation even with the current Sphinx. (SUSE-ONLY PATCH, DO NOT SEND UPSTREAM!) -------------------------------------------------------------------- -Sun Apr 30 18:18:09 UTC 2023 - Matej Cepl - -- Why in the world we download from HTTP? - ------------------------------------------------------------------- Wed Mar 8 21:17:18 UTC 2023 - Matej Cepl diff --git a/python.changes b/python.changes index dea7d54..12c4cd5 100644 --- a/python.changes +++ b/python.changes @@ -18,11 +18,6 @@ Wed May 24 20:50:27 UTC 2023 - Matej Cepl the documentation even with the current Sphinx. (SUSE-ONLY PATCH, DO NOT SEND UPSTREAM!) -------------------------------------------------------------------- -Sun Apr 30 18:18:09 UTC 2023 - Matej Cepl - -- Why in the world we download from HTTP? - ------------------------------------------------------------------- Wed Mar 8 21:17:18 UTC 2023 - Matej Cepl