[openvswitch/private-fleitner-f20-2.1.0] updated to 2.1.0

[Flavio Leitner]

commit 6cbac0fe5fb0b43cf1361348a22b1e15ae13a1df
Author: Flavio Leitner <fbl at redhat.com>
Date:   Tue Mar 25 20:17:50 2014 -0300

    updated to 2.1.0
    
    Resolves: #1080679
    
    Signed-off-by: Flavio Leitner <fbl at redhat.com>

 .gitignore                                         |    1 +
 openvswitch-initscripts-add-tunnel-support.patch   |   29 ---------
 ...-gcc-builtins-to-better-check-array-sizes.patch |   62 --------------------
 openvswitch.spec                                   |   39 ++++--------
 sources                                            |    2 +-
 5 files changed, 15 insertions(+), 118 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 768ed7b..5e26750 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /openvswitch-1.11.0.tar.gz
 /openvswitch-2.0.0.tar.gz
 /openvswitch-2.0.1.tar.gz
+/openvswitch-2.1.0.tar.gz
diff --git a/openvswitch.spec b/openvswitch.spec
index 67ffdf2..cdaf2ee 100644
--- a/openvswitch.spec
+++ b/openvswitch.spec
@@ -14,7 +14,7 @@
 %endif
 
 Name:           openvswitch
-Version:        2.0.1
+Version:        2.1.0
 Release:        1%{?dist}
 Summary:        Open vSwitch daemon/database/utilities
 
@@ -29,10 +29,8 @@ Source3:        openvswitch.logrotate
 Source6:        ovsdbmonitor.desktop
 Source9:        README.RHEL
 
-Patch1: openvswitch-util-use-gcc-builtins-to-better-check-array-sizes.patch
-Patch2: openvswitch-fedora-package-fix-systemd-ordering-and-deps.patch
-Patch3: openvswitch-initscripts-add-tunnel-support.patch
-Patch4: openvswitch-rhel-Enable-DHCP-support-for-internal-ports.patch
+Patch1: openvswitch-fedora-package-fix-systemd-ordering-and-deps.patch
+Patch2: openvswitch-rhel-Enable-DHCP-support-for-internal-ports.patch
 
 BuildRequires:  systemd-units openssl openssl-devel
 BuildRequires:  python python-twisted-core python-zope-interface PyQt4
@@ -47,6 +45,7 @@ Requires:       openssl iproute module-init-tools
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
+Obsoletes: openvswitch-controller <= 0:2.1.0-1
 
 %description
 Open vSwitch provides standard network bridging functions and
@@ -88,16 +87,6 @@ Requires:       python python-twisted-core python-twisted-web
 Utilities that are useful to diagnose performance and connectivity
 issues in Open vSwitch setup.
 
-%package controller
-Summary:        Open vSwitch OpenFlow controller
-License:        ASL 2.0
-Requires:       openvswitch = %{version}-%{release}
-
-%description controller
-Simple reference implementation of an OpenFlow controller for Open
-vSwitch. Manages any number of remote switches over OpenFlow protocol,
-causing them to function as L2 MAC-learning switches or hub.
-
 %package devel
 Summary:        Open vSwitch OpenFlow development package (library, headers)
 License:        ASL 2.0
@@ -111,8 +100,6 @@ files needed to build an external application.
 %setup -q
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
 %configure --enable-ssl --with-pkidir=%{_sharedstatedir}/openvswitch/pki
@@ -171,10 +158,6 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/applications/ovsdbmonitor.desktop
 rm -rf $RPM_BUILD_ROOT%{_docdir}/ovsdbmonitor
 %endif
 
-# devel files
-install -p -D -m 0644 lib/libopenvswitch.a \
-	$RPM_BUILD_ROOT%{_libdir}/openvswitch/libopenvswitch.a
-
 install -d -m 0755 $RPM_BUILD_ROOT%{_includedir}/openvswitch
 install -p -D -m 0644 include/openvswitch/*.h \
 	-t $RPM_BUILD_ROOT%{_includedir}/openvswitch
@@ -251,6 +234,7 @@ install -p -D -m 0644 include/openflow/*.h \
 %{_bindir}/ovsdb-client
 %{_bindir}/ovsdb-tool
 %{_bindir}/ovs-parse-backtrace
+%{_bindir}/vtep-ctl
 # ovs-bugtool is LGPLv2+
 %{_sbindir}/ovs-bugtool
 %{_sbindir}/ovs-vswitchd
@@ -262,6 +246,8 @@ install -p -D -m 0644 include/openflow/*.h \
 %{_mandir}/man1/ovsdb-server.1*
 %{_mandir}/man1/ovsdb-tool.1*
 %{_mandir}/man5/ovs-vswitchd.conf.db.5*
+%{_mandir}/man5/vtep.5*
+%{_mandir}/man8/vtep-ctl.8*
 %{_mandir}/man8/ovs-appctl.8*
 %{_mandir}/man8/ovs-bugtool.8*
 %{_mandir}/man8/ovs-ctl.8*
@@ -302,16 +288,17 @@ install -p -D -m 0644 include/openflow/*.h \
 %{_mandir}/man8/ovs-l3ping.8*
 %{python_sitelib}/ovstest
 
-%files controller
-%{_bindir}/ovs-controller
-%{_mandir}/man8/ovs-controller.8*
-
 %files devel
-%{_libdir}/openvswitch/libopenvswitch.a
+%{_libdir}/*.a
+%{_libdir}/*.la
 %{_includedir}/openvswitch/*
 %{_includedir}/openflow/*
 
 %changelog
+* Tue Mar 25 2014 Flavio Leitner - 2.1.0-1
+- updated to 2.1.0
+- obsoleted openvswitch-controller package
+
 * Mon Jan 27 2014 Flavio Leitner - 2.0.1-1
 - updated to 2.0.1
 
diff --git a/sources b/sources
index 3f587c9..387296d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a2122b1c293c8d05dc0c673d42a9da08  openvswitch-2.0.1.tar.gz
+7c5861b0ef7f3002c15c61be6f5066f2  openvswitch-2.1.0.tar.gz