Update to 1.36.2 release

This commit is contained in:
Beniamino Galvani 2022-03-07 10:31:55 +01:00
parent 9dc614162a
commit 8bcd242d34
3 changed files with 54 additions and 7 deletions

1
.gitignore vendored
View File

@ -406,3 +406,4 @@ network-manager-applet-0.8.1.tar.bz2
/NetworkManager-1.35.91.tar.xz /NetworkManager-1.35.91.tar.xz
/NetworkManager-1.35.92.tar.xz /NetworkManager-1.35.92.tar.xz
/NetworkManager-1.36.0.tar.xz /NetworkManager-1.36.0.tar.xz
/NetworkManager-1.36.2.tar.xz

View File

@ -5,8 +5,8 @@
%global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad) %global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad)
%global epoch_version 1 %global epoch_version 1
%global rpm_version 1.36.0 %global rpm_version 1.36.2
%global real_version 1.36.0 %global real_version 1.36.2
%global release_version 1 %global release_version 1
%global snapshot %{nil} %global snapshot %{nil}
%global git_sha %{nil} %global git_sha %{nil}
@ -14,6 +14,7 @@
%global obsoletes_device_plugins 1:0.9.9.95-1 %global obsoletes_device_plugins 1:0.9.9.95-1
%global obsoletes_ppp_plugin 1:1.5.3 %global obsoletes_ppp_plugin 1:1.5.3
%global obsoletes_initscripts_updown 1:1.36.0-0.6 %global obsoletes_initscripts_updown 1:1.36.0-0.6
%global obsoletes_ifcfg_rh 1:1.36.2-1
%global systemd_dir %{_prefix}/lib/systemd/system %global systemd_dir %{_prefix}/lib/systemd/system
%global sysctl_dir %{_prefix}/lib/sysctl.d %global sysctl_dir %{_prefix}/lib/sysctl.d
@ -147,9 +148,15 @@
%endif %endif
%if 0%{?rhel} > 8 || 0%{?fedora} > 32 %if 0%{?rhel} > 8 || 0%{?fedora} > 32
%global config_plugins_default keyfile,ifcfg-rh %global config_plugins_default_ifcfg_rh 0
%else %else
%global config_plugins_default ifcfg-rh %global config_plugins_default_ifcfg_rh 1
%endif
%if 0%{?rhel} > 9 || 0%{?fedora} > 35
%global split_ifcfg_rh 1
%else
%global split_ifcfg_rh 0
%endif %endif
%if 0%{?fedora} %if 0%{?fedora}
@ -210,6 +217,9 @@ Obsoletes: NetworkManager-wimax < 1.2
Suggests: NetworkManager-initscripts-updown Suggests: NetworkManager-initscripts-updown
%endif %endif
Obsoletes: NetworkManager < %{obsoletes_initscripts_updown} Obsoletes: NetworkManager < %{obsoletes_initscripts_updown}
%if 0%{?split_ifcfg_rh}
Obsoletes: NetworkManager < %{obsoletes_ifcfg_rh}
%endif
%if 0%{?rhel} && 0%{?rhel} <= 7 %if 0%{?rhel} && 0%{?rhel} <= 7
# Kept for RHEL to ensure that wired 802.1x works out of the box # Kept for RHEL to ensure that wired 802.1x works out of the box
@ -519,6 +529,9 @@ deployments.
%package dispatcher-routing-rules %package dispatcher-routing-rules
Summary: NetworkManager dispatcher file for advanced routing rules Summary: NetworkManager dispatcher file for advanced routing rules
Group: System Environment/Base Group: System Environment/Base
%if 0%{?split_ifcfg_rh}
Requires: %{name}-initscripts-ifcfg-rh
%endif
BuildArch: noarch BuildArch: noarch
Provides: %{name}-config-routing-rules = %{epoch}:%{version}-%{release} Provides: %{name}-config-routing-rules = %{epoch}:%{version}-%{release}
Obsoletes: %{name}-config-routing-rules < 1:1.31.0 Obsoletes: %{name}-config-routing-rules < 1:1.31.0
@ -543,6 +556,19 @@ by nm-connection-editor and nm-applet in a non-graphical environment.
%endif %endif
%if 0%{?split_ifcfg_rh}
%package initscripts-ifcfg-rh
Summary: NetworkManager plugin for reading and writing connections in ifcfg-rh format
Group: System Environment/Base
Requires: %{name} = %{epoch}:%{version}-%{release}
Obsoletes: NetworkManager < %{obsoletes_ifcfg_rh}
%description initscripts-ifcfg-rh
Installs a plugin for reading and writing connection profiles using
the Red Hat ifcfg format in /etc/sysconfig/network-scripts/.
%endif
%if %{with nm_cloud_setup} %if %{with nm_cloud_setup}
%package cloud-setup %package cloud-setup
Summary: Automatically configure NetworkManager in cloud Summary: Automatically configure NetworkManager in cloud
@ -693,7 +719,9 @@ Preferably use nmcli instead.
-Dfirewalld_zone=false \ -Dfirewalld_zone=false \
%endif %endif
-Ddist_version=%{version}-%{release} \ -Ddist_version=%{version}-%{release} \
-Dconfig_plugins_default=%{config_plugins_default} \ %if %{?config_plugins_default_ifcfg_rh}
-Dconfig_plugins_default=ifcfg-rh \
%endif
-Dresolvconf=no \ -Dresolvconf=no \
-Dnetconfig=no \ -Dnetconfig=no \
-Dconfig_dns_rc_manager_default=%{dns_rc_manager_default} \ -Dconfig_dns_rc_manager_default=%{dns_rc_manager_default} \
@ -993,7 +1021,9 @@ fi
%{dbus_sys_dir}/org.freedesktop.NetworkManager.conf %{dbus_sys_dir}/org.freedesktop.NetworkManager.conf
%{dbus_sys_dir}/nm-dispatcher.conf %{dbus_sys_dir}/nm-dispatcher.conf
%{dbus_sys_dir}/nm-priv-helper.conf %{dbus_sys_dir}/nm-priv-helper.conf
%if 0%{?split_ifcfg_rh} == 0
%{dbus_sys_dir}/nm-ifcfg-rh.conf %{dbus_sys_dir}/nm-ifcfg-rh.conf
%endif
%{_sbindir}/%{name} %{_sbindir}/%{name}
%{_bindir}/nmcli %{_bindir}/nmcli
%{_datadir}/bash-completion/completions/nmcli %{_datadir}/bash-completion/completions/nmcli
@ -1016,7 +1046,9 @@ fi
%{_libexecdir}/nm-priv-helper %{_libexecdir}/nm-priv-helper
%dir %{_libdir}/%{name} %dir %{_libdir}/%{name}
%dir %{nmplugindir} %dir %{nmplugindir}
%{nmplugindir}/libnm-settings-plugin*.so %if 0%{?split_ifcfg_rh} == 0
%{nmplugindir}/libnm-settings-plugin-ifcfg-rh.so
%endif
%if %{with nmtui} %if %{with nmtui}
%exclude %{_mandir}/man1/nmtui* %exclude %{_mandir}/man1/nmtui*
%endif %endif
@ -1035,7 +1067,9 @@ fi
%{_mandir}/man8/NetworkManager.8.gz %{_mandir}/man8/NetworkManager.8.gz
%{_mandir}/man8/NetworkManager-dispatcher.8.gz %{_mandir}/man8/NetworkManager-dispatcher.8.gz
%dir %{_localstatedir}/lib/NetworkManager %dir %{_localstatedir}/lib/NetworkManager
%if 0%{?split_ifcfg_rh} == 0
%dir %{_sysconfdir}/sysconfig/network-scripts %dir %{_sysconfdir}/sysconfig/network-scripts
%endif
%{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
%{_datadir}/dbus-1/system-services/org.freedesktop.nm_priv_helper.service %{_datadir}/dbus-1/system-services/org.freedesktop.nm_priv_helper.service
%{_datadir}/polkit-1/actions/*.policy %{_datadir}/polkit-1/actions/*.policy
@ -1163,6 +1197,14 @@ fi
%endif %endif
%if 0%{?split_ifcfg_rh}
%files initscripts-ifcfg-rh
%dir %{_sysconfdir}/sysconfig/network-scripts
%{nmplugindir}/libnm-settings-plugin-ifcfg-rh.so
%{dbus_sys_dir}/nm-ifcfg-rh.conf
%endif
%if %{with nm_cloud_setup} %if %{with nm_cloud_setup}
%files cloud-setup %files cloud-setup
%{_libexecdir}/nm-cloud-setup %{_libexecdir}/nm-cloud-setup
@ -1182,6 +1224,10 @@ fi
%changelog %changelog
* Mon Mar 7 2022 Beniamino Galvani <bgalvani@redhat.com> - 1:1.36.2-1
- Update to 1.36.2 release
- Split ifcfg-rh settings plugin into subpackage NetworkManager-initscripts-ifcfg-rh
* Thu Feb 24 2022 Lubomir Rintel <lkundrak@v3.sk> - 1:1.36.0-1 * Thu Feb 24 2022 Lubomir Rintel <lkundrak@v3.sk> - 1:1.36.0-1
- Update to 1.36.0 release - Update to 1.36.0 release

View File

@ -1 +1 @@
SHA512 (NetworkManager-1.36.0.tar.xz) = 9cc2f4ca0d4425423b6db75ed6c65f7a51229f7c654ab0b9b07d22c695b292d28768ff56aff6af3d9a2c0bd2b46d25bae015e9edacf766bfb74018b4e5847da8 SHA512 (NetworkManager-1.36.2.tar.xz) = 3d9085bb836000a2354415e5ff35e5e67eacd97680660613128b9befe981d67b6ac8d519581f8635bf219c2db03a92f182066efef3abb2094da2870e12caa353