From fd6f6acab8fafa46fc3095475e72e618f3d35c7f Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 3 May 2019 11:47:46 +0200 Subject: [PATCH] Update to an early 1.20.0 snapshot --- .gitignore | 1 + NetworkManager.spec | 18 +++++++++++------- sources | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 2faef44..c61bbe6 100644 --- a/.gitignore +++ b/.gitignore @@ -355,3 +355,4 @@ network-manager-applet-0.8.1.tar.bz2 /NetworkManager-1.15.91.tar.xz /NetworkManager-1.16.0.tar.xz /NetworkManager-1.18.0.tar.xz +/NetworkManager-1.19.2.tar.xz diff --git a/NetworkManager.spec b/NetworkManager.spec index d38f907..72d59c8 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -8,9 +8,9 @@ %global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad) %global epoch_version 1 -%global rpm_version 1.18.0 -%global real_version 1.18.0 -%global release_version 1 +%global rpm_version 1.20.0 +%global real_version 1.19.2 +%global release_version 0.1 %global snapshot %{nil} %global git_sha %{nil} @@ -229,6 +229,8 @@ BuildRequires: libubsan %endif %endif +Provides: %{name}-dispatcher%{?_isa} = %{epoch}:%{version}-%{release} + # NetworkManager uses various parts of systemd-networkd internally, including # DHCP client, IPv4 Link-Local address negotiation or LLDP support. # This provide is essentially here so that NetworkManager shows on Security @@ -797,13 +799,15 @@ fi %{_sbindir}/%{name} %{_bindir}/nmcli %{_datadir}/bash-completion/completions/nmcli -%dir %{_sysconfdir}/%{name}/ +%dir %{_sysconfdir}/%{name} +%dir %{_sysconfdir}/%{name}/conf.d %dir %{_sysconfdir}/%{name}/dispatcher.d %dir %{_sysconfdir}/%{name}/dispatcher.d/pre-down.d %dir %{_sysconfdir}/%{name}/dispatcher.d/pre-up.d %dir %{_sysconfdir}/%{name}/dispatcher.d/no-wait.d %dir %{_sysconfdir}/%{name}/dnsmasq.d %dir %{_sysconfdir}/%{name}/dnsmasq-shared.d +%dir %{_sysconfdir}/%{name}/system-connections %config(noreplace) %{_sysconfdir}/%{name}/NetworkManager.conf %{_bindir}/nm-online %{_libexecdir}/nm-ifup @@ -820,8 +824,6 @@ fi %if %{with nmtui} %exclude %{_mandir}/man1/nmtui* %endif -%dir %{_sysconfdir}/%{name} -%dir %{_sysconfdir}/%{name}/conf.d %dir %{nmlibdir} %dir %{nmlibdir}/conf.d %dir %{nmlibdir}/VPN @@ -830,7 +832,6 @@ fi %{_mandir}/man7/nmcli-examples.7* %{_mandir}/man8/* %dir %{_localstatedir}/lib/NetworkManager -%dir %{_sysconfdir}/NetworkManager/system-connections %dir %{_sysconfdir}/sysconfig/network-scripts %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service %{_datadir}/polkit-1/actions/*.policy @@ -952,6 +953,9 @@ fi %changelog +* Fri May 03 2019 Lubomir Rintel - 1:1.20.0-0.1 +- Update to an early 1.20.0 snapshot + * Fri Apr 26 2019 Lubomir Rintel - 1:1.18.0-1 - Update to 1.18.0 release diff --git a/sources b/sources index 58516f7..cafa373 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (NetworkManager-1.18.0.tar.xz) = 148638695b16524155960971a5bce63f33ab3b5fb907985fabc5b793cbd4d2eaab9329f3dc850d77840497cdca1ba9624399a76a64b895e38fec616c5088be15 +SHA512 (NetworkManager-1.19.2.tar.xz) = 8f7d209d5da2f2a7dc8ecbb51bb95a59548f85c03265fd4f6d24eac5ab431302af18b2a92e45a98b50e1151c9e9c43368e5aae0a71f4eaad39c7068ef023c22e