From 1bfe509135b39734d6896da35797f09cae7d1e83cce1c8e3b95c42d0dd736d52 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Mon, 16 Oct 2023 22:18:29 +0000
Subject: [PATCH] Accepting request 1117674 from
 home:bnavigator:branches:devel:openSUSE:Factory:rpmlint

- Bump to python311
- Clarify script interpreter line
- update rpmlintrc
- Don't install buildtime requirement mesonbuild into the custom
  runtime environment

OBS-URL: https://build.opensuse.org/request/show/1117674
OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint-mini?expand=0&rev=181
---
 rpmlint-mini.changes   |  9 +++++++++
 rpmlint-mini.rpmlintrc |  2 ++
 rpmlint-mini.spec      |  8 ++++----
 stdlib.txt             | 20 ++++++++++++++++----
 4 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/rpmlint-mini.changes b/rpmlint-mini.changes
index bf6b63c..b7d1764 100644
--- a/rpmlint-mini.changes
+++ b/rpmlint-mini.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Oct 13 12:02:34 UTC 2023 - Ben Greiner <code@bnavigator.de>
+
+- Bump to python311
+- Clarify script interpreter line
+- update rpmlintrc
+- Don't install buildtime requirement mesonbuild into the custom
+  runtime environment
+
 -------------------------------------------------------------------
 Wed Oct 11 09:22:52 UTC 2023 - Daniel Garcia <daniel.garcia@suse.com>
 
diff --git a/rpmlint-mini.rpmlintrc b/rpmlint-mini.rpmlintrc
index 46fea1b..9634eec 100644
--- a/rpmlint-mini.rpmlintrc
+++ b/rpmlint-mini.rpmlintrc
@@ -1,7 +1,9 @@
 addFilter("wrong-script-interpreter")
 addFilter("library-without-ldconfig")
 addFilter("python-bytecode-without-source")
+addFilter("python-missing-require")
 addFilter("files-duplicate")
 addFilter("filelist-forbidden-opt")
 addFilter("invalid-url")
 addFilter("E: devel-file-in-non-devel-package .*site-packages.*fake_libc_include.*")
+addFilter("binary-or-shlib-calls-gethostbyname .*_socket.cpython.*.so")
\ No newline at end of file
diff --git a/rpmlint-mini.spec b/rpmlint-mini.spec
index 3d0568f..aada931 100644
--- a/rpmlint-mini.spec
+++ b/rpmlint-mini.spec
@@ -17,8 +17,8 @@
 
 
 # This works regardless of the primary python3 flavor. The stdlib.txt and
-# install section depend on the python 3.10 layout.
-%define python_flavor python310
+# install section depend on the python 3.11 layout.
+%define python_flavor python311
 %define my_python %{expand:%{__%{python_flavor}}}
 
 Name:           rpmlint-mini
@@ -71,7 +71,6 @@ source packages can be checked.
 
 %prep
 %autosetup -p1 -n desktop-file-utils-0.26
-<COPYING
 
 %build
 %meson
@@ -123,13 +122,14 @@ cp -a %{_libdir}/libpython%{python_version}*.so.* %{buildroot}/opt/testing/lib
 cp -a %{_libdir}/libexpat*.so.* %{buildroot}/opt/testing/lib
 cp -a %{_libdir}/libmpdec*.so.* %{buildroot}/opt/testing/lib || echo "Skipping libmpdec.so"
 pushd %{buildroot}/opt/testing/lib/python%{python_version}/
+rm -r site-packages/meson*
 for f in $(find -name \*.py | sort) ; do
   PYTHONOPTIMIZE=1 %{my_python} -O -m compileall -b $f
   rm $f
 done
 popd
 find %{buildroot}/opt/testing/ -name __pycache__  -exec rm -rf {} +
-# We need to force the shebang to be under /opt/testing
+# Change the script-interpreter line to use our custom python venv in /opt/testing
 sed -e '1s,#!.*python.*,#!/opt/testing/bin/python3,' %{_bindir}/rpmlint > %{buildroot}/opt/testing/bin/rpmlint.real
 
 chmod a+x %{buildroot}/opt/testing/bin/rpmlint.real
diff --git a/stdlib.txt b/stdlib.txt
index 0a6ba9c..e21a742 100644
--- a/stdlib.txt
+++ b/stdlib.txt
@@ -193,10 +193,8 @@ hashlib.py
 heapq.py
 importlib/_abc.py
 importlib/abc.py
-importlib/_adapters.py
 importlib/_bootstrap_external.py
 importlib/_bootstrap.py
-importlib/_common.py
 importlib/__init__.py
 importlib/machinery.py
 importlib/metadata/_adapters.py
@@ -207,9 +205,18 @@ importlib/metadata/_itertools.py
 importlib/metadata/_meta.py
 importlib/metadata/_text.py
 importlib/readers.py
-importlib/resources.py
+importlib/resources/_adapters.py
+importlib/resources/_common.py
+importlib/resources/__init__.py
+importlib/resources/_itertools.py
+importlib/resources/_legacy.py
+importlib/resources/abc.py
+importlib/resources/readers.py
+importlib/resources/simple.py
+importlib/simple.py
 importlib/util.py
 inspect.py
+ipaddress.py
 io.py
 keyword.py
 lib-dynload/array.cpython*.so
@@ -266,6 +273,7 @@ lib-dynload/_statistics.cpython*.so
 lib-dynload/_struct.cpython*.so
 lib-dynload/syslog.cpython*.so
 lib-dynload/termios.cpython*.so
+lib-dynload/_typing.cpython*.so
 lib-dynload/unicodedata.cpython*.so
 lib-dynload/_uuid.cpython*.so
 lib-dynload/xxlimited_35.cpython*.so
@@ -296,7 +304,11 @@ queue.py
 quopri.py
 os.py
 random.py
-re.py
+re/_casefix.py
+re/_compiler.py
+re/_constants.py
+re/__init__.py
+re/_parser.py
 reprlib.py
 selectors.py
 shlex.py