diff --git a/NetworkManager.spec b/NetworkManager.spec index cea241db68202cedfd00c673737183e7223ea656..786935d4735163342e0464d4d1ed13810ab93ad1 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -49,7 +49,7 @@ Name: NetworkManager Version: 1.42.8 Epoch: 1 -Release: 1 +Release: 2 Summary: Network Link Manager and User Applications License: GPLv2+ URL: https://networkmanager.dev/ @@ -101,6 +101,8 @@ Provides: %{name}-tui Obsoletes: %{name}-tui Provides: %{name}-adsl Obsoletes: %{name}-adsl +Provides: %{name}-ovs +Obsoletes: %{name}-ovs %description NetworkManager attempts to keep an active network connection available @@ -157,15 +159,6 @@ Obsoletes: NetworkManager < %{obsoletes_device_plugins} This package contains NetworkManager support for Bluetooth device %endif -%if %{with ovs} -%package ovs -Summary: Open vSwitch device plugin for NetworkManager -Requires: %{name} = %{epoch}:%{version}-%{release} - -%description ovs -This package contains NetworkManager support for Open vSwitch bridges. -%endif - %if %{with team} %package team Summary:Team device plugin for NetworkManager @@ -475,6 +468,10 @@ fi %if %{with firewalld_zone} %{_prefix}/lib/firewalld/zones/nm-shared.xml %endif +%if %{with ovs} +%{_libdir}/%{name}/%{version}-%{release}/libnm-device-plugin-ovs.so +%{systemd_dir}/NetworkManager.service.d/NetworkManager-ovs.conf +%endif %config(noreplace) /etc/ld.so.conf.d/* %if %{with nm_cloud_setup} @@ -511,12 +508,6 @@ fi %{_libdir}/%{name}/%{version}-%{release}/libnm-device-plugin-wifi.so %endif -%if %{with ovs} -%files ovs -%defattr(-,root,root) -%{_libdir}/%{name}/%{version}-%{release}/libnm-device-plugin-ovs.so -%{systemd_dir}/NetworkManager.service.d/NetworkManager-ovs.conf -%endif %if %{with ppp} %files ppp @@ -554,6 +545,12 @@ fi %{_datadir}/gtk-doc/html/NetworkManager/* %changelog +* Tue Aug 8 2023 gaoxingwang - 1:1.42.8-2 +- Type:requirement +- CVE:NA +- SUG:NA +- DESC:sync,merge ovs into main package + * Sat Jul 29 2023 gaoxingwang - 1:1.42.8-1 - Type:requirement - CVE:NA