diff options
| author | Numan Siddique <nusiddiq@redhat.com> | 2019-04-16 14:31:53 +0530 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2019-04-16 16:24:47 -0700 |
| commit | a53a7e03adaa611c635bf2f85c7753a40bd58b46 (patch) | |
| tree | fcdbf2fdc1855ce3d9b48968247385a24e1ab849 /rhel | |
| parent | 23fa50f64beef06d247e110e199427f0660998d0 (diff) | |
| download | openvswitch-a53a7e03adaa611c635bf2f85c7753a40bd58b46.tar.gz | |
rhel ovn: Remove ovn-common rpm
ovn-fedora spec generates the rpms - ovn, ovn-common, ovn-host etc
in which ovn is an empty package. The ovn fedora spec file here [1]
has moved all the ovn-common files to the 'ovn' package.
This patch does the same.
[1] - https://src.fedoraproject.org/rpms/ovn/blob/master/f/ovn.spec
Signed-off-by: Numan Siddique <nusiddiq@redhat.com>
CC: Timothy Redaelli <tredaelli@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'rhel')
| -rw-r--r-- | rhel/ovn-fedora.spec.in | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/rhel/ovn-fedora.spec.in b/rhel/ovn-fedora.spec.in index 8940d0581..2ecc629f2 100644 --- a/rhel/ovn-fedora.spec.in +++ b/rhel/ovn-fedora.spec.in @@ -45,6 +45,8 @@ Summary: Open Virtual Network support Group: System Environment/Daemons URL: http://www.openvswitch.org/ Version: @VERSION@ +Obsoletes: openvswitch-ovn-common < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: openvswitch-ovn-common = %{?epoch:%{epoch}:}%{version}-%{release} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -89,7 +91,7 @@ overlays and security groups. %package central Summary: Open Virtual Network support License: ASL 2.0 -Requires: ovn ovn-common +Requires: ovn Requires: firewalld-filesystem Obsoletes: openvswitch-ovn-central Provides: openvswitch-ovn-central = %{?epoch:%{epoch}:}%{version}-%{release} @@ -100,7 +102,7 @@ OVN DB servers and ovn-northd running on a central node. %package host Summary: Open Virtual Network support License: ASL 2.0 -Requires: ovn ovn-common +Requires: ovn Requires: firewalld-filesystem Obsoletes: openvswitch-ovn-host Provides: openvswitch-ovn-host = %{?epoch:%{epoch}:}%{version}-%{release} @@ -111,27 +113,17 @@ OVN controller running on each host. %package vtep Summary: Open Virtual Network support License: ASL 2.0 -Requires: ovn ovn-common +Requires: ovn Obsoletes: openvswitch-ovn-vtep Provides: openvswitch-ovn-vtep = %{?epoch:%{epoch}:}%{version}-%{release} %description vtep OVN vtep controller -%package common -Summary: Open Virtual Network support -License: ASL 2.0 -Requires: ovn -Obsoletes: openvswitch-ovn-common -Provides: openvswitch-ovn-common = %{?epoch:%{epoch}:}%{version}-%{release} - -%description common -Utilities that are use to diagnose and manage the OVN components. - %package docker Summary: Open Virtual Network support License: ASL 2.0 -Requires: ovn ovn-common %{_py2}-openvswitch +Requires: ovn %{_py2}-openvswitch Obsoletes: openvswitch-ovn-docker Provides: openvswitch-ovn-docker = %{?epoch:%{epoch}:}%{version}-%{release} @@ -393,12 +385,6 @@ if [ $1 -eq 1 ]; then fi %files - -%files docker -%{_bindir}/ovn-docker-overlay-driver -%{_bindir}/ovn-docker-underlay-driver - -%files common %{_bindir}/ovn-nbctl %{_bindir}/ovn-sbctl %{_bindir}/ovn-trace @@ -418,6 +404,10 @@ fi %{_mandir}/man5/ovn-sb.5* %{_prefix}/lib/ocf/resource.d/ovn/ovndb-servers +%files docker +%{_bindir}/ovn-docker-overlay-driver +%{_bindir}/ovn-docker-underlay-driver + %files central %{_bindir}/ovn-northd %{_mandir}/man8/ovn-northd.8* |