[suitesparse/f15/master] - Fix a couple of undefined reference errors in umfpack and Rbio (#677061)

[Deji Akingunola]

commit 784ea1e8ef8e4a58748efece9132010312796e39
Author: Deji Akingunola <dakingun at gmail.com>
Date:   Mon Feb 14 01:29:00 2011 -0500

    - Fix a couple of undefined reference errors in umfpack and Rbio (#677061)

 suitesparse.spec |   29 ++++++++++++++++++++++++-----
 1 files changed, 24 insertions(+), 5 deletions(-)
---
diff --git a/suitesparse.spec b/suitesparse.spec
index 14d128c..6872f20 100644
--- a/suitesparse.spec
+++ b/suitesparse.spec
@@ -1,6 +1,6 @@
 Name:           suitesparse
 Version:        3.6.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A collection of sparse matrix libraries
 
 Group:          System Environment/Libraries
@@ -35,6 +35,7 @@ matrices.  The package includes the following libraries:
               factorization method
   UMFPACK     sparse LU factorization
   UFconfig    configuration file for all the above packages.
+  RBio        read/write files in Rutherford/Boeing format
 
 
 %package devel
@@ -102,6 +103,8 @@ This package contains documentation files for %{name}.
 %define spqr_version_major 1
 %define rbio_version 2.0.1
 %define rbio_version_major 2
+%define ufconfig_version 3.6.0
+%define ufconfig_version_major 3
 ### CHOLMOD can also be compiled to use the METIS library, but it is not
 ### used here because its licensing terms exclude it from Fedora Extras.
 ### To compile with METIS, define enable_metis as 1 below.
@@ -291,7 +294,8 @@ pushd UMFPACK
   pushd ../Lib
     gcc -shared -Wl,-soname,libumfpack.so.%{umfpack_version_major} -o \
         libumfpack.so.%{umfpack_version} ../UMFPACK/Lib/*.o \
-        -L%{_libdir}/atlas -lcblas -llapack libamd.so.%{amd_version_major} -lm
+        -L%{_libdir}/atlas -lcblas -llapack libamd.so.%{amd_version_major} \
+        libcholmod.so.%{cholmod_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 ./
@@ -322,13 +326,27 @@ pushd SPQR
   cp -p README_SPQR.txt Doc/* ../Doc/SPQR
 popd
 
+pushd UFconfig
+  make CFLAGS="$RPM_OPT_FLAGS -fPIC"
+  gcc $RPM_OPT_FLAGS -fPIC -c UFconfig.c
+  pushd ../Lib
+    gcc -shared -Wl,-soname,libufconfig.so.%{ufconfig_version_major} -o \
+        libufconfig.so.%{ufconfig_version} ../UFconfig/*.o
+    ln -sf libufconfig.so.%{ufconfig_version} libufconfig.so.%{ufconfig_version_major}
+    ln -sf libufconfig.so.%{ufconfig_version} libufconfig.so
+    cp -p ../UFconfig/*.a ./
+  popd
+  cp -p *.h ../Include
+popd
+
 pushd RBio
   pushd Lib
     make CFLAGS="$RPM_OPT_FLAGS -fPIC"
   popd
   pushd ../Lib
     gcc -shared -Wl,-soname,librbio.so.%{rbio_version_major} -o \
-        librbio.so.%{rbio_version} ../RBio/Lib/*.o
+        librbio.so.%{rbio_version} ../RBio/Lib/*.o \
+        libufconfig.so.%{ufconfig_version_major}
     ln -sf librbio.so.%{rbio_version} librbio.so.%{rbio_version_major}
     ln -sf librbio.so.%{rbio_version} librbio.so
     cp -p ../RBio/Lib/*.a ./
@@ -337,8 +355,6 @@ pushd RBio
   cp -p README.txt Doc/ChangeLog Doc/License.txt ../Doc/RBio
 popd
 
-cp -p UFconfig/UFconfig.h Include
-
 %install
 rm -rf ${RPM_BUILD_ROOT}
 mkdir -p ${RPM_BUILD_ROOT}%{_libdir}
@@ -381,6 +397,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %doc Doc/*
 
 %changelog
+* Sun Feb 13 2011 Deji Akingunola <dakingun at gmail.com> - 3.6.0-3
+- Fix a couple of undefined reference errors in umfpack and Rbio (#677061)
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild