From 46a8ca6a14534878890c3f713dbdbb79c0a40131 Mon Sep 17 00:00:00 2001
From: dgarcia <>
Date: Oct 18 2022 10:51:02 +0000
Subject: Update python-meson-python to version 0.10.0 / rev 3 via SR 1010928


https://build.opensuse.org/request/show/1010928
by user dgarcia + dimstar_suse
- Update meson-subdir-fix.patch to fix the failure for python3.8 and python3.9
  because the meson package is only available for python3.10
- Add meson-subdir-fix.patch to fix the failure with new meson

---

diff --git a/.files b/.files
index c3260b8..7e28d3d 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 2bd8399..a63cde1 100644
--- a/.rev
+++ b/.rev
@@ -15,4 +15,15 @@
     <comment></comment>
     <requestid>1009788</requestid>
   </revision>
+  <revision rev="3" vrev="2">
+    <srcmd5>d4e40cbcaaded8f70e7f453ab3cc88ca</srcmd5>
+    <version>0.10.0</version>
+    <time>1666089850</time>
+    <user>dimstar_suse</user>
+    <comment>- Update meson-subdir-fix.patch to fix the failure for python3.8 and python3.9
+  because the meson package is only available for python3.10
+- Add meson-subdir-fix.patch to fix the failure with new meson
+</comment>
+    <requestid>1010928</requestid>
+  </revision>
 </revisionlist>
diff --git a/meson-subdir-fix.patch b/meson-subdir-fix.patch
new file mode 100644
index 0000000..b21e96e
--- /dev/null
+++ b/meson-subdir-fix.patch
@@ -0,0 +1,42 @@
+From f51fcafb20e20a8a724a2b65f49670a74fe7d8f2 Mon Sep 17 00:00:00 2001
+From: Ralf Gommers <ralf.gommers@gmail.com>
+Date: Thu, 6 Oct 2022 20:18:43 +0200
+Subject: [PATCH] TST: update the test for `install_subdir` for fix in meson
+ 0.63.3
+
+We weren't sure if the fix we needed was getting backported,
+but it has been.
+---
+ tests/test_wheel.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: meson_python-0.10.0/tests/test_wheel.py
+===================================================================
+--- meson_python-0.10.0.orig/tests/test_wheel.py
++++ meson_python-0.10.0/tests/test_wheel.py
+@@ -107,7 +107,7 @@ def test_scipy_like(wheel_scipy_like):
+     # 0.63.2: https://github.com/mesonbuild/meson/pull/10765
+     # A backport of the fix may land in 0.63.3, if so then remove the version
+     # check here and add the two expected files unconditionally.
+-    if meson_version and meson_version >= '0.63.99':
++    if meson_version and meson_version >= '0.63.3':
+         expecting |= {
+             'mypkg/submod/__init__.py',
+             'mypkg/submod/unknown_filetype.npq',
+@@ -120,7 +120,15 @@ def test_scipy_like(wheel_scipy_like):
+         for item in expecting:
+             assert item in actual_files
+     else:
+-        assert wheel_contents(artifact) == expecting
++        # meson_version is None for python3.8 and python3.9 but the real
++        # version installed is > 0.63.3, so it's possible that these two
++        # files exists in the wheel_contents but not in the expecting:
++        #   'mypkg/submod/__init__.py',
++        #   'mypkg/submod/unknown_filetype.npq',
++        # So we need to compare just the expecting
++        actual_files = wheel_contents(artifact)
++        for item in expecting:
++            assert item in actual_files
+ 
+     name = artifact.parsed_filename
+     assert name.group('pyver') == PYTHON_TAG
diff --git a/python-meson-python.changes b/python-meson-python.changes
index 1f0f8ad..b4c8b03 100644
--- a/python-meson-python.changes
+++ b/python-meson-python.changes
@@ -1,4 +1,15 @@
 -------------------------------------------------------------------
+Fri Oct 14 12:44:56 UTC 2022 - Daniel Garcia <daniel.garcia@suse.com>
+
+- Update meson-subdir-fix.patch to fix the failure for python3.8 and python3.9
+  because the meson package is only available for python3.10
+
+-------------------------------------------------------------------
+Fri Oct 14 08:49:00 UTC 2022 - Markéta Machová <mmachova@suse.com>
+
+- Add meson-subdir-fix.patch to fix the failure with new meson
+
+-------------------------------------------------------------------
 Tue Oct 11 09:01:00 UTC 2022 - Ben Greiner <code@bnavigator.de>
 
 - Update to 0.10.0
diff --git a/python-meson-python.spec b/python-meson-python.spec
index 0f7fc98..6097551 100644
--- a/python-meson-python.spec
+++ b/python-meson-python.spec
@@ -25,6 +25,8 @@ URL:            https://github.com/FFY00/meson-python
 Source:         https://files.pythonhosted.org/packages/source/m/meson_python/meson_python-%{version}.tar.gz
 # PATCH-FEATURE-OPENSUSE mesonpy-trim-deps.patch code@bnavigator.de
 Patch1:         mesonpy-trim-deps.patch
+# PATCH-FIX-UPSTREAM https://github.com/FFY00/meson-python/commit/f51fcafb20e20a8a724a2b65f49670a74fe7d8f2 TST: update the test for install_subdir for fix in meson 0.63.3
+Patch2:         meson-subdir-fix.patch
 BuildRequires:  %{python_module base >= 3.7}
 BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module pyproject-metadata >= 0.6.1}