rpms/ufsparse/devel patch.UFsparse-2, NONE, 1.1 ufsparse.spec, 1.2, 1.3

[Quentin Spencer (qspencer)]

Author: qspencer

Update of /cvs/extras/rpms/ufsparse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29994

Modified Files:
	ufsparse.spec 
Added Files:
	patch.UFsparse-2 
Log Message:
Re-enable the cholmod library, by using the -DNPARTITION flag to avoid
using the external METIS library which is non-free.



--- NEW FILE patch.UFsparse-2 ---
*** CCOLAMD/ccolamd.h.orig	2005-09-14 09:42:17.116137176 +0200
--- CCOLAMD/ccolamd.h	2005-09-14 09:43:09.294669086 +0200
***************
*** 349,355 ****
      long Stack [ ]
  ) ;
  
! int (*ccolamd_printf) (const char *, ...) ;
  
  #ifdef __cplusplus
  }
--- 349,355 ----
      long Stack [ ]
  ) ;
  
! extern int (*ccolamd_printf) (const char *, ...) ;
  
  #ifdef __cplusplus
  }


Index: ufsparse.spec
===================================================================
RCS file: /cvs/extras/rpms/ufsparse/devel/ufsparse.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ufsparse.spec	2 Oct 2005 06:42:07 -0000	1.2
+++ ufsparse.spec	7 Oct 2005 18:12:14 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           ufsparse
 Version:        0.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        University of Florida sparse matrix libraries
 
 Group:          System Environment/Libraries
@@ -8,6 +8,7 @@
 URL:            http://www.cise.ufl.edu/research/sparse/umfpack/
 Source0:        http://www.cise.ufl.edu/research/sparse/beta/Aug31_2005/UFsparse.tar.gz
 Patch0:         patch.UFsparse
+Patch1:         patch.UFsparse-2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  blas-devel
@@ -19,13 +20,10 @@
   AMD         approximate minimum degree ordering
   COLAMD      column approximate minimum degree ordering
   CCOLAMD     constrained column approximate minimum degree ordering
+  CHOLMOD     sparse Cholesky factorization
   KLU         sparse LU factorization, primarily for circuit simulation
   UMFPACK     sparse LU factorization
 
-Note that an additional library, CHOLMOD (sparse Cholesky factorization), 
-is part of the source package, but is not compiled because it requires
-an external library METIS, which is distributed under non-free licensing
-terms that make it ineligible for inclusion in Fedora Extras.
 
 
 %package devel
@@ -42,6 +40,7 @@
 %prep
 %setup -q -n UFsparse
 %patch0 -p0
+%patch1 -p0
 
 
 %build
@@ -83,32 +82,34 @@
   ln -sf libccolamd.so.%{ccolamd_version} libccolamd.so
 popd
 
-### The code below can be used to compile the cholmod library, but it is
-### disabled because it requires the METIS library, which has a non-free
-### license, and therefore can not be included in Fedora Extras.
-#%define cholmod_version 0.6
-#%define cholmod_version_major 0
-#pushd CHOLMOD
-#  pushd Lib
-#    make -f Makefile CFLAGS="$RPM_OPT_FLAGS -I/usr/include/metis -fPIC" 
-#    gcc -shared -Wl,-soname,libcholmod.so.%{cholmod_version_major} -o ../Lib/libcholmod.so.%{cholmod_version} `ls *.o`
-#  popd
-#  cp Lib/*.a Lib/*.so* ../Lib
-#  cp Include/*.h ../Include
-#  mkdir ../Doc/CHOLMOD
-#  cp README.txt ../Doc/CHOLMOD/
-#  cp Cholesky/License.txt ../Doc/CHOLMOD/Cholesky_License.txt
-#  cp Core/License.txt ../Doc/CHOLMOD/Core_License.txt
-#  cp MatrixOps/License.txt ../Doc/CHOLMOD/MatrixOps_License.txt
-#  cp Partition/License.txt ../Doc/CHOLMOD/Partition_License.txt
-#  cp Supernodal/License.txt ../Doc/CHOLMOD/Supernodal_License.txt
-#  mkdir ../Devel/CHOLMOD/
-#  cp Doc/*.pdf ../Devel/CHOLMOD/
-#popd
-#pushd Lib
-#  ln -sf libcholmod.so.%{cholmod_version} libcholmod.so.%{cholmod_version_major}
-#  ln -sf libcholmod.so.%{cholmod_version} libcholmod.so
-#popd
+%define cholmod_version 0.6
+%define cholmod_version_major 0
+### 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, change the definition below to
+### CHOLMOD_FLAGS="$RPM_OPT_FLAGS -I/usr/include/metis -fPIC"
+CHOLMOD_FLAGS="$RPM_OPT_FLAGS -DNPARTITION -fPIC"
+pushd CHOLMOD
+  pushd Lib
+    make -f Makefile CFLAGS="$CHOLMOD_FLAGS"
+    gcc -shared -Wl,-soname,libcholmod.so.%{cholmod_version_major} -o ../Lib/libcholmod.so.%{cholmod_version} `ls *.o`
+  popd
+  cp Lib/*.a Lib/*.so* ../Lib
+  cp Include/*.h ../Include
+  mkdir ../Doc/CHOLMOD
+  cp README.txt ../Doc/CHOLMOD/
+  cp Cholesky/License.txt ../Doc/CHOLMOD/Cholesky_License.txt
+  cp Core/License.txt ../Doc/CHOLMOD/Core_License.txt
+  cp MatrixOps/License.txt ../Doc/CHOLMOD/MatrixOps_License.txt
+  cp Partition/License.txt ../Doc/CHOLMOD/Partition_License.txt
+  cp Supernodal/License.txt ../Doc/CHOLMOD/Supernodal_License.txt
+  mkdir ../Devel/CHOLMOD/
+  cp Doc/*.pdf ../Devel/CHOLMOD/
+popd
+pushd Lib
+  ln -sf libcholmod.so.%{cholmod_version} libcholmod.so.%{cholmod_version_major}
+  ln -sf libcholmod.so.%{cholmod_version} libcholmod.so
+popd
 
 %define colamd_version 2.4
 %define colamd_version_major 2
@@ -199,6 +200,9 @@
 %{_libdir}/lib*.so
 
 %changelog
+* Fri Oct 07 2005 Quentin Spencer <qspencer at users.sourceforge.net> 0.9-3
+- Build cholmod, but disable METIS using -DNPARTITION flag.
+
 * Sat Oct 01 2005 Quentin Spencer <qspencer at users.sourceforge.net> 0.9-2
 - Modify description, other modifications for import into FE.
 - Add dist tag, cosmetic changes.