From b7ebef11c648352cc8daf4bd4fdaf970b84ed6f9 Mon Sep 17 00:00:00 2001
From: Quentin Spencer <qspencer@fedoraproject.org>
Date: Tue, 7 Mar 2006 18:54:03 +0000
Subject: [PATCH] New release, including two new libs.

---
 sources       |  2 +-
 ufsparse.spec | 54 ++++++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/sources b/sources
index 28c0d53..cb721cb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-534abf5e6f6ab58dbeaf6154fc31ec61  UFsparse.tar.gz
+15f2cc58c2d66fa2ac0286cdfcf7cc76  UFsparse.tar.gz
diff --git a/ufsparse.spec b/ufsparse.spec
index 0dedf3c..5d3f056 100644
--- a/ufsparse.spec
+++ b/ufsparse.spec
@@ -1,12 +1,12 @@
 Name:           ufsparse
-Version:        0.93
-Release:        2%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        University of Florida sparse matrix libraries
 
 Group:          System Environment/Libraries
 License:        Distributable
-URL:            http://www.cise.ufl.edu/research/sparse/UFsparse/
-Source0:        http://www.cise.ufl.edu/research/sparse/UFsparse/Jan28_2006/UFsparse.tar.gz
+URL:            http://www.cise.ufl.edu/research/sparse/UFsparse
+Source0:        http://www.cise.ufl.edu/research/sparse/UFsparse/v%{version}/UFsparse.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  blas-devel
@@ -20,7 +20,10 @@ matrices.  The package includes the following libraries:
   COLAMD      column approximate minimum degree ordering
   CCOLAMD     constrained column approximate minimum degree ordering
   CHOLMOD     sparse Cholesky factorization
+  CSparse     a concise sparse matrix package
+  CXSparse    CSparse extended: complex matrix, int and long int support
   KLU         sparse LU factorization, primarily for circuit simulation
+  LDL         a simple LDL' factorization
   UMFPACK     sparse LU factorization
   UFconfig    configuration file for all the above packages.
 
@@ -139,6 +142,44 @@ pushd Lib
   ln -sf libcolamd.so.%{colamd_version} libcolamd.so
 popd
 
+## Don't install CSparse as the header file name conflicts with
+## CXSparse. CXSparse is a superset of CSparse, with the user needing
+## to link against -lcxsparse rather than -lcsparse. This is an
+## annoyance and not real issue.
+%define csparse_version 1.2
+%define csparse_version_major 1
+pushd CSparse
+  pushd Source
+    make -f Makefile CFLAGS="$RPM_OPT_FLAGS -fPIC" libcsparse.a
+    gcc -shared -Wl,-soname,libcsparse.so.%{csparse_version_major} -o libcsparse.so.%{csparse_version} `ls *.o`
+    cp *.a *.so* ../../Lib
+#    cp cs.h ../../Include
+  popd
+  mkdir ../Doc/CSparse/
+ cp README.txt License.txt lesser.txt ../Doc/CSparse
+popd
+pushd Lib
+  ln -sf libcsparse.so.%{csparse_version} libcsparse.so.%{csparse_version_major}
+  ln -sf libcsparse.so.%{csparse_version} libcsparse.so
+popd
+
+%define cxsparse_version 1.2
+%define cxsparse_version_major 1
+pushd CXSparse
+  pushd Source
+    make -f Makefile CFLAGS="$RPM_OPT_FLAGS -fPIC" libcxsparse.a
+    gcc -shared -Wl,-soname,libcxsparse.so.%{cxsparse_version_major} -o libcxsparse.so.%{cxsparse_version} `ls *.o`
+    cp *.a *.so* ../../Lib
+    cp cs.h ../../Include
+  popd
+  mkdir ../Doc/CXSparse/
+  cp README.txt License.txt lesser.txt ../Doc/CXSparse
+popd
+pushd Lib
+  ln -sf libcxsparse.so.%{cxsparse_version} libcxsparse.so.%{cxsparse_version_major}
+  ln -sf libcxsparse.so.%{cxsparse_version} libcxsparse.so
+popd
+
 %define klu_version 0.7
 %define klu_version_major 0
 pushd KLU
@@ -151,7 +192,6 @@ pushd KLU
   mkdir ../Doc/KLU/
   cp README.txt Doc/lesser.txt ../Doc/KLU/
   mkdir ../Devel/KLU/
-  cp Doc/thesis.pdf Doc/README ../Devel/KLU/
 popd
 pushd Lib
   ln -sf libklu.so.%{klu_version} libklu.so.%{klu_version_major}
@@ -232,6 +272,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/lib*.so
 
 %changelog
+* Tue Mar  7 2006 Quentin Spencer <qspencer@users.sourceforge.net> 1.2-1
+- New release.
+- Build newly added libraries CSparse and CXSparse.
+
 * Wed Feb 15 2006 Quentin Spencer <qspencer@users.sourceforge.net> 0.93-2
 - Rebuild for Fedora Extras 5.