update to an early 1.36 snapshot (1.35.4)

This commit is contained in:
Thomas Haller 2022-01-13 13:44:19 +01:00
parent 341972ce75
commit 88df317665
No known key found for this signature in database
GPG Key ID: 29C2366E4DFC5728
3 changed files with 14 additions and 10 deletions

1
.gitignore vendored
View File

@ -399,3 +399,4 @@ network-manager-applet-0.8.1.tar.bz2
/NetworkManager-1.35.1.tar.xz /NetworkManager-1.35.1.tar.xz
/NetworkManager-1.35.2.tar.xz /NetworkManager-1.35.2.tar.xz
/NetworkManager-1.35.3.tar.xz /NetworkManager-1.35.3.tar.xz
/NetworkManager-1.35.4.tar.xz

View File

@ -6,8 +6,8 @@
%global epoch_version 1 %global epoch_version 1
%global rpm_version 1.36.0 %global rpm_version 1.36.0
%global real_version 1.35.3 %global real_version 1.35.4
%global release_version 0.3 %global release_version 0.4
%global snapshot %{nil} %global snapshot %{nil}
%global git_sha %{nil} %global git_sha %{nil}
@ -32,7 +32,7 @@
%global real_version_major %(printf '%s' '%{real_version}' | sed -n 's/^\\([1-9][0-9]*\\.[0-9][0-9]*\\)\\.[0-9][0-9]*$/\\1/p') %global real_version_major %(printf '%s' '%{real_version}' | sed -n 's/^\\([1-9][0-9]*\\.[0-9][0-9]*\\)\\.[0-9][0-9]*$/\\1/p')
%global systemd_units NetworkManager.service NetworkManager-wait-online.service NetworkManager-dispatcher.service nm-sudo.service %global systemd_units NetworkManager.service NetworkManager-wait-online.service NetworkManager-dispatcher.service nm-priv-helper.service
%global systemd_units_cloud_setup nm-cloud-setup.service nm-cloud-setup.timer %global systemd_units_cloud_setup nm-cloud-setup.service nm-cloud-setup.timer
@ -185,7 +185,7 @@ Source4: 20-connectivity-fedora.conf
Source5: 20-connectivity-redhat.conf Source5: 20-connectivity-redhat.conf
Source6: 70-nm-connectivity.conf Source6: 70-nm-connectivity.conf
# Patch0001: 0001-some.patch #Patch1: 0001-some.patch
Requires(post): systemd Requires(post): systemd
%if 0%{?fedora} || 0%{?rhel} > 7 %if 0%{?fedora} || 0%{?rhel} > 7
@ -934,7 +934,7 @@ if [ $1 -eq 0 ]; then
/usr/sbin/update-alternatives --remove ifup %{_libexecdir}/nm-ifup >/dev/null 2>&1 || : /usr/sbin/update-alternatives --remove ifup %{_libexecdir}/nm-ifup >/dev/null 2>&1 || :
fi fi
%systemd_preun NetworkManager-wait-online.service NetworkManager-dispatcher.service nm-sudo.service %systemd_preun NetworkManager-wait-online.service NetworkManager-dispatcher.service nm-priv-helper.service
%if %{with nm_cloud_setup} %if %{with nm_cloud_setup}
@ -968,7 +968,7 @@ fi
%files %files
%{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-sudo.conf %{dbus_sys_dir}/nm-priv-helper.conf
%{dbus_sys_dir}/nm-ifcfg-rh.conf %{dbus_sys_dir}/nm-ifcfg-rh.conf
%{_sbindir}/%{name} %{_sbindir}/%{name}
%{_bindir}/nmcli %{_bindir}/nmcli
@ -993,7 +993,7 @@ fi
%{_libexecdir}/nm-dispatcher %{_libexecdir}/nm-dispatcher
%{_libexecdir}/nm-initrd-generator %{_libexecdir}/nm-initrd-generator
%{_libexecdir}/nm-daemon-helper %{_libexecdir}/nm-daemon-helper
%{_libexecdir}/nm-sudo %{_libexecdir}/nm-priv-helper
%dir %{_libdir}/%{name} %dir %{_libdir}/%{name}
%dir %{nmplugindir} %dir %{nmplugindir}
%{nmplugindir}/libnm-settings-plugin*.so %{nmplugindir}/libnm-settings-plugin*.so
@ -1017,7 +1017,7 @@ fi
%dir %{_localstatedir}/lib/NetworkManager %dir %{_localstatedir}/lib/NetworkManager
%dir %{_sysconfdir}/sysconfig/network-scripts %dir %{_sysconfdir}/sysconfig/network-scripts
%{_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.sudo.service %{_datadir}/dbus-1/system-services/org.freedesktop.nm-priv-helper.service
%{_datadir}/polkit-1/actions/*.policy %{_datadir}/polkit-1/actions/*.policy
%{_prefix}/lib/udev/rules.d/*.rules %{_prefix}/lib/udev/rules.d/*.rules
%if %{with firewalld_zone} %if %{with firewalld_zone}
@ -1027,7 +1027,7 @@ fi
%{systemd_dir}/NetworkManager.service %{systemd_dir}/NetworkManager.service
%{systemd_dir}/NetworkManager-wait-online.service %{systemd_dir}/NetworkManager-wait-online.service
%{systemd_dir}/NetworkManager-dispatcher.service %{systemd_dir}/NetworkManager-dispatcher.service
%{systemd_dir}/nm-sudo.service %{systemd_dir}/nm-priv-helper.service
%dir %{_datadir}/doc/NetworkManager/examples %dir %{_datadir}/doc/NetworkManager/examples
%{_datadir}/doc/NetworkManager/examples/server.conf %{_datadir}/doc/NetworkManager/examples/server.conf
%doc NEWS AUTHORS README CONTRIBUTING.md TODO %doc NEWS AUTHORS README CONTRIBUTING.md TODO
@ -1155,6 +1155,9 @@ fi
%changelog %changelog
* Thu Jan 13 2022 Thomas Haller <thaller@redhat.com> - 1:1.36.0-0.4
- update to an early 1.36 snapshot (1.35.4)
* Thu Dec 16 2021 Wen Liang <wenliang@redhat.com> - 1:1.36.0-0.3 * Thu Dec 16 2021 Wen Liang <wenliang@redhat.com> - 1:1.36.0-0.3
- update to an early 1.36 snapshot (1.35.3) - update to an early 1.36 snapshot (1.35.3)

View File

@ -1 +1 @@
SHA512 (NetworkManager-1.35.3.tar.xz) = 3d7006159a47148d4bc81df186123a5746dd91ff33ee95ba9704f10f9b44bd5e69987688b843d3678b12de2ab2310e7bad951e457239934f4f8e54065c4acb14 SHA512 (NetworkManager-1.35.4.tar.xz) = 16c57dd86cfd827d830b9cf0b46444f210d78d1da0ce0908114bb6a8bfa2888bd7d7397ea7172854d4ec4a8c709e56ec74349a2115dfb4382ece38115a3147c2