diff --git a/mumps.changes b/mumps.changes index 7b273cc..fa3663d 100644 --- a/mumps.changes +++ b/mumps.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 20 23:09:48 UTC 2012 - scorot@free.fr + +- fix build with debuginfo enabled + ------------------------------------------------------------------- Mon Aug 20 21:08:35 UTC 2012 - scorot@free.fr diff --git a/mumps.spec b/mumps.spec index baf1a18..5c49fa3 100644 --- a/mumps.spec +++ b/mumps.spec @@ -127,6 +127,7 @@ Group: Development/Libraries/Parallel Requires: blacs-openmpi-devel Requires: blas-devel Requires: lapack-devel +Requires: mumps-devel = %{version} Requires: mumps-openmpi = %{version} Requires: mumps-scotch-openmpi = %{version} Requires: openmpi-devel @@ -189,6 +190,7 @@ Group: Development/Libraries/Parallel Requires: blacs-mvapich2-devel Requires: blas-devel Requires: lapack-devel +Requires: mumps-devel = %{version} Requires: mumps-mvapich2 = %{version} Requires: mumps-scotch-mvapich2 = %{version} Requires: mvapich2-devel @@ -350,6 +352,18 @@ rm -rf examples/*.o examples/*simpletest examples/c_example rm -f %{buildroot}%{_libdir}/libpord.so* rm -f %{buildroot}%{_libdir}/libpord_ptscotch.so* +# we make a symlink to the serial lib in the parallel lib prefix +# because some scientific packages don't manage different directories +# for the serial and parallel libs +for mpi in %_mpi; do +pushd %{buildroot}%{_libdir} +for f in *_seq.* *_scotch.*; do + rm -f %{buildroot}%{_libdir}/mpi/gcc/$mpi/%_lib/$f && \ + ln -s %{_libdir}/$f %{buildroot}%{_libdir}/mpi/gcc/$mpi/%_lib/$f +done + +done + %clean rm -rf %{buildroot} @@ -409,9 +423,9 @@ rm -rf %{buildroot} %{_libdir}/mpi/gcc/openmpi/%_lib/libzmumps.so.* %{_libdir}/mpi/gcc/openmpi/%_lib/libmumps_common.so.* %{_libdir}/mpi/gcc/openmpi/%_lib/libpord.so.* -%exclude %{_libdir}/mpi/gcc/openmpi/%_lib/lib*seq.* -%exclude %{_libdir}/mpi/gcc/openmpi/%_lib/lib*scotch.* -%exclude %{_libdir}/mpi/gcc/openmpi/%_lib/libmumps_common_*scotch.* +%{_libdir}/mpi/gcc/openmpi/%_lib/lib*seq.so.* +%{_libdir}/mpi/gcc/openmpi/%_lib/lib*_scotch.so.* +%{_libdir}/mpi/gcc/openmpi/%_lib/libmumps_common_scotch.so.* %files ptscotch-openmpi %defattr(-,root,root,-) @@ -421,9 +435,7 @@ rm -rf %{buildroot} %{_libdir}/mpi/gcc/openmpi/%_lib/libzmumps_ptscotch.so.* %{_libdir}/mpi/gcc/openmpi/%_lib/libmumps_common_ptscotch.so.* %{_libdir}/mpi/gcc/openmpi/%_lib/libpord_ptscotch.so.* -%exclude %{_libdir}/mpi/gcc/openmpi/%_lib/lib*seq.* -%exclude %{_libdir}/mpi/gcc/openmpi/%_lib/lib*mumps_scotch.* -%exclude %{_libdir}/mpi/gcc/openmpi/%_lib/libmumps_common_scotch.* +%{_libdir}/mpi/gcc/openmpi/%_lib/libmumps_common_ptscotch.so.* %files openmpi-devel %defattr(-,root,root,-) @@ -439,9 +451,9 @@ rm -rf %{buildroot} %{_libdir}/mpi/gcc/mvapich2/%_lib/libzmumps.so.* %{_libdir}/mpi/gcc/mvapich2/%_lib/libmumps_common.so.* %{_libdir}/mpi/gcc/mvapich2/%_lib/libpord.so.* -%exclude %{_libdir}/mpi/gcc/mvapich2/%_lib/lib*seq.* -%exclude %{_libdir}/mpi/gcc/mvapich2/%_lib/lib*scotch.* -%exclude %{_libdir}/mpi/gcc/mvapich2/%_lib/libmumps_common_*scotch.* +%{_libdir}/mpi/gcc/mvapich2/%_lib/lib*seq.so.* +%{_libdir}/mpi/gcc/mvapich2/%_lib/lib*_scotch.so.* +%{_libdir}/mpi/gcc/mvapich2/%_lib/libmumps_common_scotch.so.* %files ptscotch-mvapich2 %defattr(-,root,root,-) @@ -451,9 +463,8 @@ rm -rf %{buildroot} %{_libdir}/mpi/gcc/mvapich2/%_lib/libzmumps_ptscotch.so.* %{_libdir}/mpi/gcc/mvapich2/%_lib/libmumps_common_ptscotch.so.* %{_libdir}/mpi/gcc/mvapich2/%_lib/libpord_ptscotch.so.* -%exclude %{_libdir}/mpi/gcc/mvapich2/%_lib/lib*seq.* -%exclude %{_libdir}/mpi/gcc/mvapich2/%_lib/lib*mumps_scotch.* -%exclude %{_libdir}/mpi/gcc/mvapich2/%_lib/libmumps_common_scotch.* +%{_libdir}/mpi/gcc/mvapich2/%_lib/libmumps_common_ptscotch.so.* + %files mvapich2-devel %defattr(-,root,root,-)