[GNUnet-SVN] r22983 - gnunet-planetlab/gplmt/contrib

[gnunet]

Author: wachs
Date: 2012-07-30 15:39:53 +0200 (Mon, 30 Jul 2012)
New Revision: 22983

Modified:
   gnunet-planetlab/gplmt/contrib/deploy_gnunet_fc8.xml
Log:
- install to /sur

Modified: gnunet-planetlab/gplmt/contrib/deploy_gnunet_fc8.xml
===================================================================
--- gnunet-planetlab/gplmt/contrib/deploy_gnunet_fc8.xml        2012-07-30 
13:23:03 UTC (rev 22982)
+++ gnunet-planetlab/gplmt/contrib/deploy_gnunet_fc8.xml        2012-07-30 
13:39:53 UTC (rev 22983)
@@ -251,7 +251,7 @@
       </run>
       <run id="63" name="Configure libgpg-error">
             <command>cd libgpg-error/libgpg-error-1.10; ./configure </command> 
-            <arguments></arguments> 
+            <arguments>--prefix=/usr</arguments> 
             <timeout>0</timeout> 
             <expected_return_code>0</expected_return_code>
             <expected_output></expected_output>
@@ -286,7 +286,7 @@
       </run>
       <run id="73" name="Configure libgcrypt">
             <command>cd libgcrypt/libgcrypt-1.5.0; ./configure </command> 
-            <arguments></arguments> 
+            <arguments>--prefix=/usr</arguments> 
             <timeout>0</timeout> 
             <expected_return_code>0</expected_return_code>
             <expected_output></expected_output>
@@ -366,6 +366,7 @@
             <command>cd libunistring/libunistring-0.9.3; sudo make 
install</command>
             <arguments> </arguments> 
             <timeout>0</timeout> 
+            <!-- Return code can be 0 if package was installed and 1 if not -->
             <expected_return_code>0</expected_return_code>
             <expected_output></expected_output>
             <stop_on_fail>true</stop_on_fail>
@@ -377,10 +378,19 @@
           <command>sudo rpm -e --nodeps</command> 
           <arguments>libgcrypt</arguments> 
           <timeout>0</timeout> 
-          <expected_return_code>0</expected_return_code>
+          <expected_return_code>-1</expected_return_code>
           <expected_output></expected_output>
           <stop_on_fail>false</stop_on_fail>
        </run>  
+       <run id="91" name="Remove conflicting packages : libgpg-error">
+          <command>sudo rpm -e --nodeps</command> 
+          <arguments>libgpg-error</arguments> 
+          <timeout>0</timeout> 
+          <!-- Return code can be 0 if package was installed and 1 if not -->
+          <expected_return_code>-1</expected_return_code>
+          <expected_output></expected_output>
+          <stop_on_fail>false</stop_on_fail>
+       </run>  
        </sequence>
 
         <sequence enabled="true">
@@ -564,7 +574,7 @@
       </run>
       <run id="133" name="Configure GNUnet" enabled="true">
             <command>cd gnunet; export LD_LIBRARY_PATH=/usr/local/lib; 
./configure </command> 
-            <arguments>--prefix=$HOME/gnbuild --with-extractor=/usr 
--with-libgcrypt-prefix=/usr/local --with-curl=/usr/local 
--with-mysql=/usr/lib/mysql --enable-logging=verbose</arguments> 
+            <arguments>--prefix=$HOME/gnbuild --with-extractor=/usr/local  
--with-curl=/usr/local --with-mysql=/usr/lib/mysql 
--enable-logging=verbose</arguments> 
             <timeout>0</timeout> 
             <expected_return_code>0</expected_return_code>
             <expected_output></expected_output>