From: Alex Wang <alexw@nicira.com>
Date: Fri, 21 Nov 2014 18:55:03 +0000 (-0800)
Subject: xen.spec: Fix xenserver build failure.
X-Git-Tag: v2.4.0~894
X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Fovs.git;a=commitdiff_plain;h=faebf930196069f7ea2dc97ee3968698dcea84f2

xen.spec: Fix xenserver build failure.

This commit conducts similar operations as commit 2fd84d5e5
(rhel: Include pkgconfig and update header install in
Fedora/RHEL spec.) to xenserver spec file to prevent the
following rpmbuild failure.

  RPM build errors:
       Installed (but unpackaged) file(s) found:
           /usr/include/openflow/nicira-ext.h
           /usr/include/openflow/openflow-1.0.h
           /usr/include/openflow/openflow-1.1.h
           /usr/include/openflow/openflow-1.2.h
           /usr/include/openflow/openflow-1.3.h
           /usr/include/openflow/openflow-1.4.h
           /usr/include/openflow/openflow-1.5.h
           /usr/include/openflow/openflow-common.h
           /usr/include/openflow/openflow.h
           /usr/include/openvswitch/types.h
           /usr/lib/pkgconfig/libofproto.pc
           /usr/lib/pkgconfig/libopenvswitch.pc
           /usr/lib/pkgconfig/libovsdb.pc
           /usr/lib/pkgconfig/libsflow.pc

VMware-BZ: #1362092

Reported-by: Edwin Chiu <echiu@nicira.com>
Signed-off-by: Alex Wang <alexw@nicira.com>
Acked-by: Gurucharan Shetty <gshetty@nicira.com>
---

diff --git a/xenserver/openvswitch-xen.spec.in b/xenserver/openvswitch-xen.spec.in
index 364277fbd..31ff1bff4 100644
--- a/xenserver/openvswitch-xen.spec.in
+++ b/xenserver/openvswitch-xen.spec.in
@@ -139,6 +139,8 @@ rm \
     $RPM_BUILD_ROOT/usr/share/man/man8/ovs-pki.8 \
     $RPM_BUILD_ROOT/usr/share/man/man8/ovs-test.8
 (cd "$RPM_BUILD_ROOT" && rm -f usr/lib/lib*)
+(cd "$RPM_BUILD_ROOT" && rm -rf usr/include)
+(cd "$RPM_BUILD_ROOT" && rm -rf usr/lib/pkgconfig)
 
 install -d -m 755 $RPM_BUILD_ROOT/var/lib/openvswitch