diff --git a/NetworkManager.spec b/NetworkManager.spec index 8667fde7db1d04b7dd59ad16562d2aacb34fb7d7..22688f0cb2b1d392a781bd16b0cb8715124f0f34 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -50,7 +50,7 @@ Name: NetworkManager Version: 1.32.12 Epoch: 1 -Release: 14 +Release: 15 Summary: Network Link Manager and User Applications License: GPLv2+ URL: https://www.gnome.org/projects/NetworkManager/ @@ -71,12 +71,15 @@ Patch6004: NetworkManager-Add-sw64-architecture.patch BuildRequires: gcc libtool pkgconfig automake autoconf intltool gettext-devel ppp-devel gnutls-devel BuildRequires: dbus-devel dbus-glib-devel glib2-devel gobject-introspection-devel jansson-devel BuildRequires: dhclient readline-devel audit-libs-devel gtk-doc libudev-devel libuuid-devel /usr/bin/valac polkit-devel -BuildRequires: iptables libxslt systemd systemd-devel libcurl-devel libndp-devel python3-gobject-base teamd-devel +BuildRequires: iptables libxslt systemd systemd-devel libcurl-devel libndp-devel python3-gobject-base BuildRequires: ModemManager-glib-devel newt-devel /usr/bin/dbus-launch python3 python3-dbus libselinux-devel chrpath %if %{with bluetooth} BuildRequires: bluez-libs-devel %endif +%if %{with team} +BuildRequires: teamd-devel +%endif Requires(post): systemd Requires(post): /usr/sbin/update-alternatives Requires(preun): systemd @@ -124,6 +127,7 @@ Obsoletes: NetworkManager < %{obsoletes_device_plugins} This package contains NetworkManager support for Wifi devices. %endif +%if %{with wwan} %package wwan Summary: Mobile broadband device plugin for %{name} Requires: %{name} = %{epoch}:%{version}-%{release} @@ -133,6 +137,7 @@ Obsoletes: NetworkManager < %{obsoletes_device_plugins} %description wwan This package contains NetworkManager support for mobile broadband (WWAN) devices. +%endif %if %{with bluetooth} %package bluetooth @@ -146,6 +151,16 @@ Obsoletes: NetworkManager < %{obsoletes_device_plugins} This package contains NetworkManager support for Bluetooth device %endif +%if %{with team} +%package team +Summary: Team device plugin for NetworkManager +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} +Obsoletes: NetworkManager < %{obsoletes_device_plugins} + +%description team +This package contains NetworkManager support for team devices. +%endif + %if %{with ovs} %package ovs Summary: Open vSwitch device plugin for NetworkManager @@ -408,9 +423,6 @@ fi %{_sysconfdir}/%{name}/dispatcher.d/no-wait.d/10-ifcfg-rh-routes.sh %{_sysconfdir}/%{name}/dispatcher.d/pre-up.d/10-ifcfg-rh-routes.sh %{_libdir}/pppd/%{ppp_version}/nm-pppd-plugin.so -%if %{with team} -%{_libdir}/%{name}/%{version}-%{release}/libnm-device-plugin-team.so -%endif %{_bindir}/nmtui* %if %{with adsl} %{_libdir}/%{name}/%{version}-%{release}/libnm-device-plugin-adsl.so @@ -425,6 +437,12 @@ fi %{_prefix}/lib/firewalld/zones/nm-shared.xml %config(noreplace) /etc/ld.so.conf.d/* +%if %{with team} +%files team +%defattr(-,root,root) +%{_libdir}/%{name}/%{version}-%{release}/libnm-device-plugin-team.so +%endif + %if %{with wwan} %files wwan %defattr(-,root,root) @@ -487,6 +505,12 @@ fi %{_datadir}/gtk-doc/html/NetworkManager/* %changelog +* Mon Jun 5 2023 gaoxingwang - 1:1.32.12-15 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC: split team into subpackage + * Tue Dec 6 2022 Chenxi Mao - 1:1.32.12-14 - Type:bugfix - CVE:NA