From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 2 Sep 2008 13:02:44 +0000 (+0000)
Subject: add require for dummynets in the onelab build + minor issue
X-Git-Tag: MyPLC-4.3-1~3
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=1117bff1c9f9ce8babf090f8398846be75af6147;p=myplc.git

add require for dummynets in the onelab build + minor issue
---

diff --git a/myplc-native.spec b/myplc-native.spec
index 188e068..158d60a 100644
--- a/myplc-native.spec
+++ b/myplc-native.spec
@@ -72,6 +72,11 @@ Requires: PLCAPI
 Requires: bootstrapfs-%{pldistro}-%{_arch}
 Requires: myplc-docs
 
+# argh - ugly - we might wish to use something from build/config.%{pldistro} instead
+%if "%{pldistro}" == "onelab"
+Requires: dummynet_image
+%endif
+
 Provides: myplc
 
 %define debug_package %{nil}
@@ -108,7 +113,7 @@ if [ -n "$SUDO_USER" ] ; then
     # /usr/bin/sudo get created with non-readable permissions.
     find . -not -perm +0600 -exec chmod u+rw {} \;
     # Allow user to delete the built RPM(s)
-    chown -h -R $SUDO_USER %{_rpmdir}/%{_arch}
+    [ -d %{_rpmdir}/noarch ] && chown -h -R $SUDO_USER %{_rpmdir}/noarch
 fi
 
 %pre