rpms/lam/devel lam.spec,1.26,1.27

[fedora-cvs-commits redhat com]

Author: jvdias

Update of /cvs/dist/rpms/lam/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31377

Modified Files:
	lam.spec 
Log Message:
fix bug 164898: 7.0.6's '--enable-trillium' -> 7.1.1's '--with-trillium'


Index: lam.spec
===================================================================
RCS file: /cvs/dist/rpms/lam/devel/lam.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- lam.spec	27 Jun 2005 20:42:59 -0000	1.26
+++ lam.spec	2 Aug 2005 15:52:58 -0000	1.27
@@ -3,7 +3,7 @@
 Summary: The LAM (Local Area Multicomputer) programming environment.
 Name: lam
 Version: 7.1.1
-Release: 5
+Release: 7.FC5
 License: BSD
 Epoch: 2
 Group: Development/Libraries
@@ -44,23 +44,21 @@
 %setup -q
 %patch0 -p1 -b .f77-f95
 
- 
 %build
 %ifarch x86_64
 CFLAGS="$RPM_OPT_FLAGS -fPIC"
 CXXFLAGS="$RPM_OPT_FLAGS -fPIC"
 FFLAGS="$RPM_OPT_FLAGS -fPIC"
 %endif 
-
-%ifarch i386 s390 ppc
 autoconf
-%configure --with-rsh="/usr/bin/ssh -x -a" --libdir=%{_libdir} --enable-trillium --enable-shared
+export FC=f95
+%ifarch i386 s390 ppc
+%configure --with-rsh="/usr/bin/ssh -x -a" --libdir=%{_libdir} --with-trillium --enable-shared
 %else
 #
 # Disable TotalView on non-32 bit architectures.
 #
-autoconf
-%configure --with-rsh="/usr/bin/ssh -x -a" --libdir=%{_libdir} --disable-tv --disable-tv-dll --enable-trillium --enable-shared
+%configure --with-rsh="/usr/bin/ssh -x -a" --libdir=%{_libdir} --disable-tv --disable-tv-dll --with-trillium --enable-shared
 %endif
 
 make %{?_smp_mflags} all
@@ -69,26 +67,24 @@
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 
-pushd $RPM_BUILD_ROOT
+# ? commented this out (JVD, 2005-07-08):
+# Can't open usr/bin/balky: No such file or directory.
+#pushd $RPM_BUILD_ROOT
 # balky has buildroot paths in the binary
-perl -pi -e "s|(.*=).*hcp|\1/usr/bin/hcp|g" usr/bin/balky
-popd
+#perl -pi -e "s|(.*=).*hcp|\1/usr/bin/hcp|g" usr/bin/balky
+#popd
 
-# This page is malformatted, and mans isn't a standard mandir (#67595)
+# mans isn't a standard mandir (#67595) and contains a copy of man7/mpi.7
 rm -fr $RPM_BUILD_ROOT/%{_mandir}/mans
 
 ln -f romio/COPYRIGHT romio/ROMIO-COPYRIGHT
 ln -f romio/doc/README romio/ROMIO-README
+ln -f romio/doc/users-guide.ps.gz romio/doc/romio-users-guide.ps.gz 
 ln -f romio/README_LAM romio/ROMIO-README_LAM
 
-rm -rf $RPM_BUILD_ROOT/usr/share/lam/doc
-
-# just includes a non-manpage
-rm -f $RPM_BUILD_ROOT/%{mandir}/man3/libmpi.3
-
 # FIXME: sanitize /usr/include/lam_config.h for bi-arch
 
-# remove unpackaged files from the buildroot
+# Remove wrong doc directory location (files shipped in %doc): 
 rm -rf $RPM_BUILD_ROOT%{_datadir}/lam
 
 %clean
@@ -96,8 +92,10 @@
 
 %files
 %defattr(-,root,root)
-%doc LICENSE HISTORY INSTALL README AUTHORS romio/doc/users-guide.ps.gz
-%doc romio/ROMIO-COPYRIGHT romio/ROMIO-README romio/ROMIO-README_LAM
+%doc LICENSE HISTORY INSTALL README AUTHORS
+%doc romio/ROMIO-COPYRIGHT romio/ROMIO-README romio/ROMIO-README_LAM  romio/doc/romio-users-guide.ps.gz
+%doc doc/user.pdf doc/install.pdf
+%doc share/memory/darwin7/APPLE_LICENSE share/memory/ptmalloc/ptmalloc-COPYRIGHT share/memory/ptmalloc2/ptmalloc2-COPYRIGHT
 %config(noreplace) /etc/lam
 
 %{_bindir}/*
@@ -113,8 +111,14 @@
 %{_libdir}/lam/*
 %endif
 
-
 %changelog
+* Tue Aug 02 2005 Jason Vas Dias <jvdias redhat com> - 2:7.1.1-7
+- fix bug 164898: 7.0.6's '--enable-trillium' -> 7.1.1's '--with-trillium'
+
+* Fri Jul 08 2005 Jason Vas Dias <jvdias redhat com> - 2:7.1.1-6
+- fix bug 161028
+- build for FC4 updates
+
 * Mon Jun 27 2005 Tom "spot" Callaway <tcallawa redhat com> - 2:7.1.1-5
 - enable shared libraries
 - don't list %{_datadir}/* in files