]> git.pld-linux.org Git - packages/NetworkManager.git/blobdiff - NetworkManager.spec
up to 1.38.4
[packages/NetworkManager.git] / NetworkManager.spec
index b3a51dd1bf919756fc5a8891535d998043a1dafc..11dc1d15ccd4d2600faeb910422b3dec8b0d8bd3 100644 (file)
@@ -1,24 +1,26 @@
+# 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 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.22.4
+Version:       1.38.4
 Release:       1
 Epoch:         2
 License:       GPL v2+
 Group:         Networking/Admin
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.22/%{name}-%{version}.tar.xz
-# Source0-md5: 14e4933253b2135ccfb6adc97d322fab
+Source0:       https://download.gnome.org/sources/NetworkManager/1.38/%{name}-%{version}.tar.xz
+# Source0-md5: eaaefa0da3f56c84aa1d9324cffb89ff
 Source1:       %{name}.conf
 Source3:       %{name}.tmpfiles
 Source4:       %{name}.init
 Patch0:                ifcfg-path.patch
-Patch1:                %{name}-sh.patch
-Patch2:                systemd-fallback.patch
+Patch1:                systemd-fallback.patch
 URL:           https://wiki.gnome.org/Projects/NetworkManager
 BuildRequires: ModemManager-devel >= 1.0.0
 BuildRequires: audit-libs-devel
@@ -27,7 +29,6 @@ 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: gettext-tools >= 0.17
 BuildRequires: glib2-devel >= 1:2.38.0
 BuildRequires: gnome-common
@@ -35,7 +36,7 @@ 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.5
+BuildRequires: jansson-devel >= 2.7
 BuildRequires: libndp-devel
 BuildRequires: libnl-devel >= 3.2.8
 BuildRequires: libpsl-devel >= 0.1
@@ -51,9 +52,11 @@ BuildRequires:       perl-base
 BuildRequires: pkgconfig
 BuildRequires: polkit-devel >= 0.97
 BuildRequires: ppp-plugin-devel >= 3:2.4.6
-BuildRequires: python-pygobject3
+BuildRequires: python3 >= 1:3
+BuildRequires: python3-pygobject3
 BuildRequires: readline-devel
-BuildRequires: rpmbuild(macros) >= 1.673
+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
@@ -71,7 +74,7 @@ Requires:     ConsoleKit-x11
 Requires:      curl-libs >= 7.24.0
 Requires:      dhcp-client
 Requires:      filesystem >= 3.0-37
-Requires:      jansson >= 2.5
+Requires:      jansson >= 2.7
 Requires:      libnl >= 3.2.8
 Requires:      libpsl >= 0.1
 Requires:      libteamdctl >= 1.9
@@ -84,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
@@ -104,9 +105,7 @@ 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 library API documentation.
@@ -118,7 +117,6 @@ Dokumentacja API biblioteki libnm.
 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:      nss >= 3.11
 Requires:      udev-libs >= 1:175
@@ -135,7 +133,6 @@ Summary:    Network Manager includes and more
 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:      libuuid-devel
 Requires:      nss-devel >= 3.11
@@ -164,9 +161,7 @@ Summary(pl.UTF-8):  API języka Vala do bibliotek NetworkManagera
 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.
@@ -180,9 +175,7 @@ Summary(pl.UTF-8):  Bashowe uzupełnianie nazw dla polecenia NetworkManagera (nmc
 Group:         Applications/Shells
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      bash-completion >= 2.0
-%if "%{_rpmversion}" >= "5"
 BuildArch:     noarch
-%endif
 
 %description -n bash-completion-NetworkManager
 Bash completion for NetworkManager command (nmcli).
@@ -193,8 +186,7 @@ Bashowe uzupełnianie nazw dla polecenia NetworkManagera (nmcli).
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%{?with_systemd:%patch2 -p1}
+%{?with_systemd:%patch1 -p1}
 
 grep -rl /usr/bin/env examples | xargs sed -i -e '1{
        s,^#!.*bin/env gjs,#!/usr/bin/gjs,
@@ -219,11 +211,14 @@ 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} \
        --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} \
@@ -287,12 +282,13 @@ fi
 %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
@@ -302,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
@@ -322,12 +318,13 @@ exit 0
 %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"
@@ -342,12 +339,18 @@ 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
 /lib/udev/rules.d/85-nm-unmanaged.rules
@@ -362,9 +365,6 @@ exit 0
 %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*
@@ -374,13 +374,18 @@ exit 0
 %{_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}
 
This page took 0.040437 seconds and 4 git commands to generate.