diff --git a/.cvsignore b/.cvsignore index e58c9e6..ac05a7b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -manual-4.0.pdf gromacs-4.0.3.tar.gz +manual-4.0.pdf diff --git a/gromacs.spec b/gromacs.spec index 4b9b485..dc7c19f 100644 --- a/gromacs.spec +++ b/gromacs.spec @@ -1,6 +1,6 @@ Name: gromacs Version: 4.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GROMACS binaries Group: Applications/Engineering License: GPLv2+ @@ -354,6 +354,20 @@ cd .. %install rm -rf %{buildroot} +# 4.0.3 needs this to build in EPEL-4 +# Load MPI enviroment +%if %modules == 1 +. /etc/profile.d/modules.sh +module load %{_libdir}/openmpi/*/openmpi.module +%endif + +%if %selector == 1 +# Set MPI environment +mpi-selector --set `mpi-selector --list | grep openmpi` +source /etc/profile.d/mpi-selector.sh +%endif + + # Single precision cd single make DESTDIR=%{buildroot} INSTALL="install -p" install @@ -532,6 +546,9 @@ rm -rf %{buildroot} %changelog +* Mon Jan 19 2009 Jussi Lehtola - 4.0.3-2 +- Fix EPEL 4 build. + * Mon Jan 19 2009 Jussi Lehtola - 4.0.3-1 - Update to 4.0.3. diff --git a/import.log b/import.log index 6b13cf7..24da353 100644 --- a/import.log +++ b/import.log @@ -3,3 +3,4 @@ gromacs-4_0_1-4_fc9:HEAD:gromacs-4.0.1-4.fc9.src.rpm:1226248354 gromacs-4_0_2-6_fc9:HEAD:gromacs-4.0.2-6.fc9.src.rpm:1226305676 gromacs-4_0_2-7_fc10:HEAD:gromacs-4.0.2-7.fc10.src.rpm:1231935162 gromacs-4_0_3-1_fc10:HEAD:gromacs-4.0.3-1.fc10.src.rpm:1232356764 +gromacs-4_0_3-2_fc10:HEAD:gromacs-4.0.3-2.fc10.src.rpm:1232367441 diff --git a/sources b/sources index c542a6d..0f16598 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -2b6565bef76109a579c39ec1dcb0ecf2 manual-4.0.pdf 2902403671a0f9b0934ddf3ca586b7ec gromacs-4.0.3.tar.gz +2b6565bef76109a579c39ec1dcb0ecf2 manual-4.0.pdf