rpms/ufsparse/FC-5 sources,1.6,1.7 ufsparse.spec,1.13,1.14

Quentin Spencer (qspencer) fedora-extras-commits at redhat.com
Wed Aug 16 14:06:45 UTC 2006


Author: qspencer

Update of /cvs/extras/rpms/ufsparse/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6919

Modified Files:
	sources ufsparse.spec 
Log Message:
New release.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ufsparse/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	7 Mar 2006 18:54:03 -0000	1.6
+++ sources	16 Aug 2006 14:06:45 -0000	1.7
@@ -1 +1 @@
-15f2cc58c2d66fa2ac0286cdfcf7cc76  UFsparse.tar.gz
+7e635c3c6f6224439c96ca1ac9bb21e2  UFsparse.tar.gz


Index: ufsparse.spec
===================================================================
RCS file: /cvs/extras/rpms/ufsparse/FC-5/ufsparse.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ufsparse.spec	8 Mar 2006 15:17:56 -0000	1.13
+++ ufsparse.spec	16 Aug 2006 14:06:45 -0000	1.14
@@ -1,5 +1,5 @@
 Name:           ufsparse
-Version:        1.2
+Version:        2.0.0
 Release:        1%{?dist}
 Summary:        University of Florida sparse matrix libraries
 
@@ -17,6 +17,7 @@
 matrices.  The package includes the following libraries:
   AMD         approximate minimum degree ordering
   BTF         permutation to block triangular form (beta)
+  CAMD        constrained approximate minimum degree ordering
   COLAMD      column approximate minimum degree ordering
   CCOLAMD     constrained column approximate minimum degree ordering
   CHOLMOD     sparse Cholesky factorization
@@ -43,15 +44,15 @@
 %setup -q -n UFsparse
 
 %build
-%define amd_version 1.2
-%define amd_version_major 1
+%define amd_version 2.0
+%define amd_version_major 2
 mkdir Devel
 mkdir Doc
 mkdir Lib
 mkdir Include
 pushd AMD
   pushd Source
-    make -f Makefile CFLAGS="$RPM_OPT_FLAGS -fPIC" 
+    make CFLAGS="$RPM_OPT_FLAGS -fPIC" 
     gcc -shared -Wl,-soname,libamd.so.%{amd_version_major} -o ../Lib/libamd.so.%{amd_version} `ls *.o`
   popd
   cp Lib/*.a Lib/*.so* ../Lib
@@ -66,11 +67,11 @@
   ln -sf libamd.so.%{amd_version} libamd.so
 popd
 
-%define btf_version 0.7
+%define btf_version 0.9
 %define btf_version_major 0
 pushd BTF
   pushd Lib
-    make -f Makefile CFLAGS="$RPM_OPT_FLAGS -fPIC" libbtf.a
+    make CFLAGS="$RPM_OPT_FLAGS -fPIC" libbtf.a
     gcc -shared -Wl,-soname,libbtf.so.%{btf_version_major} -o libbtf.so.%{btf_version} `ls *.o`
   popd
   cp Lib/*.a Lib/*.so* ../Lib
@@ -83,10 +84,27 @@
   ln -sf libbtf.so.%{btf_version} libbtf.so
 popd
 
-%define ccolamd_version 1.0
-%define ccolamd_version_major 1
+%define camd_version 2.1
+%define camd_version_major 2
+pushd CAMD
+  pushd Source
+    make CFLAGS="$RPM_OPT_FLAGS -fPIC" 
+    gcc -shared -Wl,-soname,libcamd.so.%{camd_version_major} -o ../Lib/libcamd.so.%{camd_version} `ls *.o`
+  popd
+  cp Lib/*.a Lib/*.so* ../Lib
+  cp Include/*.h ../Include
+  mkdir ../Doc/CAMD/
+  cp README.txt Doc/License Doc/ChangeLog ../Doc/CAMD
+popd
+pushd Lib
+  ln -sf libcamd.so.%{camd_version} libcamd.so.%{camd_version_major}
+  ln -sf libcamd.so.%{camd_version} libcamd.so
+popd
+
+%define ccolamd_version 2.5
+%define ccolamd_version_major 2
 pushd CCOLAMD
-  make -f Makefile CFLAGS="$RPM_OPT_FLAGS -fPIC" 
+  make CFLAGS="$RPM_OPT_FLAGS -fPIC" 
   gcc -shared -Wl,-soname,libccolamd.so.%{ccolamd_version_major} -o libccolamd.so.%{ccolamd_version} `ls *.o`
   cp *.a *.so* ../Lib
   cp *.h ../Include
@@ -98,7 +116,7 @@
   ln -sf libccolamd.so.%{ccolamd_version} libccolamd.so
 popd
 
-%define cholmod_version 1.0
+%define cholmod_version 1.1.1
 %define cholmod_version_major 1
 ### 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.
@@ -111,7 +129,7 @@
 %endif
 pushd CHOLMOD
   pushd Lib
-    make -f Makefile CFLAGS="$CHOLMOD_FLAGS"
+    make  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
@@ -131,10 +149,10 @@
   ln -sf libcholmod.so.%{cholmod_version} libcholmod.so
 popd
 
-%define colamd_version 2.4
+%define colamd_version 2.5
 %define colamd_version_major 2
 pushd COLAMD
-  make -f Makefile CFLAGS="$RPM_OPT_FLAGS -fPIC" library
+  make CFLAGS="$RPM_OPT_FLAGS -fPIC" library
   gcc -shared -Wl,-soname,libcolamd.so.%{colamd_version_major} -o libcolamd.so.%{colamd_version} `ls *.o`
   cp *.a *.so* ../Lib
   cp *.h ../Include
@@ -152,11 +170,11 @@
 ### enable_csparse as 1 below.
 %define enable_csparse 0
 %if "%{?enable_csparse}" == "1"
-%define csparse_version 1.2
-%define csparse_version_major 1
+%define csparse_version 2.0.1
+%define csparse_version_major 2
 pushd CSparse
   pushd Source
-    make -f Makefile CFLAGS="$RPM_OPT_FLAGS -fPIC" libcsparse.a
+    make 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
@@ -170,11 +188,11 @@
 popd
 
 %else
-%define cxsparse_version 1.2
-%define cxsparse_version_major 1
+%define cxsparse_version 2.0.1
+%define cxsparse_version_major 2
 pushd CXSparse
   pushd Source
-    make -f Makefile CFLAGS="$RPM_OPT_FLAGS -fPIC" libcxsparse.a
+    make 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
@@ -188,11 +206,11 @@
 popd
 %endif
 
-%define klu_version 0.7
+%define klu_version 0.9
 %define klu_version_major 0
 pushd KLU
   pushd Lib
-    make -f Makefile CFLAGS="$RPM_OPT_FLAGS -fPIC" libklu.a
+    make CFLAGS="$RPM_OPT_FLAGS -fPIC" libklu.a
     gcc -shared -Wl,-soname,libklu.so.%{klu_version_major} -o libklu.so.%{klu_version} `ls *.o`
   popd
   cp Lib/*.a Lib/*.so* ../Lib
@@ -206,10 +224,10 @@
   ln -sf libklu.so.%{klu_version} libklu.so
 popd
 
-%define ldl_version 1.2
+%define ldl_version 1.3
 %define ldl_version_major 1
 pushd LDL
-  make -f Makefile CFLAGS="$RPM_OPT_FLAGS -fPIC" libldl.a
+  make CFLAGS="$RPM_OPT_FLAGS -fPIC" libldl.a
   gcc -shared -Wl,-soname,libldl.so.%{ldl_version_major} -o libldl.so.%{ldl_version} `ls *.o`
   cp *.a *.so* ../Lib
   cp *.h ../Include
@@ -223,11 +241,11 @@
   ln -sf libldl.so.%{ldl_version} libldl.so
 popd
 
-%define umfpack_version 4.6
-%define umfpack_version_major 4
+%define umfpack_version 5.0
+%define umfpack_version_major 5
 pushd UMFPACK
   pushd Source
-    make -f Makefile CFLAGS="$RPM_OPT_FLAGS -fPIC" 
+    make CFLAGS="$RPM_OPT_FLAGS -fPIC" 
     gcc -shared -Wl,-soname,libumfpack.so.%{umfpack_version_major} -o ../Lib/libumfpack.so.%{umfpack_version} `ls *.o` -lblas -lm
   popd
   cp Lib/*.a Lib/*.so* ../Lib
@@ -242,6 +260,7 @@
   ln -sf libumfpack.so.%{umfpack_version} libumfpack.so
 popd
 
+cp UFconfig/UFconfig.h Include
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -280,6 +299,11 @@
 %{_libdir}/lib*.so
 
 %changelog
+* Wed Aug 16 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.0.0-1
+- New release.
+- Build newly added CAMD library.
+- Misc minor spec changes.
+
 * Tue Mar  7 2006 Quentin Spencer <qspencer at users.sourceforge.net> 1.2-1
 - New release.
 - Build newly added library CXSparse (but not CSparse--see comments




More information about the scm-commits mailing list