X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=NetworkManager.spec;h=3045ea87a43a0861afb82dca9462498224152ca7;hb=ccd465d;hp=13b6166a4752d879f866845abacfc3655a18d1f1;hpb=37b8dc823fcc44a37183b9d296c5866114122b02;p=packages%2FNetworkManager.git

diff --git a/NetworkManager.spec b/NetworkManager.spec
index 13b6166..3045ea8 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -4,17 +4,18 @@
 %bcond_without	systemd		# use systemd for session tracking instead of ConsoleKit (fallback to ConsoleKit on runtime)
 %bcond_without	vala		# Vala API
 %bcond_with	firewalld	# Firewalld zone for shared mode
+%bcond_with	default_iwd	# use IWD as deafult Wi-Fi backend instead of wpa_supplicant
 
 Summary:	Network Manager for GNOME
 Summary(pl.UTF-8):	Zarządca sieci dla GNOME
 Name:		NetworkManager
-Version:	1.32.8
+Version:	1.36.4
 Release:	1
 Epoch:		2
 License:	GPL v2+
 Group:		Networking/Admin
-Source0:	https://download.gnome.org/sources/NetworkManager/1.32/%{name}-%{version}.tar.xz
-# Source0-md5:	82d0943820df2d7cba9aed5a2d808cd0
+Source0:	https://download.gnome.org/sources/NetworkManager/1.36/%{name}-%{version}.tar.xz
+# Source0-md5:	cd2c2d377b4f672612b5c499a4c913e1
 Source1:	%{name}.conf
 Source3:	%{name}.tmpfiles
 Source4:	%{name}.init
@@ -86,10 +87,8 @@ Suggests:	ModemManager >= 1.0.0
 Suggests:	mobile-broadband-provider-info
 Suggests:	resolvconf
 Suggests:	teamd >= 1.9
-Obsoletes:	NetworkManager-systemd
+Obsoletes:	NetworkManager-systemd < 2:0.9.2.0-5
 Obsoletes:	dhcdbd < 3.0-1
-# sr@Latn vs. sr@latin
-Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		plugindir	%{_libdir}/NetworkManager
@@ -212,6 +211,7 @@ grep -rl /usr/bin/env examples | xargs sed -i -e '1{
 	--disable-silent-rules \
 	--enable-static \
 	%{!?with_vala:--disable-vala} \
+	--with-config-wifi-backend-default=%{?with_default_iwd:iwd}%{!?with_default_iwd:wpa_supplicant} \
 	--with-dhclient=/sbin/dhclient \
 	--with-dhcpcd=/sbin/dhcpcd \
 	%{!?with_firewalld:--disable-firewalld-zone} \
@@ -321,10 +321,10 @@ exit 0
 %attr(755,root,root) %{_libexecdir}/nm-daemon-helper
 %attr(755,root,root) %{_libexecdir}/nm-dhcp-helper
 %attr(755,root,root) %{_libexecdir}/nm-dispatcher
-%attr(755,root,root) %{_libexecdir}/nm-iface-helper
 %attr(755,root,root) %{_libexecdir}/nm-ifdown
 %attr(755,root,root) %{_libexecdir}/nm-ifup
 %attr(755,root,root) %{_libexecdir}/nm-initrd-generator
+%attr(755,root,root) %{_libexecdir}/nm-priv-helper
 %attr(755,root,root) %{_libdir}/pppd/plugins/nm-pppd-plugin.so
 %attr(754,root,root) /etc/rc.d/init.d/NetworkManager
 %if "%{_lib}" != "lib"
@@ -339,14 +339,17 @@ exit 0
 %{systemdunitdir}/NetworkManager.service
 %{systemdunitdir}/NetworkManager-dispatcher.service
 %{systemdunitdir}/NetworkManager-wait-online.service
-%{systemdunitdir}/nm-cloud-setup.service
-%{systemdunitdir}/nm-cloud-setup.timer
 %dir %{systemdunitdir}/NetworkManager.service.d
 %{systemdunitdir}/NetworkManager.service.d/NetworkManager-ovs.conf
+%{systemdunitdir}/nm-cloud-setup.service
+%{systemdunitdir}/nm-cloud-setup.timer
+%{systemdunitdir}/nm-priv-helper.service
 %{systemdtmpfilesdir}/%{name}.conf
 %{_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.d/nm-dispatcher.conf
 %{_datadir}/dbus-1/system.d/nm-ifcfg-rh.conf
+%{_datadir}/dbus-1/system.d/nm-priv-helper.conf
 %{_datadir}/dbus-1/system.d/org.freedesktop.NetworkManager.conf
 %{_datadir}/polkit-1/actions/org.freedesktop.NetworkManager.policy
 /lib/udev/rules.d/84-nm-drivers.rules