Accepting request 541150 from home:eeich:hpc_alt

- Fix HPC library requires package and modules file.

OBS-URL: https://build.opensuse.org/request/show/541150
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/fftw3?expand=0&rev=54
This commit is contained in:
Takashi Iwai 2017-11-13 14:03:03 +00:00 committed by Git OBS Bridge
parent bd2a5465d8
commit 3e314d15eb
2 changed files with 10 additions and 4 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Nov 12 16:25:33 UTC 2017 - eich@suse.com
- Fix HPC library requires package and modules file.
-------------------------------------------------------------------
Tue Nov 7 11:33:09 UTC 2017 - eich@suse.com

View File

@ -122,7 +122,6 @@ BuildRequires: lua-lmod
BuildRequires: suse-hpc
%if %{with mpi}
BuildRequires: %{mpi_flavor}%{?mpi_vers}-%{compiler_family}%{?c_f_ver}-hpc-macros-devel
Requires: %{mpi_flavor}_%{?mpi_ver}-%{compiler_family}%{?c_f_ver}-hpc
%endif
%else
BuildRequires: gcc-c++
@ -172,6 +171,8 @@ Summary: Discrete Fourier Transform (DFT) C Subroutine Library
Group: System/Libraries
Provides: fftw3 = %{version}-%{release}
Obsoletes: fftw3 < 3.3
Requires: lua-lmod
%{?with_hpc:%hpc_requires}
%description -n %package_libname
FFTW is a C subroutine library for computing the Discrete Fourier
@ -394,10 +395,10 @@ set version %{version}
prepend-path PATH %{hpc_bindir}
prepend-path MANPATH %{hpc_mandir}
prepend-path INCLUDE %{hpc_includedir}
prepend-path LD_LIBRARY_PATH %{hpc_libdir}
prepend-path MODULEPATH %{hpc_modulepath}/%pname
setenv %{BNAME}_DIR %{hpc_path}
setenv %{BNAME}_DIR %{hpc_libdir}
setenv %{BNAME}_DIR %{hpc_prefix}
setenv %{BNAME}_LIB %{hpc_libdir}
setenv %{BNAME}_INC %{hpc_includedir}
if ([file isdirectory %{hpc_includedir}]) {
# should work also for fortran