Accepting request 1091094 from devel:languages:python:Factory

- python-2.7.5-multilib.patch: Update for riscv64
- Don't fail if _ctypes or dl extension was not built

- 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/request/show/1091094
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python?expand=0&rev=184
This commit is contained in:
Dominique Leuenberger 2023-06-07 21:06:25 +00:00 committed by Git OBS Bridge
commit 3df3b9f1df
6 changed files with 49 additions and 23 deletions

View File

@ -375,7 +375,7 @@
+esac +esac
+ +
+case $ARCH:$python_cv_cc_64bit_output in +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" + LIB="lib64"
+ ;; + ;;
+*:*) +*:*)

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Tue May 30 10:43:13 UTC 2023 - Andreas Schwab <schwab@suse.de>
- 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 <mcepl@suse.com>
- 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 <mcepl@suse.com> Wed May 24 20:50:27 UTC 2023 - Matej Cepl <mcepl@suse.com>
@ -5,11 +18,6 @@ Wed May 24 20:50:27 UTC 2023 - Matej Cepl <mcepl@suse.com>
the documentation even with the current Sphinx. (SUSE-ONLY the documentation even with the current Sphinx. (SUSE-ONLY
PATCH, DO NOT SEND UPSTREAM!) PATCH, DO NOT SEND UPSTREAM!)
-------------------------------------------------------------------
Sun Apr 30 18:18:09 UTC 2023 - Matej Cepl <mcepl@suse.com>
- Why in the world we download from HTTP?
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 8 21:17:18 UTC 2023 - Matej Cepl <mcepl@suse.com> Wed Mar 8 21:17:18 UTC 2023 - Matej Cepl <mcepl@suse.com>

View File

@ -155,7 +155,9 @@ BuildRequires: automake
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: libbz2-devel BuildRequires: libbz2-devel
BuildRequires: libffi-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 BuildRequires: libnsl-devel
%endif %endif
BuildRequires: pkg-config BuildRequires: pkg-config
@ -566,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/linuxaudiodev.so
%{_libdir}/python%{python_version}/lib-dynload/math.so %{_libdir}/python%{python_version}/lib-dynload/math.so
%{_libdir}/python%{python_version}/lib-dynload/mmap.so %{_libdir}/python%{python_version}/lib-dynload/mmap.so
%if 0%{?suse_version} && 0%{?suse_version} < 1599 %if 0%{?suse_version} >= 1500 && 0%{?suse_version} < 1599
%{_libdir}/python%{python_version}/lib-dynload/nis.so %{_libdir}/python%{python_version}/lib-dynload/nis.so
%endif %endif
%{_libdir}/python%{python_version}/lib-dynload/operator.so %{_libdir}/python%{python_version}/lib-dynload/operator.so
@ -585,7 +587,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/_multibytecodec.so
%{_libdir}/python%{python_version}/lib-dynload/Python-%{tarversion}-py%{python_version}.egg-info %{_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) # 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*) # requires sizeof(int) == sizeof(long) == sizeof(char*)
%{_libdir}/python%{python_version}/lib-dynload/dl.so %{_libdir}/python%{python_version}/lib-dynload/dl.so
%endif %endif

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Tue May 30 10:43:13 UTC 2023 - Andreas Schwab <schwab@suse.de>
- 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 <mcepl@suse.com>
- 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 <mcepl@suse.com> Wed May 24 20:50:27 UTC 2023 - Matej Cepl <mcepl@suse.com>
@ -5,11 +18,6 @@ Wed May 24 20:50:27 UTC 2023 - Matej Cepl <mcepl@suse.com>
the documentation even with the current Sphinx. (SUSE-ONLY the documentation even with the current Sphinx. (SUSE-ONLY
PATCH, DO NOT SEND UPSTREAM!) PATCH, DO NOT SEND UPSTREAM!)
-------------------------------------------------------------------
Sun Apr 30 18:18:09 UTC 2023 - Matej Cepl <mcepl@suse.com>
- Why in the world we download from HTTP?
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 8 21:17:18 UTC 2023 - Matej Cepl <mcepl@suse.com> Wed Mar 8 21:17:18 UTC 2023 - Matej Cepl <mcepl@suse.com>

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Tue May 30 10:43:13 UTC 2023 - Andreas Schwab <schwab@suse.de>
- 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 <mcepl@suse.com>
- 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 <mcepl@suse.com> Wed May 24 20:50:27 UTC 2023 - Matej Cepl <mcepl@suse.com>
@ -5,11 +18,6 @@ Wed May 24 20:50:27 UTC 2023 - Matej Cepl <mcepl@suse.com>
the documentation even with the current Sphinx. (SUSE-ONLY the documentation even with the current Sphinx. (SUSE-ONLY
PATCH, DO NOT SEND UPSTREAM!) PATCH, DO NOT SEND UPSTREAM!)
-------------------------------------------------------------------
Sun Apr 30 18:18:09 UTC 2023 - Matej Cepl <mcepl@suse.com>
- Why in the world we download from HTTP?
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 8 21:17:18 UTC 2023 - Matej Cepl <mcepl@suse.com> Wed Mar 8 21:17:18 UTC 2023 - Matej Cepl <mcepl@suse.com>

View File

@ -155,6 +155,8 @@ BuildRequires: fdupes
BuildRequires: gdbm-devel BuildRequires: gdbm-devel
BuildRequires: gmp-devel BuildRequires: gmp-devel
BuildRequires: libbz2-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 %if 0%{?suse_version} >= 1500 && 0%{?suse_version} < 1599
BuildRequires: libnsl-devel BuildRequires: libnsl-devel
%endif %endif
@ -458,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/_bisect.so
rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_csv.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/_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/_ctypes_test.so
rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_elementtree.so rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_elementtree.so
rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_functools.so rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_functools.so
@ -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/linuxaudiodev.so
rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/math.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/mmap.so
%if 0%{?suse_version} >= 1500 && 0%{?suse_version} < 1599 rm -f %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/nis.so
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/operator.so
rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/ossaudiodev.so rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/ossaudiodev.so
rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/parser.so rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/parser.so