From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 9 Oct 2008 03:45:09 +0000 (+0000)
Subject: tweaks
X-Git-Tag: MyPLC-4.3-2~27
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=126fff99a80ea8c5eae7dd3ff93e217d79a0aff4;p=myplc.git

tweaks
---

diff --git a/myplc-native.spec b/myplc-native.spec
index 33f4e8f..e518500 100644
--- a/myplc-native.spec
+++ b/myplc-native.spec
@@ -95,13 +95,13 @@ system.
 %setup -q
 
 %build
+
+%install
 pushd MyPLC
 rm -rf $RPM_BUILD_ROOT
 ./build-native.sh %{pldistro} $RPM_BUILD_ROOT
 popd
 
-%install
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
diff --git a/myplc-release.spec b/myplc-release.spec
index fa57579..3f70d1f 100644
--- a/myplc-release.spec
+++ b/myplc-release.spec
@@ -34,20 +34,20 @@ contents of that release. This is used by the GetPlcRelease API call.
 %setup -q
 
 %build
-rm -rf $RPM_BUILD_ROOT
 
 # fetch the release stamp from the build if any
-if [ -f ../../../myplc-release ] ; then
-  cp ../../../myplc-release myplc-release
+if [ -f ../../myplc-release ] ; then
+  cp ../../myplc-release myplc-release
 else
   echo "Cannot find release information." > myplc-release
   date >> myplc-release
   echo "$HeadURL$" >> myplc-release
 fi
-# install it in /etc/myplc-release 
-install -m 444 myplc-release ${RPM_BUILD_ROOT}/etc/myplc-release
 
 %install
+rm -rf $RPM_BUILD_ROOT
+# install it in /etc/myplc-release 
+install -D -m 444 myplc-release ${RPM_BUILD_ROOT}/etc/myplc-release
 
 %clean
 rm -rf $RPM_BUILD_ROOT