rpms/ufsparse/devel sources, 1.7, 1.8 ufsparse.spec, 1.14, 1.15 needs.rebuild, 1.1, NONE
Quentin Spencer (qspencer)
fedora-extras-commits at redhat.com
Fri Sep 8 14:00:08 UTC 2006
Author: qspencer
Update of /cvs/extras/rpms/ufsparse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14516
Modified Files:
sources ufsparse.spec
Removed Files:
needs.rebuild
Log Message:
New release.
Rearrange spec file to put version definitions all together.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ufsparse/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 7 Aug 2006 21:44:23 -0000 1.7
+++ sources 8 Sep 2006 14:00:08 -0000 1.8
@@ -1 +1 @@
-7e635c3c6f6224439c96ca1ac9bb21e2 UFsparse.tar.gz
+1d36222397ceff76c92e4c870196011c UFsparse.tar.gz
Index: ufsparse.spec
===================================================================
RCS file: /cvs/extras/rpms/ufsparse/devel/ufsparse.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ufsparse.spec 7 Aug 2006 21:44:23 -0000 1.14
+++ ufsparse.spec 8 Sep 2006 14:00:08 -0000 1.15
@@ -1,5 +1,5 @@
Name: ufsparse
-Version: 2.0.0
+Version: 2.1.0
Release: 1%{?dist}
Summary: University of Florida sparse matrix libraries
@@ -46,10 +46,40 @@
%build
%define amd_version 2.0
%define amd_version_major 2
-mkdir Devel
-mkdir Doc
-mkdir Lib
-mkdir Include
+%define btf_version 0.9
+%define btf_version_major 0
+%define camd_version 2.1
+%define camd_version_major 2
+%define ccolamd_version 2.5.1
+%define ccolamd_version_major 2
+%define cholmod_version 1.2
+%define cholmod_version_major 1
+%define colamd_version 2.5
+%define colamd_version_major 2
+%define csparse_version 2.0.2
+%define csparse_version_major 2
+%define cxsparse_version 2.0.2
+%define cxsparse_version_major 2
+%define klu_version 0.9
+%define klu_version_major 0
+%define ldl_version 1.3
+%define ldl_version_major 1
+%define umfpack_version 5.0.1
+%define umfpack_version_major 5
+### 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.
+%define enable_metis 0
+### CXSparse is a superset of CSparse, and the two share common header
+### names, so it does not make sense to build both. CXSparse is built
+### by default, but CSparse can be built instead by defining
+### enable_csparse as 1 below.
+%define enable_csparse 0
+
+mkdir Devel Devel/AMD Devel/CHOLMOD Devel/KLU Devel/LDL Devel/UMFPACK \
+ Doc Doc/AMD Doc/BTF Doc/CAMD Doc/CCOLAMD Doc/CHOLMOD Doc/COLAMD \
+ Doc/KLU Doc/LDL Doc/UMFPACK Lib Include
+
pushd AMD
pushd Source
make CFLAGS="$RPM_OPT_FLAGS -fPIC"
@@ -57,18 +87,10 @@
popd
cp Lib/*.a Lib/*.so* ../Lib
cp Include/*.h ../Include
- mkdir ../Doc/AMD/
- cp README.txt Doc/License Doc/ChangeLog ../Doc/AMD/
- mkdir ../Devel/AMD/
+ cp README.txt Doc/License Doc/ChangeLog ../Doc/AMD
cp Doc/*.pdf ../Devel/AMD/
popd
-pushd Lib
- ln -sf libamd.so.%{amd_version} libamd.so.%{amd_version_major}
- ln -sf libamd.so.%{amd_version} libamd.so
-popd
-%define btf_version 0.9
-%define btf_version_major 0
pushd BTF
pushd Lib
make CFLAGS="$RPM_OPT_FLAGS -fPIC" libbtf.a
@@ -76,16 +98,9 @@
popd
cp Lib/*.a Lib/*.so* ../Lib
cp Include/*.h ../Include
- mkdir ../Doc/BTF/
- cp README.txt Doc/lesser.txt ../Doc/BTF/
-popd
-pushd Lib
- ln -sf libbtf.so.%{btf_version} libbtf.so.%{btf_version_major}
- ln -sf libbtf.so.%{btf_version} libbtf.so
+ cp README.txt Doc/lesser.txt ../Doc/BTF
popd
-%define camd_version 2.1
-%define camd_version_major 2
pushd CAMD
pushd Source
make CFLAGS="$RPM_OPT_FLAGS -fPIC"
@@ -93,35 +108,19 @@
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 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
- mkdir ../Doc/CCOLAMD/
cp README.txt lesser.txt ChangeLog ../Doc/CCOLAMD
popd
pushd Lib
- ln -sf libccolamd.so.%{ccolamd_version} libccolamd.so.%{ccolamd_version_major}
- ln -sf libccolamd.so.%{ccolamd_version} libccolamd.so
popd
-%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.
-### To compile with METIS, define enable_metis as 1 below.
-%define enable_metis 0
%if "%{?enable_metis}" == "1"
CHOLMOD_FLAGS="$RPM_OPT_FLAGS -I%{_includedir}/metis -fPIC"
%else
@@ -129,49 +128,29 @@
%endif
pushd CHOLMOD
pushd Lib
- make 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
cp Include/*.h ../Include
- mkdir ../Doc/CHOLMOD
- cp README.txt ../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
+ cp Doc/*.pdf ../Devel/CHOLMOD
popd
-%define colamd_version 2.5
-%define colamd_version_major 2
pushd COLAMD
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
- mkdir ../Doc/COLAMD/
cp README.txt ChangeLog ../Doc/COLAMD
popd
-pushd Lib
- ln -sf libcolamd.so.%{colamd_version} libcolamd.so.%{colamd_version_major}
- ln -sf libcolamd.so.%{colamd_version} libcolamd.so
-popd
-### CXSparse is a superset of CSparse, and the two share common header
-### names, so it does not make sense to build both. CXSparse is built
-### by default, but CSparse can be built instead by defining
-### enable_csparse as 1 below.
-%define enable_csparse 0
%if "%{?enable_csparse}" == "1"
-%define csparse_version 2.0.1
-%define csparse_version_major 2
pushd CSparse
pushd Source
make CFLAGS="$RPM_OPT_FLAGS -fPIC" libcsparse.a
@@ -182,14 +161,8 @@
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
%else
-%define cxsparse_version 2.0.1
-%define cxsparse_version_major 2
pushd CXSparse
pushd Source
make CFLAGS="$RPM_OPT_FLAGS -fPIC" libcxsparse.a
@@ -200,14 +173,8 @@
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
%endif
-%define klu_version 0.9
-%define klu_version_major 0
pushd KLU
pushd Lib
make CFLAGS="$RPM_OPT_FLAGS -fPIC" libklu.a
@@ -215,34 +182,18 @@
popd
cp Lib/*.a Lib/*.so* ../Lib
cp Include/*.h ../Include
- mkdir ../Doc/KLU/
- cp README.txt Doc/lesser.txt ../Doc/KLU/
- mkdir ../Devel/KLU/
-popd
-pushd Lib
- ln -sf libklu.so.%{klu_version} libklu.so.%{klu_version_major}
- ln -sf libklu.so.%{klu_version} libklu.so
+ cp README.txt Doc/lesser.txt ../Doc/KLU
popd
-%define ldl_version 1.3
-%define ldl_version_major 1
pushd LDL
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
- mkdir ../Doc/LDL/
- cp README.txt ChangeLog lesser.txt ../Doc/LDL/
- mkdir ../Devel/LDL/
- cp *.pdf *.ps ../Devel/LDL/
-popd
-pushd Lib
- ln -sf libldl.so.%{ldl_version} libldl.so.%{ldl_version_major}
- ln -sf libldl.so.%{ldl_version} libldl.so
+ cp README.txt ChangeLog lesser.txt ../Doc/LDL
+ cp *.pdf *.ps ../Devel/LDL
popd
-%define umfpack_version 5.0
-%define umfpack_version_major 5
pushd UMFPACK
pushd Source
make CFLAGS="$RPM_OPT_FLAGS -fPIC"
@@ -250,12 +201,34 @@
popd
cp Lib/*.a Lib/*.so* ../Lib
cp Include/*.h ../Include
- mkdir ../Doc/UMFPACK
cp Doc/License Doc/ChangeLog Doc/lesser.txt README.txt ../Doc/UMFPACK
- mkdir ../Devel/UMFPACK/
- cp Doc/*.pdf ../Devel/UMFPACK/
+ cp Doc/*.pdf ../Devel/UMFPACK
popd
+
pushd Lib
+ ln -sf libamd.so.%{amd_version} libamd.so.%{amd_version_major}
+ ln -sf libamd.so.%{amd_version} libamd.so
+ ln -sf libbtf.so.%{btf_version} libbtf.so.%{btf_version_major}
+ ln -sf libbtf.so.%{btf_version} libbtf.so
+ ln -sf libcamd.so.%{camd_version} libcamd.so.%{camd_version_major}
+ ln -sf libcamd.so.%{camd_version} libcamd.so
+ ln -sf libccolamd.so.%{ccolamd_version} libccolamd.so.%{ccolamd_version_major}
+ ln -sf libccolamd.so.%{ccolamd_version} libccolamd.so
+ ln -sf libcholmod.so.%{cholmod_version} libcholmod.so.%{cholmod_version_major}
+ ln -sf libcholmod.so.%{cholmod_version} libcholmod.so
+ ln -sf libcolamd.so.%{colamd_version} libcolamd.so.%{colamd_version_major}
+ ln -sf libcolamd.so.%{colamd_version} libcolamd.so
+%if "%{?enable_csparse}" == "1"
+ ln -sf libcsparse.so.%{csparse_version} libcsparse.so.%{csparse_version_major}
+ ln -sf libcsparse.so.%{csparse_version} libcsparse.so
+%else
+ ln -sf libcxsparse.so.%{cxsparse_version} libcxsparse.so.%{cxsparse_version_major}
+ ln -sf libcxsparse.so.%{cxsparse_version} libcxsparse.so
+%endif
+ ln -sf libklu.so.%{klu_version} libklu.so.%{klu_version_major}
+ ln -sf libklu.so.%{klu_version} libklu.so
+ ln -sf libldl.so.%{ldl_version} libldl.so.%{ldl_version_major}
+ ln -sf libldl.so.%{ldl_version} libldl.so
ln -sf libumfpack.so.%{umfpack_version} libumfpack.so.%{umfpack_version_major}
ln -sf libumfpack.so.%{umfpack_version} libumfpack.so
popd
@@ -299,6 +272,10 @@
%{_libdir}/lib*.so
%changelog
+* Thu Sep 7 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.1.0-1
+- New release. Increment versions of some libraries.
+- Rearrange and clean up spec file so all definitions are in one place.
+
* Mon Aug 7 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.0.0-1
- New release.
- Build newly added CAMD library.
--- needs.rebuild DELETED ---
More information about the fedora-extras-commits
mailing list