diff --git a/superlu.changes b/superlu.changes index c422c6c..912a106 100644 --- a/superlu.changes +++ b/superlu.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Feb 14 09:16:02 UTC 2019 - Jan Engelhardt + +- Fix the package group fix. + +------------------------------------------------------------------- +Sun Feb 10 23:11:37 UTC 2019 - Egbert Eich + +- Fix dependencies. +- Fix %%post and %%postun scripts for HPC. +- Fix HPC modulefile. +- Fix package groups. +- Generate and add pkgconfig files. + ------------------------------------------------------------------- Fri Feb 8 10:50:43 UTC 2019 - eich@suse.com @@ -78,7 +92,7 @@ Tue Jan 15 21:14:51 UTC 2013 - scorot@free.fr - repackage original source tarball in order to remove the HSL mc64ad routine that caonnt be redistributed bnc#796236 -- add README.SUSE file in the %%doci in order to explain +- add README.SUSE file in the %%doci in order to explain that change ------------------------------------------------------------------- @@ -109,14 +123,14 @@ Tue Dec 18 22:21:27 UTC 2012 - scorot@free.fr for both superlu & superlu_dist. * Replace qsort by "quick select" (qselect) in ILU's secondary dropping. - * Replace mc64ad.f by mc64ad.c using f2c. + * Replace mc64ad.f by mc64ad.c using f2c. * Bug fixes in ilu_sdrop_row.c. * Bug fixes in xgsisx.c, so that when mc64 permutation is used in ILU, the right-hand side is permuted properly. * Add parameter #7 in sp_ienv(), setting as the maxsuper for ILU code (smaller than parameter #3). * Update Users Guide. - * Update doxygen code documentation. + * Update doxygen code documentation. * Fix a bug in ILU driver routine dgsisx.c, so that on return, the initial row permutation is combined with perm_r[] from partial pivoting. @@ -136,7 +150,7 @@ Tue Dec 18 22:21:27 UTC 2012 - scorot@free.fr - Add %%ckeck - Update documentation file %%source1 and put html and examples files in %%doc -- Spec file reformating +- Spec file reformating ------------------------------------------------------------------- Sun Jan 29 01:48:27 UTC 2012 - jengelh@medozas.de @@ -147,7 +161,7 @@ Sun Jan 29 01:48:27 UTC 2012 - jengelh@medozas.de ------------------------------------------------------------------- Thu Jun 22 18:18:46 CEST 2006 - ro@suse.de -- remove selfprovides +- remove selfprovides ------------------------------------------------------------------- Mon Mar 27 02:23:29 CEST 2006 - garloff@suse.de @@ -176,15 +190,15 @@ Wed Dec 21 13:33:20 CET 2005 - garloff@suse.de Wed Dec 21 02:17:35 CET 2005 - garloff@suse.de - Update to SuperLU-3.0: [#133821] - * Added "options" input argument and "stat" output argument + * Added "options" input argument and "stat" output argument for the driver routines * More Examples * Added a "symmetric mode" for (nearly) symmetric matrices * Better Fortran interface. - * fixed a bug in the complex drivers sgssvx/zgssvx when the + * fixed a bug in the complex drivers sgssvx/zgssvx when the input matrix is stored in compressed row format. - * prefixed the header files by "slu_". - * Fixed a memory leak in get_perm_c() when bnz=0. + * prefixed the header files by "slu_". + * Fixed a memory leak in get_perm_c() when bnz=0. * Changed "abs" to "fabs" in izmax1. * Upgraded COLAMD to the latest version (2.3).15 - Add various declarations and #include statements @@ -194,12 +208,12 @@ Wed Dec 21 02:17:35 CET 2005 - garloff@suse.de ------------------------------------------------------------------- Fri Nov 25 14:20:00 CET 2005 - yxu@suse.de -- add missing function prototypes +- add missing function prototypes ------------------------------------------------------------------- Tue Nov 15 13:42:23 CET 2005 - dmueller@suse.de -- avoid an endless loop during building (#133820) +- avoid an endless loop during building (#133820) ------------------------------------------------------------------- Mon May 9 17:24:12 CEST 2005 - meissner@suse.de @@ -209,7 +223,7 @@ Mon May 9 17:24:12 CEST 2005 - meissner@suse.de ------------------------------------------------------------------- Mon Dec 20 02:58:44 CET 2004 - garloff@suse.de -- Pass $(RPM_OPT_FLAGS) -Os -fPIC for files that don't need to be +- Pass $(RPM_OPT_FLAGS) -Os -fPIC for files that don't need to be optimized. ------------------------------------------------------------------- @@ -280,7 +294,7 @@ Fri Apr 19 20:17:23 MEST 2002 - garloff@suse.de ------------------------------------------------------------------- Wed Apr 10 01:49:54 CEST 2002 - ro@suse.de -- fix owner for README.SuperLU +- fix owner for README.SuperLU ------------------------------------------------------------------- Mon Aug 7 22:12:27 CEST 2000 - garloff@suse.de @@ -301,4 +315,3 @@ Mon Sep 13 17:23:57 CEST 1999 - bs@suse.de Wed Sep 1 00:21:25 CEST 1999 - garloff@suse.de - First creation of package. - diff --git a/superlu.spec b/superlu.spec index 9d45282..ba5c9b5 100644 --- a/superlu.spec +++ b/superlu.spec @@ -50,18 +50,20 @@ ExclusiveArch: do_not_build %define p_includedir %_includedir %define p_libdir %_libdir %define _sover 5 +%define libname lib%{name}%{?_sover} %else %{hpc_init -c %compiler_family %{?c_f_ver:-v %{c_f_ver}} %{?ext:-e %{ext}}} %define package_name %{hpc_package_name %_ver} %define p_prefix %hpc_prefix %define p_includedir %hpc_includedir %define p_libdir %hpc_libdir +%define libname lib%{name} %endif Name: %{package_name} Summary: A general purpose library for the direct solution of linear equations License: BSD-3-Clause -Group: Development/Libraries/C and C++ +Group: Productivity/Scientific/Math Version: %{ver} Release: 0 Source: http://crd-legacy.lbl.gov/%7Exiaoye/SuperLU/%{pname}_%{version}.tar.gz @@ -73,7 +75,7 @@ Patch0: superlu-5.2-make.patch Patch1: superlu-4.3-include.patch # PATCH-FIX-UPSTREAM superlu-4.3-dont-opt-away.diff Patch2: superlu-4.3-dont-opt-away.diff -# PATCH-FIX-OPENSUSE superlu-5.2-remove-mc64ad.patch [bnc#796236] +# PATCH-FIX-OPENSUSE superlu-5.2-remove-mc64ad.patch [bnc#796236] # The Harwell Subroutine Library (HSL) routine mc64ad.c have been removed # from the original sources for legal reasons. This patch disables the inclusion of # this routine in the library which, however, remains fully functional @@ -92,8 +94,6 @@ Requires: %{compiler_family}%{?c_f_ver}-compilers-hpc BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel BuildRequires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel BuildRequires: suse-hpc >= 0.3 -%hpc_requires -%hpc_requires_devel %endif %description @@ -103,18 +103,27 @@ decomposition of sparse matrices. Documentation can be found in the %{name}-doc package or on http://www.netlib.org. -%package -n lib%{name}%{?_sover} +%package -n %libname Summary: SuperLU matrix solver Group: System/Libraries +%if %{with hpc} +Requires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc +Requires: lua-lmod >= 7.6.1 +%hpc_requires +%endif -%description -n lib%{name}%{?_sover} +%description -n %libname SuperLU is an algorithm that uses group theory to optimize LU decomposition of sparse matrices. %package devel Summary: Headers and development library for lib%{name}%{?_sover} Group: Development/Libraries/C and C++ -Requires: lib%{name}%{?_sover} = %version +Requires: %libname = %version +%if %{with hpc} +Requires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel +%hpc_requires_devel +%endif Recommends: %name-doc %description devel @@ -191,6 +200,8 @@ cp FORTRAN/README README.fortran %fdupes -s examples %if %{with hpc} +%{hpc_write_pkgconfig} + # TODO: is there any path to add for Matlab files? %hpc_write_modules_files #%Module1.0##################################################################### @@ -210,42 +221,49 @@ puts stderr "\nVersion %{version}\n" module-whatis "Name: %{pname} built with %{compiler_family} compiler" module-whatis "Version: %{version}" module-whatis "Category: runtime library" +module-whatis "Description: %{SUMMARY}" module-whatis "%{url}" set version %{version} depends-on openblas +if {[file isdirectory %{hpc_includedir}]} { prepend-path INCLUDE %{hpc_includedir} +} prepend-path LD_LIBRARY_PATH %{hpc_libdir} setenv %{hpc_PNAME %pname}_DIR %{hpc_prefix} +if {[file isdirectory %{hpc_includedir}]} { setenv %{hpc_PNAME %pname}_INC %{hpc_includedir} +%hpc_modulefile_add_pkgconfig_path +} setenv %{hpc_PNAME %pname}_LIB %{hpc_libdir} EOF %endif %if %{without hpc} -%post -n lib%{name}%{?_sover} -p /sbin/ldconfig -%postun -n lib%{name}%{?_sover} -p /sbin/ldconfig +%post -n %libname -p /sbin/ldconfig +%postun -n %libname -p /sbin/ldconfig %else -%post -n lib%{name}%{?_sover} +%post -n %libname /sbin/ldconfig -N %hpc_libdir -%postun -n lib%{name}%{?_sover} +%postun -n %libname /sbin/ldconfig -N %hpc_libdir %hpc_module_delete_if_default %endif -%files -n lib%{name}%{?_sover} +%files -n %libname %doc README MATLAB README.SUSE -%{?hpc_dirs} -%{?hpc_modules_files} +%{?with_hpc:%hpc_dirs} +%{?with_hpc:%hpc_modules_files} %{p_libdir}/*.so.* %files devel %doc README.fortran +%{?with_hpc:%{hpc_pkgconfig_file}} %{p_includedir}/%{!?with_hpc:*} %{p_libdir}/*.so