Skip to content

Commit c1b61c8

Browse files
committed
RPM: avoid meson upgrade for EL9
1 parent 92f3559 commit c1b61c8

File tree

3 files changed

+43
-2
lines changed

3 files changed

+43
-2
lines changed

.github/workflows/rpmbuild.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
container:
2020
- fedora:latest
2121
# - fedora:rawhide
22-
- rockylinux:9
22+
# - rockylinux:9 # lacking meson >= 1.3.0
2323
container:
2424
image: ${{ matrix.container }}
2525
steps:

rpm/meson-python-no-limited-api.diff

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
From d3ac742b25df0b495968003bf695a1e202455e19 Mon Sep 17 00:00:00 2001
2+
From: Lukas Märdian <slyon@ubuntu.com>
3+
Date: Thu, 28 Mar 2024 17:37:44 +0100
4+
Subject: [PATCH] Revert "meson: Build using Python 3.10 limited API (LP:
5+
#2050881)"
6+
7+
This reverts commit 5377b8c856f3f7a5b19ee7c486759adfac582d91.
8+
---
9+
meson.build | 2 +-
10+
python-cffi/netplan/meson.build | 1 -
11+
2 files changed, 1 insertion(+), 2 deletions(-)
12+
13+
diff --git a/meson.build b/meson.build
14+
index 8755ebe4..9556836a 100644
15+
--- a/meson.build
16+
+++ b/meson.build
17+
@@ -6,7 +6,7 @@ project('netplan', 'c',
18+
'warning_level=2',
19+
'werror=true',
20+
],
21+
- meson_version: '>= 1.3.0',
22+
+ meson_version: '>= 0.61.0',
23+
)
24+
25+
glib = dependency('glib-2.0')
26+
diff --git a/python-cffi/netplan/meson.build b/python-cffi/netplan/meson.build
27+
index 17b66140..2f820d13 100644
28+
--- a/python-cffi/netplan/meson.build
29+
+++ b/python-cffi/netplan/meson.build
30+
@@ -24,7 +24,6 @@ cffi_pyext = python.extension_module(
31+
link_with: [libnetplan],
32+
subdir: 'netplan',
33+
install: true,
34+
- limited_api: '3.10',
35+
)
36+
37+
bindings_sources = [
38+
--
39+
2.40.1
40+

rpm/netplan.spec

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,14 @@
1515
%endif
1616

1717
Name: netplan
18-
Version: 0.106
18+
Version: 1.0
1919
Release: 0%{?dist}
2020
Summary: Network configuration tool using YAML
2121
Group: System Environment/Base
2222
License: GPL-3.0-only
2323
URL: http://netplan.io/
2424
Source0: https://github.com/canonical/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
25+
#Patch0: meson-python-no-limited-api.diff
2526

2627
BuildRequires: gcc
2728
BuildRequires: meson >= 0.61

0 commit comments

Comments
 (0)