From a351caaa9a8a1d1a97146dd283e36300617683ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20M=C3=A4rdian?= Date: Thu, 28 Mar 2024 17:38:52 +0100 Subject: [PATCH] RPM: avoid meson upgrade for EL9 --- rpm/meson-python-no-limited-api.diff | 40 ++++++++++++++++++++++++++++ rpm/netplan.spec | 1 + 2 files changed, 41 insertions(+) create mode 100644 rpm/meson-python-no-limited-api.diff diff --git a/rpm/meson-python-no-limited-api.diff b/rpm/meson-python-no-limited-api.diff new file mode 100644 index 000000000..71e0e6484 --- /dev/null +++ b/rpm/meson-python-no-limited-api.diff @@ -0,0 +1,40 @@ +From d3ac742b25df0b495968003bf695a1e202455e19 Mon Sep 17 00:00:00 2001 +From: Lukas Märdian +Date: Thu, 28 Mar 2024 17:37:44 +0100 +Subject: [PATCH] Revert "meson: Build using Python 3.10 limited API (LP: + #2050881)" + +This reverts commit 5377b8c856f3f7a5b19ee7c486759adfac582d91. +--- + meson.build | 2 +- + python-cffi/netplan/meson.build | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 8755ebe4..9556836a 100644 +--- a/meson.build ++++ b/meson.build +@@ -6,7 +6,7 @@ project('netplan', 'c', + 'warning_level=2', + 'werror=true', + ], +- meson_version: '>= 1.3.0', ++ meson_version: '>= 0.61.0', + ) + + glib = dependency('glib-2.0') +diff --git a/python-cffi/netplan/meson.build b/python-cffi/netplan/meson.build +index 17b66140..2f820d13 100644 +--- a/python-cffi/netplan/meson.build ++++ b/python-cffi/netplan/meson.build +@@ -24,7 +24,6 @@ cffi_pyext = python.extension_module( + link_with: [libnetplan], + subdir: 'netplan', + install: true, +- limited_api: '3.10', + ) + + bindings_sources = [ +-- +2.40.1 + diff --git a/rpm/netplan.spec b/rpm/netplan.spec index 4df0b1f60..0a40d8465 100644 --- a/rpm/netplan.spec +++ b/rpm/netplan.spec @@ -22,6 +22,7 @@ Group: System Environment/Base License: GPL-3.0-only URL: http://netplan.io/ Source0: https://github.com/canonical/%{name}/archive/%{version}/%{name}-%{version}.tar.gz +Patch0: meson-python-no-limited-api.diff BuildRequires: gcc BuildRequires: meson >= 0.61