Update the 1.20.0 snapshot

- initrd: skip ethernet hwtype in BOOTIF (rh #1726240)
- initrd: allow specifying the net mask in form of a prefix (rh #1725872)

.gitignore

@@ -357,3 +357,4 @@ network-manager-applet-0.8.1.tar.bz2
 /NetworkManager-1.18.0.tar.xz
 /NetworkManager-1.19.2.tar.xz
 /NetworkManager-1.19.3.tar.xz
+/NetworkManager-1.19.5.tar.xz

NetworkManager.spec

@@ -9,8 +9,8 @@
 
 %global epoch_version 1
 %global rpm_version 1.20.0
-%global real_version 1.19.3
-%global release_version 0.2
+%global real_version 1.19.5
+%global release_version 0.3
 %global snapshot %{nil}
 %global git_sha %{nil}
 
@@ -99,13 +99,7 @@
 %global dns_rc_manager_default file
 %endif
 
-%if 0%{?rhel}
-%global config_plugins_default ifcfg-rh,ibft
-%global ibft_enabled yes
-%else
 %global config_plugins_default ifcfg-rh
-%global ibft_enabled no
-%endif
 
 %if 0%{?fedora}
 # Altough eBPF would be available on Fedora's kernel, it seems
@@ -546,11 +540,6 @@ by nm-connection-editor and nm-applet in a non-graphical environment.
 	-Dtests=yes \
 	-Dvalgrind=no \
 	-Difcfg_rh=true \
-%if %{ibft_enabled} != yes
-	-Dibft=false \
-%else
-	-Dibft=true \
-%endif
 	-Difupdown=false \
 %if %{with ppp}
 	-Dpppd_plugin_dir=%{_libdir}/pppd/%{ppp_version} \
@@ -668,7 +657,6 @@ intltoolize --automake --copy --force
 %endif
 	--with-valgrind=no \
 	--enable-ifcfg-rh=yes \
-	--enable-config-plugin-ibft=%{ibft_enabled} \
 	--enable-ifupdown=no \
 %if %{with ppp}
 	--with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \
@@ -954,6 +942,11 @@ fi
 
 
 %changelog
+* Wed Jul 03 2019 Lubomir Rintel <lkundrak@v3.sk> - 1:1.20.0-0.3
+- Update the 1.20.0 snapshot
+- initrd: skip ethernet hwtype in BOOTIF (rh #1726240)
+- initrd: allow specifying the net mask in form of a prefix (rh #1725872)
+
 * Tue Jun 04 2019 Lubomir Rintel <lkundrak@v3.sk> - 1:1.20.0-0.2
 - Update the 1.20.0 snapshot
 - Re-enable the initrd generator

sources

@@ -1 +1 @@
-SHA512 (NetworkManager-1.19.3.tar.xz) = 60b7fb348209c4bc3646678ea620d218ea68c64bd468f6aca56db66120663aaf1e976e9034f346127a5d8a339948f18356ae5d585b6922c21a2d69dbeda5d090
+SHA512 (NetworkManager-1.19.5.tar.xz) = e07e82051a2dcf7550b69313671900053adeab40d1c93ca9e8642fb4d4b8a11b1317406bfd491473249385c078c544cdd1172d38510a1cf510f8e01677425e30