fix file conflicts
(cherry picked from commit 3074a732c00c24ec85c44c19de06d39dd28a5da4)
This commit is contained in:
parent
f61a058616
commit
57b9a1e786
@ -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: 7
|
||||
Release: 8
|
||||
Source: https://www.openvswitch.org/releases/openvswitch-%{version}.tar.gz
|
||||
Buildroot: /tmp/openvswitch-rpm
|
||||
Patch0000: 0000-openvswitch-add-stack-protector-strong.patch
|
||||
@ -46,6 +46,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-8
|
||||
|
||||
%description -n python3-openvswitch
|
||||
Python bindings for the Open vSwitch database
|
||||
@ -238,7 +239,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-*
|
||||
@ -287,6 +287,12 @@ exit 0
|
||||
%doc LICENSE
|
||||
|
||||
%changelog
|
||||
* Thu Dec 14 2023 zhouwenpei <zhouwenpei1@h-partners.com> - 2.12.4-8
|
||||
- Type:bugfix
|
||||
- Id:NA
|
||||
- SUG:NA
|
||||
- DESC:fix file conflicts
|
||||
|
||||
* Tue Nov 21 2023 zhouwenpei <zhouwenpei1@h-partners.com> - 2.12.4-7
|
||||
- Type:bugfix
|
||||
- Id:NA
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user