From d893c3e0afe2e337d4399bbea20970de1a06cf6b Mon Sep 17 00:00:00 2001 From: Gurucharan Shetty Date: Wed, 18 Dec 2013 09:05:40 -0800 Subject: [PATCH] rhel: Fix build failures because of libraries in /usr/lib. Reported-by: Igor Sever Signed-off-by: Gurucharan Shetty Acked-by: Ben Pfaff --- AUTHORS | 1 + rhel/openvswitch-fedora.spec.in | 2 +- rhel/openvswitch.spec.in | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/AUTHORS b/AUTHORS index 6a56c03ee..70850b28b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -170,6 +170,7 @@ Henrik Amren henrik@nicira.com Hiroshi Tanaka htanaka@nicira.com Hiroshi Miyata miyahiro.dazu@gmail.com Igor Ganichev iganichev@nicira.com +Igor Sever igor@xorops.com Jacob Cherkas jcherkas@nicira.com Jad Naous jnaous@gmail.com Jamal Hadi Salim hadi@cyberus.ca diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in index 5da98e100..5cec1ff5f 100644 --- a/rhel/openvswitch-fedora.spec.in +++ b/rhel/openvswitch-fedora.spec.in @@ -70,7 +70,7 @@ install python/compat/argparse.py $RPM_BUILD_ROOT/usr/share/openvswitch/python install -d -m 755 $RPM_BUILD_ROOT/var/lib/openvswitch # Get rid of stuff we don't want to make RPM happy. -rm -rf $RPM_BUILD_ROOT/%{_lib} +(cd "$RPM_BUILD_ROOT" && rm -f usr/lib/lib*) %clean rm -rf $RPM_BUILD_ROOT diff --git a/rhel/openvswitch.spec.in b/rhel/openvswitch.spec.in index 3413c7520..e3cb72a0a 100644 --- a/rhel/openvswitch.spec.in +++ b/rhel/openvswitch.spec.in @@ -62,7 +62,7 @@ rm \ $RPM_BUILD_ROOT/usr/share/man/man8/ovs-l3ping.8 \ $RPM_BUILD_ROOT/usr/sbin/ovs-vlan-bug-workaround \ $RPM_BUILD_ROOT/usr/share/man/man8/ovs-vlan-bug-workaround.8 -rm -rf $RPM_BUILD_ROOT/%{_lib} +(cd "$RPM_BUILD_ROOT" && rm -rf usr/lib) install -d -m 755 $RPM_BUILD_ROOT/var/lib/openvswitch -- 2.20.1