[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/lam/FC-3 lam.spec,1.18,1.19



Author: jvdias

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

Modified Files:
	lam.spec 
Log Message:
fix bug 161028


Index: lam.spec
===================================================================
RCS file: /cvs/dist/rpms/lam/FC-3/lam.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- lam.spec	2 Feb 2005 17:53:40 -0000	1.18
+++ lam.spec	8 Jul 2005 23:01:55 -0000	1.19
@@ -3,14 +3,14 @@
 Summary: The LAM (Local Area Multicomputer) programming environment.
 Name: lam
 Version: 7.1.1
-Release: 1_FC3
+Release: 6.FC3
 License: BSD
 Epoch: 2
 Group: Development/Libraries
 Source: http://www.lam-mpi.org/download/files/lam-%{version}.tar.bz2
 URL: http://www.lam-mpi.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: fileutils perl gcc gcc-c++ gcc-g77 libaio libaio-devel
+BuildRequires: perl gcc gcc-c++ gcc-g77 libaio libaio-devel
 Requires: openssh-server openssh-clients libaio libaio-devel gcc gcc-c++ gcc-g77
 
 %description 
@@ -43,14 +43,19 @@
 %setup -q
 
 %build
-
+%ifarch x86_64
+CFLAGS="$RPM_OPT_FLAGS -fPIC"
+CXXFLAGS="$RPM_OPT_FLAGS -fPIC"
+FFLAGS="$RPM_OPT_FLAGS -fPIC"
+%endif 
+autoconf
 %ifarch i386 s390 ppc
-%configure --with-rsh="/usr/bin/ssh -x -a" --libdir=%{_libdir} --enable-trillium
+%configure --with-rsh="/usr/bin/ssh -x -a" --libdir=%{_libdir} --enable-trillium --enable-shared
 %else
 #
 # Disable TotalView on non-32 bit architectures.
 #
-%configure --with-rsh="/usr/bin/ssh -x -a" --libdir=%{_libdir} --disable-tv --disable-tv-dll --enable-trillium
+%configure --with-rsh="/usr/bin/ssh -x -a" --libdir=%{_libdir} --disable-tv --disable-tv-dll --enable-trillium --enable-shared
 %endif
 
 make %{?_smp_mflags} all
@@ -59,26 +64,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
@@ -86,15 +89,17 @@
 
 %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}/*
+%{_libdir}/*.so*
 %{_mandir}/*/*
 %{_includedir}/*
 %{_libdir}/*a
-%{_datadir}/*
 
 #
 # TotalView libs on 32-bit arches
@@ -103,8 +108,24 @@
 %{_libdir}/lam/*
 %endif
 
-
 %changelog
+* 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
+
+* Sun May 22 2005 Jeremy Katz <katzj redhat com> - 2:7.1.1-4
+- use -fPIC on x86_64 (reported by spot to get things building for Extras)
+
+* Tue Mar 08 2005 Jason Vas Dias <jvdias redhat com>
+- add test for f95 to configure
+
+* Mon Mar 07 2005 Florian La Roche <laroche redhat com>
+- require gcc-gfortran instead of gcc-g77
+
 * Tue Feb 01 2005 Jason Vas Dias <jvdias redhat com>
 - Upgraded to version 7.1.1 ; fixed bug 126824 .
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]