diff --git a/.NetworkManager.metadata b/.NetworkManager.metadata index 6bbd0cb..ca25f49 100644 --- a/.NetworkManager.metadata +++ b/.NetworkManager.metadata @@ -1 +1 @@ -1fef9e2ac7e45fdea64edfcc9a94ad3102ff9afc SOURCES/NetworkManager-1.33.4.tar.xz +0a1c2429e869af9a6acd29e50811f27b9655382a SOURCES/NetworkManager-1.35.1.tar.xz diff --git a/.gitignore b/.gitignore index b96596d..3a95ada 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/NetworkManager-1.33.4.tar.xz +SOURCES/NetworkManager-1.35.1.tar.xz diff --git a/SOURCES/9999-fix-pregen-doc.patch b/SOURCES/9999-fix-pregen-doc.patch index 14c8ae3..4d3bca9 100644 --- a/SOURCES/9999-fix-pregen-doc.patch +++ b/SOURCES/9999-fix-pregen-doc.patch @@ -1,4 +1,4 @@ -From 7423b47a3333b09fce9ddce33041e5dbdbb4c7e6 Mon Sep 17 00:00:00 2001 +From e1f76a6472f68c52b90679d9fe679a2b1a93b78b Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 27 Aug 2019 15:47:32 +0200 Subject: [PATCH] patch documentation with the proper default values @@ -14,7 +14,7 @@ Patch the man pages with the proper values. 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html -index e8efb5e7fe7d..f432f6736691 100644 +index 765ff10ad2..2ea978c0d5 100644 --- a/docs/api/html/NetworkManager.conf.html +++ b/docs/api/html/NetworkManager.conf.html @@ -658,7 +658,7 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth @@ -27,7 +27,7 @@ index e8efb5e7fe7d..f432f6736691 100644 diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5 -index 75215918a9d5..2251c95a11b5 100644 +index fc32393e09..f135e3a9c3 100644 --- a/man/NetworkManager.conf.5 +++ b/man/NetworkManager.conf.5 @@ -664,7 +664,7 @@ INFO\&. diff --git a/SPECS/NetworkManager.spec b/SPECS/NetworkManager.spec index eb7bcb3..e664286 100644 --- a/SPECS/NetworkManager.spec +++ b/SPECS/NetworkManager.spec @@ -5,9 +5,9 @@ %global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad) %global epoch_version 1 -%global rpm_version 1.34.0 -%global real_version 1.33.4 -%global release_version 0.3 +%global rpm_version 1.36.0 +%global real_version 1.35.1 +%global release_version 0.1 %global snapshot %{nil} %global git_sha %{nil} @@ -202,8 +202,10 @@ Patch2: 0002-firewall-Default-to-iptables-backend-to-preserve-behavior.patch Patch9999: 9999-fix-pregen-doc.patch Requires(post): systemd -Requires(post): /usr/sbin/update-alternatives +%if 0%{?fedora} || 0%{?rhel} > 7 Requires(post): systemd-udev +%endif +Requires(post): /usr/sbin/update-alternatives Requires(preun): systemd Requires(preun): /usr/sbin/update-alternatives Requires(postun): systemd @@ -1003,7 +1005,6 @@ fi %ghost %attr(755, root, root) %{_sbindir}/ifdown %{_libexecdir}/nm-dhcp-helper %{_libexecdir}/nm-dispatcher -%{_libexecdir}/nm-iface-helper %{_libexecdir}/nm-initrd-generator %{_libexecdir}/nm-daemon-helper %{_libexecdir}/nm-sudo @@ -1168,11 +1169,15 @@ fi %changelog +* Thu Nov 18 2021 Beniamino Galvani - 1:1.36.0-0.1 +- Upgrade to 1.35.1 release (development) +- core: refactor IP configuration code (rh #1868254) + * Thu Oct 21 2021 Ana Cabral - 1:1.34.0-0.3 - Upgrade to 1.33.4 release (development) - Deprecate "master"/"slave" on bonding and bridge API (rh #1949023) - core: Fix configuration reload for active devices (rh #1852445) -- CS8: Update systemd-udev dependency (rh #2012123) +- Update systemd-udev dependency (rh #2012123) * Thu Sep 23 2021 Ana Cabral - 1:1.34.0-0.2 - Upgrade to 1.33.3 release (development)