+# TODO: package /usr/lib/firewalld/zones/nm-shared.xml for firewalld support
#
# Conditional build
-%bcond_without systemd # use systemd for session tracking instead of ConsoleKit (fallback to ConsoleKit on runtime)
-%bcond_without vala # Vala API
+%bcond_without static_libs # static library
+%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.4.0
+Version: 1.46.0
Release: 1
Epoch: 2
License: GPL v2+
Group: Networking/Admin
-Source0: http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.4/%{name}-%{version}.tar.xz
-# Source0-md5: 337e676261ca94af08f8e9b6f9b09a5b
+Source0: https://download.gnome.org/sources/NetworkManager/1.46/%{name}-%{version}.tar.xz
+# Source0-md5: 0594a237e7182341dd39cf465b1b60fe
Source1: %{name}.conf
Source3: %{name}.tmpfiles
Source4: %{name}.init
BuildRequires: autoconf >= 2.63
BuildRequires: automake >= 1:1.12
BuildRequires: bluez-libs-devel >= 5.0
+BuildRequires: curl-devel >= 7.24.0
BuildRequires: dbus-devel >= 1.1.0
-BuildRequires: dbus-glib-devel >= 0.100
BuildRequires: docbook-dtd412-xml
-BuildRequires: gettext-tools >= 0.17
-BuildRequires: glib2-devel >= 1:2.38.0
+BuildRequires: gettext-tools >= 0.19.8
+BuildRequires: glib2-devel >= 1:2.42
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
+BuildRequires: jansson-devel >= 2.7
BuildRequires: libndp-devel
BuildRequires: libnl-devel >= 3.2.8
+BuildRequires: libpsl-devel >= 0.1
BuildRequires: libselinux-devel
-BuildRequires: libsoup-devel >= 2.40.0
BuildRequires: libteamdctl-devel >= 1.9
BuildRequires: libtool >= 2:2.2
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
BuildRequires: polkit-devel >= 0.97
-BuildRequires: ppp-plugin-devel >= 3:2.4.6
-BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.673
+BuildRequires: ppp-plugin-devel >= 3:2.4.9
+BuildRequires: python3 >= 1:3
+BuildRequires: python3-pygobject3
+BuildRequires: readline-devel
+BuildRequires: rpm-build >= 4.6
+BuildRequires: rpmbuild(macros) >= 1.752
BuildRequires: sed >= 4.0
%{?with_systemd:BuildRequires: systemd-devel >= 1:209}
BuildRequires: tar >= 1:1.22
-BuildRequires: udev-devel
-BuildRequires: udev-glib-devel >= 1:165
+BuildRequires: udev-devel >= 1:175
%{?with_vala:BuildRequires: vala >= 2:0.17.1.24}
BuildRequires: xz
Requires(post,preun): /sbin/chkconfig
%else
Requires: ConsoleKit-x11
%endif
+Requires: curl-libs >= 7.24.0
Requires: dhcp-client
Requires: filesystem >= 3.0-37
+Requires: jansson >= 2.7
Requires: libnl >= 3.2.8
-Requires: libsoup >= 2.40.0
+Requires: libpsl >= 0.1
Requires: libteamdctl >= 1.9
Requires: newt >= 0.52.15
Requires: polkit >= 0.97
Requires: rc-scripts >= 0.4.3.0
Requires: systemd-units >= 38
-Requires: wpa_supplicant >= 0.7.3-4
Suggests: ModemManager >= 1.0.0
+%{?with_default_iwd:Suggests: iwd}
Suggests: mobile-broadband-provider-info
Suggests: resolvconf
Suggests: teamd >= 1.9
-Obsoletes: NetworkManager-systemd
+%{!?with_default_iwd:Suggests: wpa_supplicant >= 0.7.3-4}
+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 _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"
BuildArch: noarch
-%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
Summary(pl.UTF-8): Biblioteki dzielone Network Managera
Group: Libraries
-Requires: dbus-glib >= 0.100
-Requires: glib2 >= 1:2.38.0
+Requires: glib2 >= 1:2.42
Requires: nss >= 3.11
-Requires: udev-glib >= 1:165
+Requires: udev-libs >= 1:175
Conflicts: NetworkManager < 0.6.4-0.2
%description libs
Summary(pl.UTF-8): Pliki nagłówkowe Network Managera
Group: Development/Libraries
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Requires: dbus-glib-devel >= 0.100
-Requires: glib2-devel >= 1:2.38.0
+Requires: glib2-devel >= 1:2.42
Requires: libuuid-devel
Requires: nss-devel >= 3.11
-Requires: udev-glib-devel >= 1:165
%description devel
Network Manager includes and more.
Group: Development/Libraries
Requires: %{name}-devel = %{epoch}:%{version}-%{release}
Requires: vala >= 2:0.17.1.24
-%if "%{_rpmversion}" >= "5"
BuildArch: noarch
-%endif
%description -n vala-NetworkManager
Vala API for NetworkManager libraries.
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
-%if "%{_rpmversion}" >= "5"
+Requires: bash-completion >= 1:2.0
BuildArch: noarch
-%endif
%description -n bash-completion-NetworkManager
Bash completion for NetworkManager command (nmcli).
%patch0 -p1
%{?with_systemd:%patch1 -p1}
+grep -rl /usr/bin/env examples | xargs sed -i -e '1{
+ s,^#!.*bin/env gjs,#!/usr/bin/gjs,
+ s,^#!.*bin/env lua,#!%{__lua},
+ s,^#!.*bin/env python,#!%{__python3},
+ s,^#!.*bin/env ruby,#!%{__ruby},
+}'
+
+
%build
%{__gtkdocize}
-%{__intltoolize}
+%{__gettextize}
%{__libtoolize}
%{__aclocal} -I m4
%{__autoconf}
%{__autoheader}
%{__automake}
%configure \
- --disable-silent-rules \
- --with-html-dir=%{_gtkdocdir} \
+ --enable-gtk-doc \
--enable-ifcfg-rh \
- --enable-more-warnings=yes \
+ --enable-more-warnings \
+ --disable-silent-rules \
+ %{__enable_disable static_libs 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} \
+ --with-html-dir=%{_gtkdocdir} \
--with-iptables=/usr/sbin/iptables \
+ --with-iwd=yes \
+ --with-nft=/usr/sbin/nft \
+ --with-nmcli \
--with-system-ca-path=/etc/certs \
--with-systemdsystemunitdir=%{systemdunitdir} \
--with-session-tracking=%{?with_systemd:systemd}%{!?with_systemd:ck} \
--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} \
- --with-docs \
- --enable-static \
- %{!?with_vala:--disable-vala}
+ --with-dist-version=%{version}-%{release}
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,/var/run/%{name},%{systemdtmpfilesdir}} \
- $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{VPN,dispatcher.d,system-connections} \
+ $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{VPN,conf.d,dispatcher.d,dnsmasq.d,dnsmasq-shared.d,system-connections} \
+ $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/dispatcher.d/{pre-down.d,pre-up.d,no-wait.d} \
$RPM_BUILD_ROOT%{_prefix}/lib/%{name}/{VPN,conf.d}
%{__make} install \
# Cleanup
%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/NetworkManager/*.{a,la}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/pppd/plugins/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{distplugindir}/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/pppd/plugins/*.la
+%if %{with static_libs}
+%{__rm} $RPM_BUILD_ROOT%{distplugindir}/*.a
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/pppd/plugins/*.a
+%endif
%find_lang %{name}
# examples
+%{__make} clean-checkPROGRAMS
+
install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-%{__make} clean \
- top_builddir=$(pwd) \
- -C $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-find $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} -name 'Makefile*' | xargs rm
%clean
rm -rf $RPM_BUILD_ROOT
%triggerpostun -- NetworkManager < 2:0.9.2.0-5
%systemd_trigger NetworkManager.service NetworkManager-wait-online.service
-%triggerun -- NetworkManager < 0.7.0-0.svn4027.1
-%service -q NetworkManagerDispatcher stop
-/sbin/chkconfig --del NetworkManagerDispatcher
-
%triggerun -- NetworkManager < 0.8.9997-5
-# move network interfaces description files to new location
+# < 0.7.0-0.svn4027.1: disable obsolete service
+if /sbin/chkconfig --list | grep -q NetworkManagerDispatcher ; then
+ %service -q NetworkManagerDispatcher stop
+ /sbin/chkconfig --del NetworkManagerDispatcher
+fi
+# < 0.8.9997-5: move network interfaces description files to new location
mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
mv -f /etc/sysconfig/network-scripts/keys-* /etc/sysconfig/interfaces
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
%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-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-cloud-setup
+%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"
%endif
%dir %{_prefix}/lib/NetworkManager/VPN
%dir %{_prefix}/lib/NetworkManager/conf.d
+%dir %{_prefix}/lib/NetworkManager/dispatcher.d
+%{_prefix}/lib/NetworkManager/dispatcher.d/90-nm-cloud-setup.sh
+%dir %{_prefix}/lib/NetworkManager/dispatcher.d/no-wait.d
+%attr(755,root,root) %{_prefix}/lib/NetworkManager/dispatcher.d/no-wait.d/90-nm-cloud-setup.sh
+%dir %{_prefix}/lib/NetworkManager/dispatcher.d/pre-up.d
+%attr(755,root,root) %{_prefix}/lib/NetworkManager/dispatcher.d/pre-up.d/90-nm-cloud-setup.sh
%{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
+%{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
/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
+%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) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/%{name}.conf
-%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/nm-dispatcher.conf
-%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/nm-ifcfg-rh.conf
-%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf
%attr(711,root,root) %dir /var/run/%{name}
%attr(700,root,root) %dir /var/lib/%{name}
%{_mandir}/man1/nm-online.1*
%{_mandir}/man1/nmtui-hostname.1*
%{_mandir}/man1/nmtui.1*
%{_mandir}/man5/NetworkManager.conf.5*
+%{_mandir}/man5/nm-settings.5*
+%{_mandir}/man5/nm-settings-dbus.5*
%{_mandir}/man5/nm-settings-ifcfg-rh.5*
%{_mandir}/man5/nm-settings-keyfile.5*
-%{_mandir}/man5/nm-settings.5*
+%{_mandir}/man5/nm-settings-nmcli.5*
%{_mandir}/man5/nm-system-settings.conf.5*
+%{_mandir}/man7/nm-openvswitch.7*
%{_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}
%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
+%if %{with static_libs}
%files static
%defattr(644,root,root,755)
%{_libdir}/libnm.a
-%{_libdir}/libnm-util.a
-%{_libdir}/libnm-glib.a
-%{_libdir}/libnm-glib-vpn.a
+%endif
%if %{with vala}
%files -n vala-NetworkManager
%defattr(644,root,root,755)
-%{_datadir}/vala/vapi/libnm-glib.deps
-%{_datadir}/vala/vapi/libnm-glib.vapi
-%{_datadir}/vala/vapi/libnm-util.deps
-%{_datadir}/vala/vapi/libnm-util.vapi
+%{_datadir}/vala/vapi/libnm.deps
+%{_datadir}/vala/vapi/libnm.vapi
%endif
%files -n bash-completion-NetworkManager
projects / packages / NetworkManager.git / blobdiff