diff --git a/openvswitch.spec b/openvswitch.spec index 981a365b27c1bd88bc5b45c222a259f001dfb589..341122eda9fc389163df285953c4a7384756e4d8 100644 --- a/openvswitch.spec +++ b/openvswitch.spec @@ -3,7 +3,7 @@ Summary: Production Quality, Multilayer Open Virtual Switch URL: http://www.openvswitch.org/ Version: 2.12.4 License: ASL 2.0 and ISC -Release: 6 +Release: 7 Source: https://www.openvswitch.org/releases/openvswitch-%{version}.tar.gz Buildroot: /tmp/openvswitch-rpm Patch0000: 0000-openvswitch-add-stack-protector-strong.patch @@ -43,6 +43,7 @@ Summary: Open vSwitch python3 bindings Requires: python3 python3-six obsoletes: python-openvswitch < 2.10.0-6 Provides: python-openvswitch = %{version}-%{release} +Conflicts: openvswitch < 2.12.4-7 %description -n python3-openvswitch Python bindings for the Open vSwitch database @@ -235,7 +236,6 @@ exit 0 /usr/sbin/ovsdb-server %{python3_sitelib}/ovs %{python3_sitelib}/ovstest -%{python3_sitearch}/ovs /usr/share/openvswitch/bugtool-plugins/ /usr/share/openvswitch/python/ /usr/share/openvswitch/scripts/ovs-bugtool-* @@ -284,6 +284,12 @@ exit 0 %doc LICENSE %changelog +* Thu Dec 14 2023 zhouwenpei - 2.12.4-7 +- Type:bugfix +- Id:NA +- SUG:NA +- DESC:fix file conflicts + * Thu Dec 12 2023 zhouwenpei - 2.12.4-6 - Type:bugfix - Id:NA