Summary: Network Manager for GNOME
Summary(pl.UTF-8): Zarządca sieci dla GNOME
Name: NetworkManager
-Version: 1.8.2
+Version: 1.20.8
Release: 1
Epoch: 2
License: GPL v2+
Group: Networking/Admin
-Source0: http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.8/%{name}-%{version}.tar.xz
-# Source0-md5: 1acf7a551905ae85d9987aadbb5f7205
+Source0: http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.20/%{name}-%{version}.tar.xz
+# Source0-md5: c0ceb5ab14bfdfeee07536d94cc5c548
Source1: %{name}.conf
Source3: %{name}.tmpfiles
Source4: %{name}.init
BuildRequires: gtk-doc >= 1.0
BuildRequires: gtk-doc-automake >= 1.0
BuildRequires: intltool >= 0.40.0
-BuildRequires: jansson-devel
+BuildRequires: jansson-devel >= 2.5
BuildRequires: libndp-devel
BuildRequires: libnl-devel >= 3.2.8
BuildRequires: libpsl-devel >= 0.1
BuildRequires: libuuid-devel
BuildRequires: libxslt-progs
BuildRequires: newt-devel >= 0.52.15
+# also gnutls (>= 2.12) possible (--with-crypto=gnutls)
BuildRequires: nss-devel >= 3.11
BuildRequires: perl-base
BuildRequires: pkgconfig
Requires: curl-libs >= 7.24.0
Requires: dhcp-client
Requires: filesystem >= 3.0-37
+Requires: jansson >= 2.5
Requires: libnl >= 3.2.8
Requires: libpsl >= 0.1
Requires: libteamdctl >= 1.9
Conflicts: glibc-misc < 6:2.7
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _libexecdir %{_libdir}/%{name}
+%define plugindir %{_libdir}/NetworkManager
+%define distplugindir %{plugindir}/%{version}-%{release}
%description
Network Manager for GNOME.
Zarządca sieci dla GNOME.
%package apidocs
-Summary: libnm-glib library API documentation
-Summary(pl.UTF-8): Dokumentacja API biblioteki libnm-glib
+Summary: libnm library API documentation
+Summary(pl.UTF-8): Dokumentacja API biblioteki libnm
Group: Documentation
Requires: gtk-doc-common
%if "%{_rpmversion}" >= "5"
%endif
%description apidocs
-libnm-glib library API documentation.
+libnm library API documentation.
%description apidocs -l pl.UTF-8
-Dokumentacja API biblioteki libnm-glib.
+Dokumentacja API biblioteki libnm.
%package libs
Summary: Network Manager shared libraries
--with-dhcpcd=/sbin/dhcpcd \
--with-html-dir=%{_gtkdocdir} \
--with-iptables=/usr/sbin/iptables \
+ --with-iwd=yes \
--with-nmcli \
--with-system-ca-path=/etc/certs \
--with-systemdsystemunitdir=%{systemdunitdir} \
--with-suspend-resume=%{?with_systemd:systemd}%{!?with_systemd:upower} \
--with-pppd=/usr/sbin/pppd \
--with-pppd-plugin-dir=%{_libdir}/pppd/plugins \
- --with-pppoe=/usr/sbin/pppoe \
--with-resolvconf=/sbin/resolvconf \
--with-udev-dir=/lib/udev \
--with-dist-version=%{version}-%{release}
# Cleanup
%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/NetworkManager/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{distplugindir}/*.{a,la}
%{__rm} $RPM_BUILD_ROOT%{_libdir}/pppd/plugins/*.{a,la}
%find_lang %{name}
%attr(755,root,root) %{_bindir}/nmtui-edit
%attr(755,root,root) %{_bindir}/nmtui-hostname
%attr(755,root,root) %{_sbindir}/NetworkManager
-%dir %{_libdir}/NetworkManager
-%attr(755,root,root) %{_libdir}/NetworkManager/libnm-device-plugin-adsl.so
-%attr(755,root,root) %{_libdir}/NetworkManager/libnm-device-plugin-bluetooth.so
-%attr(755,root,root) %{_libdir}/NetworkManager/libnm-device-plugin-wifi.so
-%attr(755,root,root) %{_libdir}/NetworkManager/libnm-device-plugin-wwan.so
-%attr(755,root,root) %{_libdir}/NetworkManager/libnm-device-plugin-team.so
-%attr(755,root,root) %{_libdir}/NetworkManager/libnm-ppp-plugin.so
-%attr(755,root,root) %{_libdir}/NetworkManager/libnm-settings-plugin-ibft.so
-%attr(755,root,root) %{_libdir}/NetworkManager/libnm-settings-plugin-ifcfg-rh.so
-%attr(755,root,root) %{_libdir}/NetworkManager/libnm-wwan.so
+%dir %{plugindir}
+%dir %{distplugindir}
+%attr(755,root,root) %{distplugindir}/libnm-device-plugin-adsl.so
+%attr(755,root,root) %{distplugindir}/libnm-device-plugin-bluetooth.so
+%attr(755,root,root) %{distplugindir}/libnm-device-plugin-ovs.so
+%attr(755,root,root) %{distplugindir}/libnm-device-plugin-wifi.so
+%attr(755,root,root) %{distplugindir}/libnm-device-plugin-wwan.so
+%attr(755,root,root) %{distplugindir}/libnm-device-plugin-team.so
+%attr(755,root,root) %{distplugindir}/libnm-ppp-plugin.so
+%attr(755,root,root) %{distplugindir}/libnm-settings-plugin-ifcfg-rh.so
+%attr(755,root,root) %{distplugindir}/libnm-wwan.so
%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) %{_libdir}/pppd/plugins/nm-pppd-plugin.so
%attr(754,root,root) /etc/rc.d/init.d/NetworkManager
%if "%{_lib}" != "lib"
%{systemdunitdir}/NetworkManager.service
%{systemdunitdir}/NetworkManager-dispatcher.service
%{systemdunitdir}/NetworkManager-wait-online.service
-# XXX: dir here or add to systemd-units?
-%dir %{systemdunitdir}/network-online.target.wants
-%{systemdunitdir}/network-online.target.wants/NetworkManager-wait-online.service
-%{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManager.service
+%dir %{systemdunitdir}/NetworkManager.service.d
+%{systemdunitdir}/NetworkManager.service.d/NetworkManager-ovs.conf
%{systemdtmpfilesdir}/%{name}.conf
%{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
%{_datadir}/polkit-1/actions/org.freedesktop.NetworkManager.policy
/lib/udev/rules.d/84-nm-drivers.rules
/lib/udev/rules.d/85-nm-unmanaged.rules
+/lib/udev/rules.d/90-nm-thunderbolt.rules
%dir %{_sysconfdir}/%{name}/VPN
%dir %{_sysconfdir}/%{name}/conf.d
%dir %{_sysconfdir}/%{name}/dispatcher.d
%{_mandir}/man5/nm-settings-keyfile.5*
%{_mandir}/man5/nm-settings.5*
%{_mandir}/man5/nm-system-settings.conf.5*
+%{_mandir}/man7/nm-openvswitch.7*
%{_mandir}/man7/nmcli-examples.7*
%{_mandir}/man8/NetworkManager.8*
+%{_mandir}/man8/nm-initrd-generator.8*
%{_examplesdir}/%{name}-%{version}
%files apidocs
%defattr(644,root,root,755)
%{_gtkdocdir}/NetworkManager
%{_gtkdocdir}/libnm
-%{_gtkdocdir}/libnm-glib
-%{_gtkdocdir}/libnm-util
%files libs
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libnm.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libnm.so.0
-%attr(755,root,root) %{_libdir}/libnm-util.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnm-util.so.2
-%attr(755,root,root) %{_libdir}/libnm-glib.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnm-glib.so.4
-%attr(755,root,root) %{_libdir}/libnm-glib-vpn.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnm-glib-vpn.so.1
%{_libdir}/girepository-1.0/NM-1.0.typelib
-%{_libdir}/girepository-1.0/NMClient-1.0.typelib
-%{_libdir}/girepository-1.0/NetworkManager-1.0.typelib
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libnm.so
-%attr(755,root,root) %{_libdir}/libnm-util.so
-%attr(755,root,root) %{_libdir}/libnm-glib.so
-%attr(755,root,root) %{_libdir}/libnm-glib-vpn.so
-%{_includedir}/NetworkManager
%{_includedir}/libnm
-%{_includedir}/libnm-glib
-%{_pkgconfigdir}/NetworkManager.pc
%{_pkgconfigdir}/libnm.pc
-%{_pkgconfigdir}/libnm-util.pc
-%{_pkgconfigdir}/libnm-glib-vpn.pc
-%{_pkgconfigdir}/libnm-glib.pc
%{_datadir}/dbus-1/interfaces/org.freedesktop.NetworkManager.xml
%{_datadir}/dbus-1/interfaces/org.freedesktop.NetworkManager.*.xml
%{_datadir}/gir-1.0/NM-1.0.gir
-%{_datadir}/gir-1.0/NMClient-1.0.gir
-%{_datadir}/gir-1.0/NetworkManager-1.0.gir
%files static
%defattr(644,root,root,755)
%{_libdir}/libnm.a
-%{_libdir}/libnm-util.a
-%{_libdir}/libnm-glib.a
-%{_libdir}/libnm-glib-vpn.a
%if %{with vala}
%files -n vala-NetworkManager
%defattr(644,root,root,755)
%{_datadir}/vala/vapi/libnm.deps
%{_datadir}/vala/vapi/libnm.vapi
-%{_datadir}/vala/vapi/libnm-glib.deps
-%{_datadir}/vala/vapi/libnm-glib.vapi
-%{_datadir}/vala/vapi/libnm-util.deps
-%{_datadir}/vala/vapi/libnm-util.vapi
%endif
%files -n bash-completion-NetworkManager