[packages/NetworkManager] - updated to 1.54.0
qboosh
qboosh at pld-linux.org
Mon Aug 25 18:50:55 CEST 2025
commit 9e6513f67db260d15b7b35d3dccd4e465d91ebfe
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Mon Aug 25 18:53:35 2025 +0200
- updated to 1.54.0
NetworkManager-gir3.patch | 90 -----------------------------------------------
NetworkManager.spec | 18 ++++++----
2 files changed, 12 insertions(+), 96 deletions(-)
---
diff --git a/NetworkManager.spec b/NetworkManager.spec
index a2c482d..cd25e24 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -11,8 +11,8 @@
Summary: Network Manager for GNOME
Summary(pl.UTF-8): Zarządca sieci dla GNOME
Name: NetworkManager
-Version: 1.52.0
-Release: 2
+Version: 1.54.0
+Release: 1
Epoch: 2
License: GPL v2+
Group: Networking/Admin
@@ -20,13 +20,12 @@ Group: Networking/Admin
#Source0: https://download.gnome.org/sources/NetworkManager/1.50/%{name}-%{version}.tar.xz
#Source0Download: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/releases
Source0: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/releases/%{version}/downloads/%{name}-%{version}.tar.xz
-# Source0-md5: a41314bafb43239c5813b1160e54b0dd
+# Source0-md5: 300509d31ac641bba24240d708916083
Source1: %{name}.conf
Source3: %{name}.tmpfiles
Source4: %{name}.init
Patch0: ifcfg-path.patch
Patch1: systemd-fallback.patch
-Patch2: %{name}-gir3.patch
Patch3: systemd-bpf-cap.patch
URL: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/
BuildRequires: ModemManager-devel >= 1.0.0
@@ -42,6 +41,7 @@ BuildRequires: gtk-doc >= 1.0
BuildRequires: jansson-devel >= 2.7
BuildRequires: libndp-devel
BuildRequires: libnl-devel >= 3.2.8
+BuildRequires: libnvme-devel >= 1.5
BuildRequires: libpsl-devel >= 0.1
BuildRequires: libselinux-devel
BuildRequires: libteamdctl-devel >= 1.9
@@ -81,6 +81,7 @@ Requires: dhcp-client
Requires: filesystem >= 3.0-37
Requires: jansson >= 2.7
Requires: libnl >= 3.2.8
+Requires: libnvme >= 1.5
Requires: libpsl >= 0.1
Requires: libteamdctl >= 1.9
Requires: newt >= 0.52.15
@@ -193,7 +194,6 @@ Bashowe uzupełnianie nazw dla polecenia NetworkManagera (nmcli).
%setup -q
%patch -P0 -p1
%{?with_systemd:%patch -P1 -p1}
-%patch -P2 -p1
%patch -P3 -p1
grep -rl /usr/bin/env examples | xargs sed -i -e '1{
@@ -210,17 +210,20 @@ grep -rl /usr/bin/env examples | xargs sed -i -e '1{
%build
%meson \
-Dbluez5_dun=true \
+ -Dconfig_dns_rc_manager_default=resolvconf \
-Dconfig_wifi_backend_default=%{?with_default_iwd:iwd}%{!?with_default_iwd:wpa_supplicant} \
-Ddhclient=/sbin/dhclient \
-Ddhcpcd=/sbin/dhcpcd \
-Ddist_version=%{version}-%{release} \
-Ddnsmasq=/usr/sbin/dnsmasq \
-Ddocs=true \
- %{?with_ebpf:-Debpf=true} \
+ -Debpf=%{__true_false ebpf} \
-Difcfg_rh=true \
+ -Difupdown=false \
-Diptables=/usr/sbin/iptables \
-Diwd=true \
-Dmodprobe=/sbin/modprobe \
+ -Dmore_asserts=0 \
-Dnft=/usr/sbin/nft \
-Dpppd=/usr/sbin/pppd \
-Dpppd_plugin_dir=%{_libdir}/pppd/plugins \
@@ -337,8 +340,11 @@ exit 0
%dir %{_prefix}/lib/NetworkManager/dispatcher.d/pre-up.d
%attr(755,root,root) %{_prefix}/lib/NetworkManager/dispatcher.d/pre-up.d/90-nm-cloud-setup.sh
%{systemdunitdir}/NetworkManager.service
+%{systemdunitdir}/NetworkManager-config-initrd.service
%{systemdunitdir}/NetworkManager-dispatcher.service
+%{systemdunitdir}/NetworkManager-initrd.service
%{systemdunitdir}/NetworkManager-wait-online.service
+%{systemdunitdir}/NetworkManager-wait-online-initrd.service
%dir %{systemdunitdir}/NetworkManager.service.d
%{systemdunitdir}/NetworkManager.service.d/NetworkManager-ovs.conf
%{systemdunitdir}/nm-cloud-setup.service
diff --git a/NetworkManager-gir3.patch b/NetworkManager-gir3.patch
deleted file mode 100644
index eb77c52..0000000
--- a/NetworkManager-gir3.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 12eff9a7fdfeabab12ce56e5f7d515a13a3d704c Mon Sep 17 00:00:00 2001
-From: Jan Tojnar <jtojnar at gmail.com>
-Date: Sun, 23 Mar 2025 16:35:44 +0100
-Subject: [PATCH] meson: Fix docs generation with PyGObject 3.52
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-PyGObject 3.52 switched from gobject-introspection’s libgirepository 1.0
-to glib’s libgirepository 2.0. As a result, the Python script would
-no longer be able to find the `GIRepository` 2.0 typelib:
-
- (process:1944): GLib-GIRepository-DEBUG: 15:25:14.521: Ignoring GIRepository-2.0.typelib because this libgirepository corresponds to GIRepository-3.0.typelib
-
-We could update the script to support both versions of the typelib
-but it is not really necessary. It was only used to add extra directories
-from `$LD_LIBRARY_PATH` and the CLI argument to repository’s library path
-but libgirepository already supports using `LD_LIBRARY_PATH` directly:
-https://docs.gtk.org/girepository/method.Repository.prepend_library_path.html
----
- src/libnm-client-impl/meson.build | 1 -
- tools/generate-docs-nm-settings-docs-gir.py | 28 ---------------------
- 2 files changed, 29 deletions(-)
-
-diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build
-index e50e8fbdbb9..b49366292f5 100644
---- a/src/libnm-client-impl/meson.build
-+++ b/src/libnm-client-impl/meson.build
-@@ -209,7 +209,6 @@ if enable_introspection
- 'LD_LIBRARY_PATH=' + ld_library_path,
- python_path,
- gen_gir_cmd,
-- '--lib-path', meson.current_build_dir(),
- '--gir', libnm_gir[0],
- '--output', '@OUTPUT@',
- '--target', name
-diff --git a/tools/generate-docs-nm-settings-docs-gir.py b/tools/generate-docs-nm-settings-docs-gir.py
-index e438d87ad40..40fab200030 100755
---- a/tools/generate-docs-nm-settings-docs-gir.py
-+++ b/tools/generate-docs-nm-settings-docs-gir.py
-@@ -6,26 +6,9 @@
- from __future__ import print_function, unicode_literals
- import xml.etree.ElementTree as ET
- import argparse
--import os
- import gi
- import re
-
--gi.require_version("GIRepository", "2.0")
--from gi.repository import GIRepository
--
--try:
-- libs = os.environ["LD_LIBRARY_PATH"].split(":")
-- libs.reverse()
-- for lib in libs:
-- GIRepository.Repository.prepend_library_path(lib)
--except AttributeError:
-- # An old GI version, that has no prepend_library_path
-- # It's alright, it probably interprets LD_LIBRARY_PATH
-- # correctly.
-- pass
--except KeyError:
-- pass
--
- gi.require_version("NM", "1.0")
- from gi.repository import NM, GObject
-
-@@ -354,13 +337,6 @@ def main(gir_path_str, output_path_str, output_target):
-
- if __name__ == "__main__":
- parser = argparse.ArgumentParser()
-- parser.add_argument(
-- "-l",
-- "--lib-path",
-- metavar="PATH",
-- action="append",
-- help="path to scan for shared libraries",
-- )
- parser.add_argument(
- "-g",
- "--gir",
-@@ -384,8 +360,4 @@ def main(gir_path_str, output_path_str, output_target):
-
- args = parser.parse_args()
-
-- if args.lib_path:
-- for lib in args.lib_path:
-- GIRepository.Repository.prepend_library_path(lib)
--
- main(args.gir, args.output, args.target)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/NetworkManager.git/commitdiff/9e6513f67db260d15b7b35d3dccd4e465d91ebfe
More information about the pld-cvs-commit
mailing list