BR: docbook-dtd412-xml

[packages/NetworkManager.git] / NetworkManager.spec

diff --git a/NetworkManager.spec b/NetworkManager.spec
index 709229d4e255f3628fd18608dffc7d22974e582f..83d0611f85a532da4212b82a22967acf4956a4ca 100644 (file)
--- 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.2
+Version:       1.40.12
 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: 82dda0dc3963d7d6447a76c7aa831b85
+Source0:       https://download.gnome.org/sources/NetworkManager/1.40/%{name}-%{version}.tar.xz
+# Source0-md5: 45d7d94c61bbf4c061825005357253d0
 Source1:       %{name}.conf
 Source3:       %{name}.tmpfiles
 Source4:       %{name}.init
@@ -28,13 +29,13 @@ BuildRequires:      automake >= 1:1.12
 BuildRequires: bluez-libs-devel >= 5.0
 BuildRequires: curl-devel >= 7.24.0
 BuildRequires: dbus-devel >= 1.1.0
-BuildRequires: gettext-tools >= 0.17
+BuildRequires: docbook-dtd412-xml
+BuildRequires: gettext-tools >= 0.19.8
 BuildRequires: glib2-devel >= 1:2.38.0
 BuildRequires: gnome-common
 BuildRequires: gobject-introspection-devel >= 0.10.0
 BuildRequires: gtk-doc >= 1.0
 BuildRequires: gtk-doc-automake >= 1.0
-BuildRequires: intltool >= 0.40.0
 BuildRequires: jansson-devel >= 2.7
 BuildRequires: libndp-devel
 BuildRequires: libnl-devel >= 3.2.8
@@ -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
@@ -175,7 +174,7 @@ Summary:    Bash completion for NetworkManager command (nmcli)
 Summary(pl.UTF-8):     Bashowe uzupełnianie nazw dla polecenia NetworkManagera (nmcli)
 Group:         Applications/Shells
 Requires:      %{name} = %{epoch}:%{version}-%{release}
-Requires:      bash-completion >= 2.0
+Requires:      bash-completion >= 1:2.0
 BuildArch:     noarch
 
 %description -n bash-completion-NetworkManager
@@ -199,7 +198,7 @@ grep -rl /usr/bin/env examples | xargs sed -i -e '1{
 
 %build
 %{__gtkdocize}
-%{__intltoolize}
+%{__gettextize}
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
@@ -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} \
@@ -298,7 +298,7 @@ exit 0
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README TODO
+%doc AUTHORS ChangeLog NEWS README.md TODO
 %attr(755,root,root) %{_bindir}/nm-online
 %attr(755,root,root) %{_bindir}/nmcli
 %attr(755,root,root) %{_bindir}/nmtui
@@ -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
@@ -381,6 +384,7 @@ exit 0
 %{_mandir}/man7/nmcli-examples.7*
 %{_mandir}/man8/NetworkManager.8*
 %{_mandir}/man8/NetworkManager-dispatcher.8*
+%{_mandir}/man8/NetworkManager-wait-online.service.8*
 %{_mandir}/man8/nm-cloud-setup.8*
 %{_mandir}/man8/nm-initrd-generator.8*
 %{_examplesdir}/%{name}-%{version}