ThirdParty: switch to mpfr-3.0.1. Select a better URL for downloading this package.

ThirdParty/AllMake.stage1

@@ -65,13 +65,13 @@ echo
 # You need gmp and mpfr for gcc-4.4.5
 # Uncomment the following 3 lines for gcc-4.4.5
 #( rpm_make -p gmp-5.0.1   -s gmp-5.0.1.spec  -u ftp://ftp.gnu.org/gnu/gmp/gmp-5.0.1.tar.gz                  )
-#( rpm_make -p mpfr-3.0.0  -s mpfr-3.0.0.spec -u http://www.mpfr.org/mpfr-current/mpfr-3.0.0.tar.gz          )
+#( rpm_make -p mpfr-3.0.1  -s mpfr-3.0.1.spec -u ftp://ftp.gnu.org/gnu/mpfr/mpfr-3.0.1.tar.gz                )
 #( rpm_make -p gcc-4.4.5   -s gcc-4.4.5.spec  -u ftp://ftp.gnu.org/gnu/gcc/gcc-4.4.5/gcc-4.4.5.tar.gz        )
 #
 # You need gmp, mpfr and mpc for gcc-4.5.1
 # Uncomment the following 4 lines for gcc-4.5.1
 #( rpm_make -p gmp-5.0.1  -s gmp-5.0.1.spec  -u ftp://ftp.gnu.org/gnu/gmp/gmp-5.0.1.tar.gz                  )
-#( rpm_make -p mpfr-3.0.0 -s mpfr-3.0.0.spec -u http://www.mpfr.org/mpfr-current/mpfr-3.0.0.tar.gz          )
+#( rpm_make -p mpfr-3.0.1 -s mpfr-3.0.1.spec -u ftp://ftp.gnu.org/gnu/mpfr/mpfr-3.0.1.tar.gz                )
 #( rpm_make -p mpc-0.8.2  -s mpc-0.8.2.spec  -u http://www.multiprecision.org/mpc/download/mpc-0.8.2.tar.gz )
 #( rpm_make -p gcc-4.5.1  -s gcc-4.5.1.spec  -u ftp://ftp.gnu.org/gnu/gcc/gcc-4.5.1/gcc-4.5.1.tar.gz        )
 

ThirdParty/rpmBuild/SPECS/gcc-4.4.5.spec

@@ -96,7 +96,7 @@ Group: 			Development/Tools
     [ -n "$WM_LDFLAGS" ]    &&  export LDFLAGS="$WM_LDFLAGS"
 
     GMP_VERSION=gmp-5.0.1
-    MPFR_VERSION=mpfr-3.0.0
+    MPFR_VERSION=mpfr-3.0.1
 
     # Set LD_LIBRARY_FILE for GMP and MPFR so configure won't fail some of the tests 
     export LD_LIBRARY_PATH=$WM_THIRD_PARTY_DIR/packages/$GMP_VERSION/platforms/$WM_OPTIONS/lib:$LD_LIBRARY_PATH    

ThirdParty/rpmBuild/SPECS/gcc-4.5.1.spec

@@ -96,7 +96,7 @@ Group: 			Development/Tools
     [ -n "$WM_LDFLAGS" ]    &&  export LDFLAGS="$WM_LDFLAGS"
 
     GMP_VERSION=gmp-5.0.1
-    MPFR_VERSION=mpfr-3.0.0
+    MPFR_VERSION=mpfr-3.0.1
     MPC_VERSION=mpc-0.8.2
 
     mkdir ./objBuildDir

ThirdParty/rpmBuild/SPECS/mpc-0.8.2.spec

@@ -96,7 +96,7 @@ Group: 			Development/Tools
     [ -n "$WM_LDFLAGS" ]    &&  export LDFLAGS="$WM_LDFLAGS"
 
     GMP_VERSION=gmp-5.0.1
-    MPFR_VERSION=mpfr-3.0.0
+    MPFR_VERSION=mpfr-3.0.1
 
     ./configure     \
         --prefix=%{_installPrefix}  \

ThirdParty/rpmBuild/SPECS/mpfr-3.0.0.spec

@@ -73,7 +73,7 @@ License: 		Unkown
 Name: 			%{name}
 Version: 		%{version}
 Release: 		%{release}
-URL:                    http://www.mpfr.org/mpfr-current
+URL:                    ftp://ftp.gnu.org/gnu/mpfr
 Source: 		%url/%{name}-%{version}.tar.gz
 Prefix: 		%{_prefix}
 Group: 			Development/Tools

ThirdParty/rpmBuild/SPECS/mpfr-3.0.1.spec

@@ -0,0 +1,158 @@
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright held by original author
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM.
+#
+#     OpenFOAM is free software; you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by the
+#     Free Software Foundation; either version 2 of the License, or (at your
+#     option) any later version.
+#
+#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#     for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with OpenFOAM; if not, write to the Free Software Foundation,
+#     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Script
+#     RPM spec file for mpfr-3.0.1
+#
+# Description
+#     RPM spec file for creating a relocatable RPM
+#
+# Author:
+#     Martin Beaudoin, Hydro-Quebec, (2010)
+#
+#------------------------------------------------------------------------------
+
+# We grab the value of WM_THIRD_PARTY and WM_OPTIONS from the environment variable
+%{expand:%%define _WM_THIRD_PARTY_DIR %(echo $WM_THIRD_PARTY_DIR)}
+%{expand:%%define _WM_OPTIONS         %(echo $WM_OPTIONS)}
+
+# Disable the generation of debuginfo packages
+%define debug_package %{nil}
+
+# The topdir needs to point to the $WM_THIRD_PARTY/rpmbuild directory
+%define _topdir	 	%{_WM_THIRD_PARTY_DIR}/rpmBuild
+%define _tmppath	%{_topdir}/tmp
+
+# Will install the package directly $WM_THIRD_PARTY_DIR
+#   Some comments about package relocation:
+#   By using this prefix for the Prefix:  parameter in thi file, you will make this 
+#   package relocatable. 
+#
+#   This is fine, as long as your software is itself relocatable.
+#
+#   Simply take note that libraries built with libtool are not relocatable because the
+#   prefix we specify will be hard-coded in the library .la files.
+#   Ref: http://sourceware.org/autobook/autobook/autobook_80.html
+#
+#   In that case, if you ever change the value of the $WM_THIRD_PARTY_DIR, you will
+#   not be able to reutilize this RPM, even though it is relocatable. You will need to 
+#   regenerate the RPM.
+#
+%define _prefix         %{_WM_THIRD_PARTY_DIR}
+
+%define name		mpfr
+%define release		%{_WM_OPTIONS}
+%define version 	3.0.1
+
+%define buildroot       %{_topdir}/BUILD/%{name}-%{version}-root
+
+BuildRoot:	        %{buildroot}
+Summary: 		mpfr
+License: 		Unkown
+Name: 			%{name}
+Version: 		%{version}
+Release: 		%{release}
+URL:                    ftp://ftp.gnu.org/gnu/mpfr
+Source: 		%url/%{name}-%{version}.tar.gz
+Prefix: 		%{_prefix}
+Group: 			Development/Tools
+
+%define _installPrefix  %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS}
+
+%description
+%{summary}
+
+%prep
+%setup -q
+
+%build
+    # export WM settings in a form that GNU configure recognizes
+    [ -n "$WM_CC" ]         &&  export CC="$WM_CC"
+    [ -n "$WM_CXX" ]        &&  export CXX="$WM_CXX"
+    [ -n "$WM_CFLAGS" ]     &&  export CFLAGS="$WM_CFLAGS"
+    [ -n "$WM_CXXFLAGS" ]   &&  export CXXFLAGS="$WM_CXXFLAGS"
+    [ -n "$WM_LDFLAGS" ]    &&  export LDFLAGS="$WM_LDFLAGS"
+
+    GMP_VERSION=gmp-5.0.1
+    ./configure     \
+        --prefix=%{_installPrefix}  \
+	--with-gmp=$WM_THIRD_PARTY_DIR/packages/$GMP_VERSION/platforms/$WM_OPTIONS
+
+    [ -z "$WM_NCOMPPROCS" ] && WM_NCOMPPROCS=1
+    make -j $WM_NCOMPPROCS
+
+%install
+    make install DESTDIR=$RPM_BUILD_ROOT
+
+
+    # Creation of OpenFOAM specific .csh and .sh files"
+
+    echo ""
+    echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}"
+    echo ""
+    #
+    # Generate package specific .sh file for OpenFOAM
+    #
+mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
+cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
+# Load %{name}-%{version} libraries and binaries if available
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export MPFR_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS
+
+[ -d \$MPFR_DIR/lib ] && _foamAddLib \$MPFR_DIR/lib
+
+# Enable access to the package applications if present
+[ -d \$MPFR_DIR/bin ] && _foamAddPath \$MPFR_DIR/bin
+DOT_SH_EOF
+
+    #
+    # Generate package specific .csh file for OpenFOAM
+    #
+cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
+# Load %{name}-%{version} libraries and binaries if available
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+setenv MPFR_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS
+
+if ( -e \$MPFR_DIR/lib ) then
+    _foamAddLib \$MPFR_DIR/lib
+endif
+
+if ( -e \$MPFR_DIR/bin ) then
+    _foamAddPath \$MPFR_DIR/bin
+endif
+DOT_CSH_EOF
+
+    #finally, generate a .tgz file for systems where using rpm for installing packages
+    # as a non-root user might be a problem.
+    (mkdir -p  %{_topdir}/TGZS/%{_target_cpu}; cd $RPM_BUILD_ROOT/%{_prefix}; tar -zcvf %{_topdir}/TGZS/%{_target_cpu}/%{name}-%{version}.tgz  packages/%{name}-%{version})
+ 
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root)
+%{_installPrefix}
+