diff --git a/.gitignore b/.gitignore index c1614e5..c2cb4ab 100644 --- a/.gitignore +++ b/.gitignore @@ -435,3 +435,4 @@ network-manager-applet-0.8.1.tar.bz2 /NetworkManager-1.43.8.tar.xz /NetworkManager-1.43.10.tar.xz /NetworkManager-1.43.90.tar.xz +/NetworkManager-1.44.0.tar.xz diff --git a/NetworkManager.spec b/NetworkManager.spec index 1b383c9..366ae91 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -4,7 +4,7 @@ %global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad) %global epoch_version 1 -%global real_version 1.43.90 +%global real_version 1.44.0 %global rpm_version %{real_version} %global release_version 1 %global snapshot %{nil} @@ -161,6 +161,12 @@ %global ifcfg_warning 0 %endif +%if 0%{?fedora} >= 39 +%global ifcfg_migrate 1 +%else +%global ifcfg_migrate 0 +%endif + %if 0%{?fedora} # Although eBPF would be available on Fedora's kernel, it seems # we often get SELinux denials (rh#1651654). But even aside them, @@ -185,7 +191,7 @@ Epoch: %{epoch_version} Version: %{rpm_version} Release: %{release_version}%{?snap}%{?dist} Group: System Environment/Base -License: GPLv2+ and LGPLv2+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later URL: https://networkmanager.dev/ Source: https://download.gnome.org/sources/NetworkManager/%{real_version_major}/%{name}-%{real_version}.tar.xz @@ -733,6 +739,9 @@ Preferably use nmcli instead. -Ddist_version=%{version}-%{release} \ %if %{?config_plugins_default_ifcfg_rh} -Dconfig_plugins_default=ifcfg-rh \ +%endif +%if %{?ifcfg_migrate} + -Dconfig_migrate_ifcfg_rh_default=true \ %endif -Dresolvconf=no \ -Dnetconfig=no \ @@ -878,6 +887,9 @@ autoreconf --install --force --with-dist-version=%{version}-%{release} \ %if %{?config_plugins_default_ifcfg_rh} --with-config-plugins-default=ifcfg-rh \ +%endif +%if %{?ifcfg_migrate} + --with-config-migrate-ifcfg-rh-default=yes \ %endif --with-resolvconf=no \ --with-netconfig=no \ @@ -1246,6 +1258,11 @@ fi %changelog +* Thu Aug 10 2023 Beniamino Galvani - 1:1.44.0-1 +- Update to 1.44.0 release +- Enable automatic migration of ifcfg profiles to keyfile: + https://fedoraproject.org/wiki/Changes/MigrateIfcfgToKeyfile + * Fri Jul 28 2023 Beniamino Galvani - 1:1.43.90-1 - Update to 1.44-rc1 (1.43.90) (release candidate) diff --git a/sources b/sources index be8c149..9b84f9d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (NetworkManager-1.43.90.tar.xz) = 3d237b76fa07d0f68a79d6820066d7ee448971a322a9820c32638df37032402dd3fc36e51083f6f4c68bb8871f8330c58cdf7b29cbeb53049a947646e378c637 +SHA512 (NetworkManager-1.44.0.tar.xz) = 7ebece465dfd108d66adb1c941ab22bdca8bb0ce7869baa421e4aef65e89a23bf63f3713e809e1e7b6c5226813ad9d56d8af339c711507a33aa6728afd334405