Accepting request 674942 from science

- Fix the package group fix.

- Fix dependencies.
- Fix %%post and %%postun scripts for HPC.
- Fix HPC modulefile.
- Fix package groups.
- Generate and add pkgconfig files.

- add README.SUSE file in the %%doci in order to explain
  * Replace mc64ad.f by mc64ad.c using f2c.
  * Update doxygen code documentation.
- Spec file reformating
- remove selfprovides
  * Added "options" input argument and "stat" output argument
  * fixed a bug in the complex drivers sgssvx/zgssvx when the
  * prefixed the header files by "slu_".
  * Fixed a memory leak in get_perm_c() when bnz=0.
- add missing function prototypes
- avoid an endless loop during building (#133820)
- Pass $(RPM_OPT_FLAGS) -Os -fPIC for files that don't need to be
- fix owner for README.SuperLU

OBS-URL: https://build.opensuse.org/request/show/674942
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/superlu?expand=0&rev=22
This commit is contained in:
Stephan Kulow 2019-02-25 16:45:42 +00:00 committed by Git OBS Bridge
commit 5eb0a372fe
2 changed files with 59 additions and 28 deletions

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Thu Feb 14 09:16:02 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- Fix the package group fix.
-------------------------------------------------------------------
Sun Feb 10 23:11:37 UTC 2019 - Egbert Eich <eich@suse.com>
- 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
@ -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.

View File

@ -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
@ -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