diff options
| author | Numan Siddique <numans@ovn.org> | 2019-10-21 15:12:42 +0530 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2019-10-21 09:05:17 -0700 |
| commit | a6028d3abb104e7c4815b979deab57a6292e57c9 (patch) | |
| tree | 4f0045e51e7f7bdb3760576a200fe9152e3cf196 /rhel | |
| parent | 7e0c91eb071447bca876fbb2867e4dbd027e244f (diff) | |
| download | openvswitch-a6028d3abb104e7c4815b979deab57a6292e57c9.tar.gz | |
rhel: Remove the cond 'build_python3'
A previous patch removed python2 support from ovs. So we can remove
this condition and make python3 mandatory for builds. Without this
patch, make rpm-fedora on centos 7 fails unless we pass
RPMBUILD_OPT="--with build_python3".
Signed-off-by: Numan Siddique <numans@ovn.org>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'rhel')
| -rw-r--r-- | rhel/openvswitch-fedora.spec.in | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in index 80010a41b..3a87c6d0c 100644 --- a/rhel/openvswitch-fedora.spec.in +++ b/rhel/openvswitch-fedora.spec.in @@ -28,10 +28,7 @@ %bcond_without libcapng # To enable DPDK support, specify '--with dpdk' when building %bcond_with dpdk -# Enable Python 3 by specifying '--with build_python3'. -# This is enabled by default for versions of the distribution that -# have Python 3 by default (Fedora > 22). -%bcond_with build_python3 + # If there is a need to automatically enable the package after installation, # specify the "--with autoenable" %bcond_with autoenable @@ -61,9 +58,7 @@ Source: http://openvswitch.org/releases/%{name}-%{version}.tar.gz BuildRequires: gcc gcc-c++ BuildRequires: autoconf automake libtool BuildRequires: systemd-units openssl openssl-devel -%if 0%{?fedora} > 22 || %{with build_python3} BuildRequires: python3-devel -%endif BuildRequires: desktop-file-utils BuildRequires: groff graphviz BuildRequires: checkpolicy, selinux-policy-devel @@ -109,7 +104,6 @@ Requires: selinux-policy-targeted %description selinux-policy Tailored Open vSwitch SELinux policy -%if 0%{?fedora} > 22 || %{with build_python3} %package -n python3-openvswitch Summary: Open vSwitch python3 bindings License: ASL 2.0 @@ -120,7 +114,6 @@ Requires: python3-six %description -n python3-openvswitch Python bindings for the Open vSwitch database -%endif %package test Summary: Open vSwitch testing utilities @@ -244,11 +237,9 @@ install -p -m 0755 rhel/etc_sysconfig_network-scripts_ifdown-ovs \ install -p -m 0755 rhel/etc_sysconfig_network-scripts_ifup-ovs \ $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/network-scripts/ifup-ovs -%if 0%{?fedora} > 22 || %{with build_python3} install -d -m 0755 $RPM_BUILD_ROOT%{python3_sitelib} cp -a $RPM_BUILD_ROOT/%{_datadir}/openvswitch/python/* \ $RPM_BUILD_ROOT%{python3_sitelib} -%endif rm -rf $RPM_BUILD_ROOT/%{_datadir}/openvswitch/python/ @@ -388,10 +379,8 @@ fi %defattr(-,root,root) %{_datadir}/selinux/packages/%{name}/openvswitch-custom.pp -%if 0%{?fedora} > 22 || %{with build_python3} %files -n python3-openvswitch %{python3_sitelib}/ovs -%endif %files test %{_bindir}/ovs-test |