rhel: Fix build failures because of libraries in /usr/lib.

Reported-by: Igor Sever <igor@xorops.com>
Signed-off-by: Gurucharan Shetty <gshetty@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>

diff --git a/AUTHORS b/AUTHORS
index 6a56c03..70850b2 100644 (file)
--- 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 5da98e1..5cec1ff 100644 (file)
--- 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 3413c75..e3cb72a 100644 (file)
--- 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