From 954dc0d4a537edf2270416587ba120f51274e631 Mon Sep 17 00:00:00 2001
From: lindahl <lindahl>
Date: Thu, 30 Aug 2001 10:34:10 +0000
Subject: [PATCH] Modified the rpm build slightly.

---
 admin/gromacs-mpi.spec | 16 +++++-----------
 admin/gromacs.spec     | 14 +++-----------
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/admin/gromacs-mpi.spec b/admin/gromacs-mpi.spec
index 2c32e46942..cf4ab087dd 100644
--- a/admin/gromacs-mpi.spec
+++ b/admin/gromacs-mpi.spec
@@ -7,12 +7,12 @@
 #
 Summary: Molecular dynamics package (parallel)
 Name: gromacs-mpi
-Version: 3.0
-Release: 1
+Version: 3.0.2
+Release: 2
 Copyright: GPL
 Group: Applications/Science
 Prefix: /usr/local
-Requires: fftw-lammpi >= 2.1.3 , lam = 6.5.2, gromacs = %{version}-%{release}
+Requires: fftw-lammpi >= 2.1.3 , lam, gromacs = %{version}-%{release}
 Source: ftp://ftp.gromacs.org/pub/gromacs/source/gromacs-%{version}.tar.gz
 URL: http://www.gromacs.org
 Packager: Erik Lindahl <lindahl@gromacs.org>
@@ -30,7 +30,7 @@ and data files are located in the gromacs (non-mpi) package.
 Summary: Header files and static libs for parallel GROMACS
 Group: Applications/Science
 Prefix: %{prefix}
-Requires: fftw-lammpi >= 2.1.3, fftw-lammpi-devel >= 2.1.3, lam = 6.5.2, gromacs = %{version}-%{release}, gromacs-devel = %{version}-%{release}, gromacs-mpi = %{version}-%{release}
+Requires: fftw-lammpi >= 2.1.3, fftw-lammpi-devel >= 2.1.3, lam, gromacs = %{version}-%{release}, gromacs-devel = %{version}-%{release}, gromacs-mpi = %{version}-%{release}
 %description devel
 This package contains the static libraries for
 the parallel GROMACS development. You will only need
@@ -52,15 +52,9 @@ make DESTDIR=${RPM_BUILD_ROOT} install-mdrun
 rm -rf ${RPM_BUILD_ROOT}
 
 %post
-# /etc/ld.so.conf should have been updated by the normal gromacs package.
-# Overwrite the mdrun link - it should point to mdrun_mpi iso mdrun_nompi now!
-(cd ${RPM_INSTALL_PREFIX}/bin && ln -sf mdrun_mpi mdrun)
-
 
 %postun
-# If we removed the gromacs-mpi package, while the non-mpi version is still present,
-# we should restore the mdrun link:
-(cd ${RPM_INSTALL_PREFIX}/bin && test ! -e mdrun && ln -s mdrun_nompi mdrun)
+
 
 %files 
 %defattr(-,root,root)
diff --git a/admin/gromacs.spec b/admin/gromacs.spec
index 6c82dd4b74..1bac9be8d0 100644
--- a/admin/gromacs.spec
+++ b/admin/gromacs.spec
@@ -8,8 +8,8 @@
 #
 Summary: Molecular dynamics package (non-parallel version)
 Name: gromacs
-Version: 3.0
-Release: 1
+Version: 3.0.2
+Release: 2
 Copyright: GPL
 Group: Applications/Science
 Prefix: /usr/local
@@ -39,7 +39,7 @@ gromacs-lammpi.
 Summary: Header files and static libraries for GROMACS
 Group: Applications/Science
 Prefix: %{prefix}
-Requires: fftw-devel >= 2.1.3, gromacs = 3.0-1
+Requires: fftw-devel >= 2.1.3, gromacs = %{version}-%{release}
 %description devel
 This package contains header files, static libraries,
 and a program example for the GROMACS molecular
@@ -62,9 +62,6 @@ make
 
 %install
 make DESTDIR=${RPM_BUILD_ROOT} install
-# Move mdrun to mdrun_nompi - we make a link at post-install script time!
-# If we don't do this we'd get a conflict with the gromacs-mpi package.
-(cd ${RPM_BUILD_ROOT}%{prefix}/bin && mv mdrun mdrun_nompi)
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -76,9 +73,6 @@ rm -rf ${RPM_BUILD_ROOT}
 if test -z `grep ${RPM_INSTALL_PREFIX}/lib  /etc/ld.so.conf`; then
      cat >> /etc/ld.so.conf < ${RPM_INSTALL_PREFIX}/lib
 fi
-# Make a link from mdrun_nompi to mdrun - if it doesn't already exist!
-(cd ${RPM_INSTALL_PREFIX}/bin && test ! -e mdrun && ln -s mdrun_nompi mdrun)
-
 # run ldconfig to update the runtime linker database with the new libraries
 # (make sure /sbin is in the $PATH)
 PATH="/sbin:$PATH" ldconfig
@@ -86,8 +80,6 @@ PATH="/sbin:$PATH" ldconfig
 %postun
 # after uninstall, run ldconfig to remove the libs from the linker database
 PATH="/sbin:$PATH" ldconfig
-# and remove the link from mdrun_nompi to mdrun
-(cd ${RPM_INSTALL_PREFIX}/bin && rm -f mdrun)
 
 %files
 %defattr(-,root,root)
-- 
2.11.4.GIT