rpms/suitesparse/devel suitesparse.spec,1.10,1.11

[Deji Akingunola]

Author: deji

Update of /cvs/pkgs/rpms/suitesparse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14559

Modified Files:
	suitesparse.spec 
Log Message:
* Fri Jan 16 2009 Deji Akingunola <dakingun at gmail.com> - 3.2.0-5
- More fixes for the undefined symbol issue (BZ #475411)



Index: suitesparse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/suitesparse/devel/suitesparse.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- suitesparse.spec	21 Dec 2008 04:00:02 -0000	1.10
+++ suitesparse.spec	16 Jan 2009 05:13:45 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           suitesparse
 Version:        3.2.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A collection of sparse matrix libraries
 
 Group:          System Environment/Libraries
@@ -108,7 +108,7 @@
   popd
   pushd ../Lib
     gcc -shared -Wl,-soname,libamd.so.%{amd_version_major} -o \
-        libamd.so.%{amd_version} ../AMD/Lib/*.o
+        libamd.so.%{amd_version} ../AMD/Lib/*.o -lm
     ln -sf libamd.so.%{amd_version} libamd.so.%{amd_version_major}
     ln -sf libamd.so.%{amd_version} libamd.so
     cp -p ../AMD/Lib/*.a ./
@@ -139,7 +139,7 @@
   popd
   pushd ../Lib
     gcc -shared -Wl,-soname,libcamd.so.%{camd_version_major} -o \
-        libcamd.so.%{camd_version} ../CAMD/Lib/*.o
+        libcamd.so.%{camd_version} ../CAMD/Lib/*.o -lm
     ln -sf libcamd.so.%{camd_version} libcamd.so.%{camd_version_major}
     ln -sf libcamd.so.%{camd_version} libcamd.so
     cp -p ../CAMD/Lib/*.a ./
@@ -155,7 +155,7 @@
   popd
   pushd ../Lib
     gcc -shared -Wl,-soname,libccolamd.so.%{ccolamd_version_major} -o \
-        libccolamd.so.%{ccolamd_version} ../CCOLAMD/Lib/*.o
+        libccolamd.so.%{ccolamd_version} ../CCOLAMD/Lib/*.o -lm
     ln -sf libccolamd.so.%{ccolamd_version} libccolamd.so.%{ccolamd_version_major}
     ln -sf libccolamd.so.%{ccolamd_version} libccolamd.so
     cp -p ../CCOLAMD/Lib/*.a ./
@@ -170,7 +170,7 @@
   popd
   pushd ../Lib
     gcc -shared -Wl,-soname,libcolamd.so.%{colamd_version_major} -o \
-        libcolamd.so.%{colamd_version} ../COLAMD/Lib/*.o
+        libcolamd.so.%{colamd_version} ../COLAMD/Lib/*.o -lm
     ln -sf libcolamd.so.%{colamd_version} libcolamd.so.%{colamd_version_major}
     ln -sf libcolamd.so.%{colamd_version} libcolamd.so
     cp -p ../COLAMD/Lib/*.a ./
@@ -191,7 +191,7 @@
   pushd ../Lib
     gcc -shared -Wl,-soname,libcholmod.so.%{cholmod_version_major} -o \
         libcholmod.so.%{cholmod_version} ../CHOLMOD/Lib/*.o \
-        -L%{_libdir}/atlas -lcblas -lclapack libamd.so.%{amd_version_major} \
+        -L%{_libdir}/atlas -lcblas -llapack libamd.so.%{amd_version_major} \
         libcamd.so.%{camd_version_major} libcolamd.so.%{colamd_version_major} \
         libccolamd.so.%{ccolamd_version_major} -lm
     ln -sf libcholmod.so.%{cholmod_version} libcholmod.so.%{cholmod_version_major}
@@ -216,7 +216,7 @@
   popd
   pushd ../Lib
     gcc -shared -Wl,-soname,libcsparse.so.%{csparse_version_major} -o \
-        libcsparse.so.%{csparse_version} ../CSparse/Source/*.o
+        libcsparse.so.%{csparse_version} ../CSparse/Source/*.o -lm
     ln -sf libcsparse.so.%{csparse_version} libcsparse.so.%{csparse_version_major}
     ln -sf libcsparse.so.%{csparse_version} libcsparse.so
     cp -p ../CSparse/Source/*.a ./
@@ -232,7 +232,7 @@
   popd
   pushd ../Lib
     gcc -shared -Wl,-soname,libcxsparse.so.%{cxsparse_version_major} -o \
-        libcxsparse.so.%{cxsparse_version} ../CXSparse/Lib/*.o
+        libcxsparse.so.%{cxsparse_version} ../CXSparse/Lib/*.o -lm
     ln -sf libcxsparse.so.%{cxsparse_version} libcxsparse.so.%{cxsparse_version_major}
     ln -sf libcxsparse.so.%{cxsparse_version} libcxsparse.so
     cp -p ../CXSparse/Lib/*.a ./
@@ -283,7 +283,7 @@
   pushd ../Lib
     gcc -shared -Wl,-soname,libumfpack.so.%{umfpack_version_major} -o \
         libumfpack.so.%{umfpack_version} ../UMFPACK/Lib/*.o \
-        -L%{_libdir}/atlas -lcblas libamd.so.%{amd_version_major} -lm
+        -L%{_libdir}/atlas -lcblas -llapack libamd.so.%{amd_version_major} -lm
     ln -sf libumfpack.so.%{umfpack_version} libumfpack.so.%{umfpack_version_major}
     ln -sf libumfpack.so.%{umfpack_version} libumfpack.so
     cp -p ../UMFPACK/Lib/*.a ./
@@ -298,9 +298,10 @@
     make CFLAGS="$RPM_OPT_FLAGS -DNPARTITION -fPIC"
   popd
   pushd ../Lib
-    gcc -shared -Wl,-soname,libspqr.so.%{spqr_version_major} -o \
+    g++ -shared -Wl,-soname,libspqr.so.%{spqr_version_major} -o \
         libspqr.so.%{spqr_version} ../SPQR/Lib/*.o \
-        -L%{_libdir}/atlas -lcblas -lclapack -lm
+        -L%{_libdir}/atlas -lcblas -llapack \
+        libcholmod.so.%{cholmod_version_major} -lm
     ln -sf libspqr.so.%{spqr_version} libspqr.so.%{spqr_version_major}
     ln -sf libspqr.so.%{spqr_version} libspqr.so
     cp -p ../SPQR/Lib/*.a ./
@@ -352,6 +353,9 @@
 %{_libdir}/lib*.a
 
 %changelog
+* Fri Jan 16 2009 Deji Akingunola <dakingun at gmail.com> - 3.2.0-5
+- More fixes for the undefined symbol issue (BZ #475411)
+
 * Sat Dec 20 2008 Deji Akingunola <dakingun at gmail.com> - 3.2.0-4
 - Also build SPQR
 - Further fixes for BZ #475411