From 4acee29f14652280c0b0a0191957fba8fa0febc6 Mon Sep 17 00:00:00 2001 From: zhouwenpei Date: Thu, 14 Dec 2023 09:08:57 +0000 Subject: [PATCH] fix file conflicts --- openvswitch.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/openvswitch.spec b/openvswitch.spec index 4da185a..3e33ac6 100644 --- a/openvswitch.spec +++ b/openvswitch.spec @@ -6,7 +6,7 @@ Summary: Production Quality, Multilayer Open Virtual Switch URL: http://www.openvswitch.org/ Version: 2.12.4 License: ASL 2.0 and ISC -Release: 5 +Release: 6 Source: https://www.openvswitch.org/releases/openvswitch-%{version}.tar.gz Buildroot: /tmp/openvswitch-rpm Patch0000: 0000-openvswitch-add-stack-protector-strong.patch @@ -50,6 +50,7 @@ License: ASL 2.0 BuildArch: noarch Requires: python3 Requires: python3-six +Conflicts: openvswitch < 2.12.4-6 %{?python_provide:%python_provide python3-openvswitch = %{version}-%{release}} %description -n python3-openvswitch @@ -243,7 +244,6 @@ exit 0 %{_libdir}/lib*.so.* /usr/sbin/ovs-vswitchd /usr/sbin/ovsdb-server -%{python3_sitelib}/ovs %{python3_sitelib}/ovstest %{python3_sitearch}/ovs /usr/share/openvswitch/scripts/ovs-check-dead-ifs @@ -291,6 +291,12 @@ exit 0 %doc README.rst NEWS rhel/README.RHEL.rst %changelog +* Thu Dec 14 2023 zhouwenpei - 2.12.4-6 +- Type:bugfix +- Id:NA +- SUG:NA +- DESC:fix file conflicts + * Sat Oct 07 2023 zhouwenpei - 2.12.4-5 - fix CVE-2023-5366 -- Gitee