SPECS: openmpi.spec - workaround libtool issues - more verbose fil...

[qboosh]

Author: qboosh                       Date: Sun Mar  9 20:57:46 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- workaround libtool issues
- more verbose files with fixes (missing dir in -libs, no modules .la in -devel)

---- Files affected:
SPECS:
   openmpi.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SPECS/openmpi.spec
diff -u SPECS/openmpi.spec:1.4 SPECS/openmpi.spec:1.5
--- SPECS/openmpi.spec:1.4	Sun Mar  9 20:59:38 2008
+++ SPECS/openmpi.spec	Sun Mar  9 21:57:41 2008
@@ -14,6 +14,7 @@
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	gcc-fortran
+#BuildRequires:	libtool >= 2.2
 Requires:	%{name}-libs = %{version}-%{release}
 Conflicts:	lam
 Conflicts:	mpich
@@ -92,7 +93,8 @@
 
 %build
 if [ ! -f configure -o configure.ac -nt configure ]; then
-	%{__aclocal}
+	# libltdl comes from libtool 2.1x, so libtoolize fails with libtool <2.1
+	%{__aclocal} -I config -I opal/libltdl/m4
 	%{__autoconf}
 	%{__autoheader}
 	%{__automake}
@@ -108,37 +110,69 @@
 
 mv $RPM_BUILD_ROOT%{_sysconfdir}/openmpi-totalview.tcl $RPM_BUILD_ROOT%{_datadir}/openmpi/doc
 
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
 
-%post	devel -p /sbin/ldconfig
-%postun devel -p /sbin/ldconfig
-
 %files
 %defattr(644,root,root,755)
 %doc README INSTALL LICENSE NEWS LICENSE AUTHORS examples/
-%{_sysconfdir}/*
+%attr(755,root,root) %{_bindir}/mpi*
+%attr(755,root,root) %{_bindir}/ompi_info
+%attr(755,root,root) %{_bindir}/opal_wrapper
+%attr(755,root,root) %{_bindir}/orted
+%attr(755,root,root) %{_bindir}/orterun
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/openmpi-default-hostfile
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/openmpi-mca-params.conf
 %{_datadir}/openmpi
-%attr(755,root,root) %{_bindir}/*
-%{_mandir}/man1/*
+%{_mandir}/man1/mpi*.1*
+%{_mandir}/man1/orterun.1*
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/*.so.*
-%{_libdir}/%{name}/*.so
+%attr(755,root,root) %{_libdir}/libmca_common_sm.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmca_common_sm.so.0
+%attr(755,root,root) %{_libdir}/libmpi.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmpi.so.0
+%attr(755,root,root) %{_libdir}/libmpi_cxx.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmpi_cxx.so.0
+%attr(755,root,root) %{_libdir}/libmpi_f77.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmpi_f77.so.0
+%attr(755,root,root) %{_libdir}/libmpi_f90.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmpi_f90.so.0
+%attr(755,root,root) %{_libdir}/libopen-pal.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libopen-pal.so.0
+%attr(755,root,root) %{_libdir}/libopen-rte.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libopen-rte.so.0
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}/libompitv.so
+%{_libdir}/%{name}/mca_*.so
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/*
-%{_libdir}/*.so
-%{_libdir}/*.la
-%{_libdir}/*.mod
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/*.la
-%{_mandir}/man3/*
+%attr(755,root,root) %{_libdir}/libmca_common_sm.so
+%attr(755,root,root) %{_libdir}/libmpi.so
+%attr(755,root,root) %{_libdir}/libmpi_cxx.so
+%attr(755,root,root) %{_libdir}/libmpi_f77.so
+%attr(755,root,root) %{_libdir}/libmpi_f90.so
+%attr(755,root,root) %{_libdir}/libopen-pal.so
+%attr(755,root,root) %{_libdir}/libopen-rte.so
+%{_libdir}/libmca_common_sm.la
+%{_libdir}/libmpi.la
+%{_libdir}/libmpi_cxx.la
+%{_libdir}/libmpi_f77.la
+%{_libdir}/libmpi_f90.la
+%{_libdir}/libopen-pal.la
+%{_libdir}/libopen-rte.la
+%{_libdir}/mpi.mod
+%{_includedir}/mpi*.h
+%{_includedir}/openmpi
+%{_mandir}/man3/MPI*.3*
+%{_mandir}/man3/OpenMPI.3*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -146,6 +180,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2008-03-09 20:57:41  qboosh
+- workaround libtool issues
+- more verbose files with fixes (missing dir in -libs, no modules .la in -devel)
+
 Revision 1.4  2008-03-09 19:59:38  qboosh
 - pl
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/openmpi.spec?r1=1.4&r2=1.5&f=u