Author: qboosh Date: Tue Jun 26 18:38:02 2012 GMT Module: packages Tag: HEAD ---- Log message: - updated to 4.0.0; UFconfig is now known as SuiteSparse_config (no Obsoletes though: both packages can coexist)
---- Files affected: packages/SuiteSparse_config: SuiteSparse_config-config.patch (1.7 -> 1.8) , SuiteSparse_config-shared.patch (1.1 -> 1.2) , SuiteSparse_config.spec (1.12 -> 1.13) ---- Diffs: ================================================================ Index: packages/SuiteSparse_config/SuiteSparse_config-config.patch diff -u packages/SuiteSparse_config/SuiteSparse_config-config.patch:1.7 packages/SuiteSparse_config/SuiteSparse_config-config.patch:1.8 --- packages/SuiteSparse_config/SuiteSparse_config-config.patch:1.7 Mon Jan 9 17:01:33 2012 +++ packages/SuiteSparse_config/SuiteSparse_config-config.patch Tue Jun 26 20:37:57 2012 @@ -1,15 +1,15 @@ ---- UFconfig/UFconfig.mk.orig 2011-12-08 20:19:48.000000000 +0100 -+++ UFconfig/UFconfig.mk 2012-01-09 16:20:56.743005449 +0100 -@@ -53,7 +53,7 @@ - # default make environment. - +--- SuiteSparse_config/SuiteSparse_config.mk.orig 2012-06-01 21:25:05.000000000 +0200 ++++ SuiteSparse_config/SuiteSparse_config.mk 2012-06-26 19:19:18.178725712 +0200 +@@ -60,7 +60,7 @@ # C and C++ compiler flags. The first three are standard for *.c and *.cpp --CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC + # Add -DNTIMER if you do use any timing routines (otherwise -lrt is required). + # CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC -DNTIMER +- CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC +CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -fPIC # ranlib, and ar, for generating libraries. If you don't need ranlib, # just change it to RANLAB = echo -@@ -67,15 +67,16 @@ +@@ -73,7 +73,7 @@ # Fortran compiler (not required for 'make' or 'make library') F77 = gfortran @@ -17,8 +17,9 @@ +F77FLAGS = $(FFLAGS) F77LIB = - # C and Fortran libraries - LIB = -lm + # C and Fortran libraries. Remove -lrt if you don't have it. +@@ -82,8 +82,9 @@ + # LIB = -lm # For "make install" -INSTALL_LIB = /usr/local/lib @@ -27,9 +28,9 @@ +INSTALL_LIB = $(INSTALL_PREFIX)/lib +INSTALL_INCLUDE = $(INSTALL_PREFIX)/include - # For compiling MATLAB mexFunctions (MATLAB 7.5 or later) - MEX = mex -O -largeArrayDims -lmwlapack -lmwblas -@@ -148,8 +149,8 @@ + # Which version of MAKE you are using (default is "make") + # MAKE = make +@@ -162,8 +163,8 @@ # The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, etc. # You may wish to use an absolute path. METIS is optional. Compile # CHOLMOD with -DNPARTITION if you do not wish to use METIS. ================================================================ Index: packages/SuiteSparse_config/SuiteSparse_config-shared.patch diff -u packages/SuiteSparse_config/SuiteSparse_config-shared.patch:1.1 packages/SuiteSparse_config/SuiteSparse_config-shared.patch:1.2 --- packages/SuiteSparse_config/SuiteSparse_config-shared.patch:1.1 Mon Jan 9 17:01:33 2012 +++ packages/SuiteSparse_config/SuiteSparse_config-shared.patch Tue Jun 26 20:37:57 2012 @@ -1,43 +1,46 @@ ---- UFconfig/Makefile.orig 2011-12-14 19:09:00.000000000 +0100 -+++ UFconfig/Makefile 2012-01-09 16:45:18.549721061 +0100 -@@ -8,15 +8,13 @@ - - include UFconfig.mk - --ccode: libufconfig.a -+ccode: libufconfig.la - --all: libufconfig.a -+all: libufconfig.la - --libufconfig.a: UFconfig.c UFconfig.h -- $(CC) $(CF) -c UFconfig.c -- $(ARCHIVE) libufconfig.a UFconfig.o -- $(RANLIB) libufconfig.a -- - $(RM) UFconfig.o -+libufconfig.la: UFconfig.c UFconfig.h -+ libtool --mode=compile --tag=CC $(CC) $(CF) -c UFconfig.c -+ libtool --mode=link --tag=CC $(CC) $(LDFLAGS) $(CFLAGS) -o libufconfig.la UFconfig.lo -rpath $(INSTALL_LIB) +--- SuiteSparse_config/Makefile.orig 2012-05-27 00:53:19.000000000 +0200 ++++ SuiteSparse_config/Makefile 2012-06-26 19:54:44.061969831 +0200 +@@ -8,17 +8,15 @@ + + include SuiteSparse_config.mk + +-ccode: libsuitesparseconfig.a ++ccode: libsuitesparseconfig.la + +-all: libsuitesparseconfig.a ++all: libsuitesparseconfig.la + +-library: libsuitesparseconfig.a ++library: libsuitesparseconfig.la + +-libsuitesparseconfig.a: SuiteSparse_config.c SuiteSparse_config.h +- $(CC) $(CF) -c SuiteSparse_config.c +- $(ARCHIVE) libsuitesparseconfig.a SuiteSparse_config.o +- $(RANLIB) libsuitesparseconfig.a +- - $(RM) SuiteSparse_config.o ++libsuitesparseconfig.la: SuiteSparse_config.c SuiteSparse_config.h ++ libtool --mode=compile --tag=CC $(CC) $(CF) -c SuiteSparse_config.c ++ libtool --mode=link --tag=CC $(CC) $(LDFLAGS) $(CFLAGS) -o libsuitesparseconfig.la SuiteSparse_config.lo -lrt -rpath $(INSTALL_LIB) distclean: purge -@@ -28,14 +26,12 @@ +@@ -30,14 +28,12 @@ - # install UFconfig + # install SuiteSparse_config install: -- $(CP) libufconfig.a $(INSTALL_LIB)/libufconfig.$(VERSION).a -- ( cd $(INSTALL_LIB) ; ln -sf libufconfig.$(VERSION).a libufconfig.a ) -- $(CP) UFconfig.h $(INSTALL_INCLUDE) -- chmod 644 $(INSTALL_LIB)/libufconfig*.a -- chmod 644 $(INSTALL_INCLUDE)/UFconfig.h -+ libtool --mode=install $(CP) libufconfig.la $(DESTDIR)$(INSTALL_LIB) -+ $(CP) UFconfig.h $(DESTDIR)$(INSTALL_INCLUDE) -+ chmod 644 $(DESTDIR)$(INSTALL_INCLUDE)/UFconfig.h +- $(CP) libsuitesparseconfig.a $(INSTALL_LIB)/libsuitesparseconfig.$(VERSION).a +- ( cd $(INSTALL_LIB) ; ln -sf libsuitesparseconfig.$(VERSION).a libsuitesparseconfig.a ) +- $(CP) SuiteSparse_config.h $(INSTALL_INCLUDE) +- chmod 644 $(INSTALL_LIB)/libsuitesparseconfig*.a +- chmod 644 $(INSTALL_INCLUDE)/SuiteSparse_config.h ++ libtool --mode=install $(CP) libsuitesparseconfig.la $(DESTDIR)$(INSTALL_LIB) ++ $(CP) SuiteSparse_config.h $(DESTDIR)$(INSTALL_INCLUDE) ++ chmod 644 $(DESTDIR)$(INSTALL_INCLUDE)/SuiteSparse_config.h - # uninstall UFconfig + # uninstall SuiteSparse_config uninstall: -- $(RM) $(INSTALL_LIB)/libufconfig*.a -- $(RM) $(INSTALL_INCLUDE)/UFconfig.h -+ $(RM) $(DESTDIR)$(INSTALL_LIB)/libufconfig.la $(DESTDIR)$(INSTALL_LIB)/libufconfig.so* $(DESTDIR)$(INSTALL_LIB)/libufconfig.a -+ $(RM) $(DESTDIR)$(INSTALL_INCLUDE)/UFconfig.h +- $(RM) $(INSTALL_LIB)/libsuitesparseconfig*.a +- $(RM) $(INSTALL_INCLUDE)/SuiteSparse_config.h ++ $(RM) $(DESTDIR)$(INSTALL_LIB)/libsuitesparseconfig.la ++ $(RM) $(DESTDIR)$(INSTALL_INCLUDE)/SuiteSparse_config.h ================================================================ Index: packages/SuiteSparse_config/SuiteSparse_config.spec diff -u packages/SuiteSparse_config/SuiteSparse_config.spec:1.12 packages/SuiteSparse_config/SuiteSparse_config.spec:1.13 --- packages/SuiteSparse_config/SuiteSparse_config.spec:1.12 Fri May 25 15:06:10 2012 +++ packages/SuiteSparse_config/SuiteSparse_config.spec Tue Jun 26 20:37:57 2012 @@ -1,62 +1,66 @@ # $Revision$, $Date$ -Summary: UFconfig development files -Summary(pl.UTF-8): Pliki programistyczne UFconfig -Name: UFconfig -Version: 3.7.1 +Summary: SuiteSparse_config development files +Summary(pl.UTF-8): Pliki programistyczne SuiteSparse_config +Name: SuiteSparse_config +Version: 4.0.0 Release: 1 License: no restrictions Group: Development Source0: http://www.cise.ufl.edu/research/sparse/UFconfig/%{name}-%{version}.tar.gz -# Source0-md5: 145b8126b7ee957d1ea6b401be0bf798 +# Source0-md5: 05ea5b1e08b590bbd51f103584ff243d Patch0: %{name}-config.patch Patch1: %{name}-shared.patch URL: http://www.cise.ufl.edu/research/sparse/UFconfig/ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -UFconfig is required by nearly all sparse matrix packages that are -authored by Timothy A. Davis. +SuiteSparse_config is required by nearly all sparse matrix packages +that are authored by Timothy A. Davis. + +Before version 4, SuiteSparse_config used to be named UFconfig. %description -l pl.UTF-8 -UFconfig jest wymagany przez prawie wszystkie pakiety do obliczeń na -macierzach rzadkich autorstwa Timothy'ego A. Davisa. +SuiteSparse_config jest wymagany przez prawie wszystkie pakiety do +obliczeń na macierzach rzadkich autorstwa Timothy'ego A. Davisa. + +SuiteSparse_concig przed wersją 4 nazywał się UFconfig. %package libs -Summary: UFconfig shared library -Summary(pl.UTF-8): Biblioteka współdzielona UFconfig +Summary: SuiteSparse_config shared library +Summary(pl.UTF-8): Biblioteka współdzielona SuiteSparse_config Group: Libraries %description libs -UFconfig shared library, containing malloc/free wrappers. +SuiteSparse_config shared library, containing malloc/free wrappers. %description libs -l pl.UTF-8 -Biblioteka współdzielona UFconfig, zawierająca funkcje obudowujące -malloc/free. +Biblioteka współdzielona SuiteSparse_config, zawierająca funkcje +obudowujące malloc/free. %package devel -Summary: Development files for UFconfig library -Summary(pl.UTF-8): Pliki programistyczne biblioteki UFconfig +Summary: Development files for SuiteSparse_config library +Summary(pl.UTF-8): Pliki programistyczne biblioteki SuiteSparse_config Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release} %description devel -Development files for UFconfig library. +Development files for SuiteSparse_config library. %description devel -l pl.UTF-8 -Pliki programistyczne biblioteki UFconfig. +Pliki programistyczne biblioteki SuiteSparse_config. %package static -Summary: UFconfig static library -Summary(pl.UTF-8): Biblioteka statyczna UFconfig +Summary: SuiteSparse_config static library +Summary(pl.UTF-8): Biblioteka statyczna SuiteSparse_config Group: Libraries Requires: %{name}-devel = %{version}-%{release} %description static -UFconfig static library. +SuiteSparse_config static library. %description static -l pl.UTF-8 -Biblioteka statyczna UFconfig. +Biblioteka statyczna SuiteSparse_config. %prep %setup -q -n %{name} @@ -78,7 +82,7 @@ DESTDIR=$RPM_BUILD_ROOT \ INSTALL_LIB=%{_libdir} -cp -a UFconfig.mk $RPM_BUILD_ROOT%{_datadir}/misc +cp -a SuiteSparse_config.mk $RPM_BUILD_ROOT%{_datadir}/misc %clean rm -rf $RPM_BUILD_ROOT @@ -89,22 +93,22 @@ %files %defattr(644,root,root,755) %doc README.txt -%{_includedir}/UFconfig.h -%{_datadir}/misc/UFconfig.mk +%{_includedir}/SuiteSparse_config.h +%{_datadir}/misc/SuiteSparse_config.mk %files libs %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libufconfig.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libufconfig.so.0 +%attr(755,root,root) %{_libdir}/libsuitesparseconfig.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libsuitesparseconfig.so.0 %files devel %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libufconfig.so -%{_libdir}/libufconfig.la +%attr(755,root,root) %{_libdir}/libsuitesparseconfig.so +%{_libdir}/libsuitesparseconfig.la %files static %defattr(644,root,root,755) -%{_libdir}/libufconfig.a +%{_libdir}/libsuitesparseconfig.a %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -112,6 +116,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.13 2012/06/26 18:37:57 qboosh +- updated to 4.0.0; UFconfig is now known as SuiteSparse_config (no Obsoletes though: both packages can coexist) + Revision 1.12 2012/05/25 13:06:10 qboosh - updated to 3.7.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/SuiteSparse_config/SuiteSparse_config-config.patch?r1=1.7&r2=1.8 http://cvs.pld-linux.org/packages/SuiteSparse_config/SuiteSparse_config-shared.patch?r1=1.1&r2=1.2 http://cvs.pld-linux.org/packages/SuiteSparse_config/SuiteSparse_config.spec?r1=1.12&r2=1.13 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
