diff options
| author | Leif Madsen <lmadsen@redhat.com> | 2017-03-06 15:46:43 -0500 |
|---|---|---|
| committer | Russell Bryant <russell@ovn.org> | 2017-03-08 11:13:19 -0500 |
| commit | db8dcbaf1c57efb1fbd29cee598a6a84a2a5f9ec (patch) | |
| tree | 6b0664128152dee99c248c11a83be234246d4c91 /Vagrantfile | |
| parent | 2fde4546d118f2683658c384f31ebe361c906f34 (diff) | |
| download | openvswitch-db8dcbaf1c57efb1fbd29cee598a6a84a2a5f9ec.tar.gz | |
packaging: Make Fedora spec file CentOS compatible
On CentOS, the package names aren't prefixed with python2, but rather
are prefixed with simply python. This change addresses that and fixes
up some documentation that was outdated, and updates the Vagrantfile
to use the proper spec file and package names.
Fixes: bb1a7ca21107 ("fedora: Add python3-openvswitch split package")
Signed-off-by: Leif Madsen <lmadsen@redhat.com>
Signed-off-by: Russell Bryant <russell@ovn.org>
Diffstat (limited to 'Vagrantfile')
| -rw-r--r-- | Vagrantfile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Vagrantfile b/Vagrantfile index 5296279e7..28e9219b8 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -9,7 +9,7 @@ $bootstrap_fedora = <<SCRIPT dnf -y update dnf -y install autoconf automake openssl-devel libtool \ python-devel python3-devel \ - python-twisted-core python-zope-interface \ + python-twisted python-zope-interface \ desktop-file-utils groff graphviz rpmdevtools nc curl \ wget python-six pyftpdlib checkpolicy selinux-policy-devel \ libcap-ng-devel kernel-devel-`uname -r` ethtool python-tftpy @@ -80,8 +80,8 @@ PACKAGE_VERSION=`autom4te -l Autoconf -t 'AC_INIT:$2' /vagrant/configure.ac` make && make dist rpmdev-setuptree cp openvswitch-$PACKAGE_VERSION.tar.gz $HOME/rpmbuild/SOURCES -rpmbuild --bb -D "kversion `uname -r`" /vagrant/rhel/openvswitch-kmod-rhel6.spec -rpmbuild --bb --without check /vagrant/rhel/openvswitch.spec +rpmbuild --bb -D "kversion `uname -r`" /vagrant/rhel/openvswitch-kmod-fedora.spec +rpmbuild --bb --without check /vagrant/rhel/openvswitch-fedora.spec rpm -e openvswitch rpm -ivh $HOME/rpmbuild/RPMS/x86_64/openvswitch-$PACKAGE_VERSION-1.x86_64.rpm systemctl enable openvswitch |