!177 fix file conflicts
From: @zhouwenpei Reviewed-by: @robertxw Signed-off-by: @robertxw
This commit is contained in:
commit
b4a471b15e
@ -9,7 +9,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
|
||||
@ -53,6 +53,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
|
||||
@ -246,7 +247,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
|
||||
@ -294,6 +294,12 @@ exit 0
|
||||
%doc README.rst NEWS rhel/README.RHEL.rst
|
||||
|
||||
%changelog
|
||||
* Thu Dec 14 2023 zhouwenpei <zhouwenpei1@h-partners.com> - 2.12.4-6
|
||||
- Type:bugfix
|
||||
- Id:NA
|
||||
- SUG:NA
|
||||
- DESC:fix file conflicts
|
||||
|
||||
* Fri Oct 13 2023 zhouwenpei <zhouwenpei1@h-partners.com.cn> - 2.12.4-5
|
||||
- sync add loongarch64 and sw_64 support
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user