merge ovs into main package

(cherry picked from commit 2fec7f40beeaa69a8cb16d906b7d0771002149dc)

NetworkManager.spec

@@ -51,7 +51,7 @@
 Name:             NetworkManager
 Version:          1.32.12
 Epoch:            1
-Release:          16
+Release:          17
 Summary:          Network Link Manager and User Applications
 License:          GPLv2+
 URL:              https://www.gnome.org/projects/NetworkManager/
@@ -109,6 +109,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
@@ -165,16 +167,6 @@ Obsoletes:        NetworkManager < %{obsoletes_device_plugins}
 This package contains NetworkManager support for team devices.
 %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 ppp}
 %package ppp
 Summary:         PPP plugin for NetworkManager
@@ -450,6 +442,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 team}
@@ -477,12 +473,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
@@ -520,7 +510,13 @@ fi
 %{_datadir}/gtk-doc/html/NetworkManager/*
 
 %changelog
-* Mon Jun 5 2023 gaoxingwang<gaoxingwang1@huawei.com> - 1:1.32.12-16
+* Mon Jun 5 2023 gaoxingwang<gaoxingwang1@huawei.com> - 1:1.32.12-17
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:merge ovs into main package
+
+ Mon Jun 5 2023 gaoxingwang<gaoxingwang1@huawei.com> - 1:1.32.12-16
 - Type:bugfix
 - CVE:NA
 - SUG:NA