rpms/lam/FC-5 .cvsignore, 1.11, 1.12 lam.spec, 1.33, 1.34 sources, 1.11, 1.12

[fedora-cvs-commits at redhat.com]

Author: jvdias

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

Modified Files:
	.cvsignore lam.spec sources 
Log Message:
upgrade to 7.1.2; split into -devel and -libs subpackages


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/lam/FC-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	2 Feb 2005 16:49:11 -0000	1.11
+++ .cvsignore	12 Jun 2006 22:21:40 -0000	1.12
@@ -1,2 +1,3 @@
 lam-7.0.6.tar.bz2
 lam-7.1.1.tar.bz2
+lam-7.1.2.tar.bz2


Index: lam.spec
===================================================================
RCS file: /cvs/dist/rpms/lam/FC-5/lam.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- lam.spec	22 Feb 2006 00:50:34 -0000	1.33
+++ lam.spec	12 Jun 2006 22:21:40 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: The LAM (Local Area Multicomputer) programming environment.
 Name: lam
-Version: 7.1.1
-Release: 11
+Version: 7.1.2
+Release: 1.fc5
 License: BSD
 Epoch: 2
 Group: Development/Libraries
@@ -11,9 +11,9 @@
 Source3: lam.module.in
 URL: http://www.lam-mpi.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: perl gcc gcc-c++ gcc-gfortran libaio libaio-devel
+BuildRequires: perl gcc gcc-c++ gcc-gfortran libaio libaio-devel autoconf automake libtool
 Requires: openssh-server openssh-clients libaio libaio-devel gcc gcc-c++ gcc-gfortran
-Patch0: lam-7.1.1-f77-f95.patch
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
 
 %{?!LAMbinpfx: %define LAMbinpfx 'lam-'} # prefix for LAM binaries that clash with OpenMPI
 
@@ -43,9 +43,23 @@
 cumulative record of communication, which can be visualized either at
 runtime or post-mortem.
 
+%package libs
+Summary:        Libraries for LAM
+Group:          System/Libraries
+
+%description libs
+Runtime libraries for LAM
+
+%package devel
+Summary:        Development files for LAM
+Group:          Development/Libraries
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+
+%description devel
+Contains development headers and libraries for LAM
+
 %prep
-%setup -q
-%patch0 -p1 -b .f77-f95
+%setup -q -n lam-%{version}
 
 %build
 %ifarch x86_64
@@ -53,15 +67,14 @@
 CXXFLAGS="$RPM_OPT_FLAGS -fPIC"
 FFLAGS="$RPM_OPT_FLAGS -fPIC"
 %endif 
-autoconf
 export FC=f95
 %ifarch i386 s390 ppc
-%configure --with-rsh="/usr/bin/ssh -x -a" --libdir=%{_libdir}/lam --includedir=%{_includedir}/lam --sysconfdir=%{_sysconfdir}/lam --with-trillium --enable-shared
+%configure --with-rsh="/usr/bin/ssh -x -a" --libdir=%{_libdir}/%{name} --includedir=%{_includedir}/%{name} --sysconfdir=%{_sysconfdir}/%{name} --with-trillium --enable-shared
 %else
 #
 # Disable TotalView on non-32 bit architectures.
 #
-%configure --with-rsh="/usr/bin/ssh -x -a" --libdir=%{_libdir}/lam --includedir=%{_includedir}/lam --sysconfdir=%{_sysconfdir}/lam --disable-tv --disable-tv-dll --with-trillium --enable-shared
+%configure --with-rsh="/usr/bin/ssh -x -a" --libdir=%{_libdir}/%{name} --includedir=%{_includedir}/%{name} --sysconfdir=%{_sysconfdir}/%{name} --disable-tv --disable-tv-dll --with-trillium --enable-shared
 %endif
 
 make %{?_smp_mflags} all
@@ -140,17 +153,33 @@
 %files
 %defattr(-,root,root)
 %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) %{_sysconfdir}/lam
+%config(noreplace) %{_sysconfdir}/%{name}
 %ghost %{_sysconfdir}/ld.so.conf.d/mpi.conf
-%config %{_libdir}/pkgconfig/%{name}.pc
 %{_bindir}/*
-%{_includedir}/%{name}
-%{_libdir}/%{name}
 %{_datadir}/%{name}
 
+%files libs
+%defattr(-,root,root)
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}/*.so.*
+%ifarch i386 s390 ppc
+%dir %{_libdir}/%{name}/lam
+%{_libdir}/%{name}/lam/*.so.*
+%endif
+
+%files devel
+%defattr(-,root,root)
+%doc romio/ROMIO-COPYRIGHT romio/ROMIO-README romio/ROMIO-README_LAM  romio/doc/romio-users-guide.ps.gz
+%{_includedir}/%{name}
+%{_libdir}/%{name}/*.a
+%{_libdir}/%{name}/*.so
+%ifarch i386 s390 ppc
+%{_libdir}/%{name}/lam/*.so
+%endif
+%config %{_libdir}/pkgconfig/%{name}.pc
+
 %post
 if [ $1 -ge 1 ]; then
    if [ ! -e %{_sysconfdir}/ld.so.conf.d/mpi.conf ]; then
@@ -159,6 +188,12 @@
 fi;
 
 %changelog
+* Mon Jun 12 2006 Jason Vas Dias<jvdias at redhat.com> - 2:7.1.2-1.fc6
+- Upgrade to upstream version 7.1.2
+- fix bug 191433 - Split into -libs and -devel packages
+  ( apply .spec file patch from Orion Poplawski <orion at cora.nwra.com> )
+- fix bug 194747 - fix BuildRequires for mock
+
 * Tue Feb 21 2006 Jason Vas Dias<jvdias at redhat.com> - 2:7.1.1-11
 - ld.so.conf.d/mpi.conf integration with openmpi
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/lam/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	2 Feb 2005 16:49:11 -0000	1.11
+++ sources	12 Jun 2006 22:21:40 -0000	1.12
@@ -1,2 +1 @@
-4037133e564648bd7815e36f3f017d8b  lam-7.0.6.tar.bz2
-0a3eee53281884a063ce2c44793672b3  lam-7.1.1.tar.bz2
+07c59cf03c773a67199e066e500e499b  lam-7.1.2.tar.bz2