Accepting request 536948 from home:eeich:hpc_alt

- Fix name: baselib.conf -> baselibs.conf

OBS-URL: https://build.opensuse.org/request/show/536948
OBS-URL: https://build.opensuse.org/package/show/science/hdf5?expand=0&rev=53
This commit is contained in:
2017-10-26 18:03:03 +00:00
committed by Git OBS Bridge
parent 30dc1e2e57
commit f89d69864a
2 changed files with 30 additions and 22 deletions

View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Oct 26 15:51:18 UTC 2017 - eich@suse.com
- Fix name: baselib.conf -> baselibs.conf
-------------------------------------------------------------------
Sun Oct 22 08:46:29 UTC 2017 - eich@suse.com

View File

@@ -569,6 +569,30 @@ library packages.
%patch7 -p1
%patch8 -p1
%if %{without hpc}
# baselibs looks different for different flavors - generate it on the fly
cat > %{_sourcedir}/baselibs.conf <<EOF
libhdf5-%{sonum}%{?my_suffix}
libhdf5_hl%{sonum_HL}%{?my_suffix}
libhdf5_fortran%{sonum_HL_F}%{?my_suffix}
libhdf5hl_fortran%{sonum_HL_F}%{?my_suffix}
%if %{without mpi}
libhdf5_cpp%{sonum_CXX}%{?my_suffix}
libhdf5_hl_cpp%{sonum_HL_CXX}%{?my_suffix}
%endif
hdf5%{?my_suffix}-devel
requires %{?my_suffix}-<targettype>
requires "libhdf5-%{sonum}%{?my_suffix}-<targettype> = <version>"
requires "libhdf5_hl%{sonum_HL}%{?my_suffix}-<targettype> = <version>"
requires "libhdf5_fortran%{sonum_HL_F}%{?my_suffix}-<targettype> = <version>"
requires "libhdf5hl_fortran%{sonum_HL_F}%{?my_suffix}-<targettype> = <version>"
%if %{without mpi}
requires "libhdf5_cpp%{sonum_CXX}%{?my_suffix}-<targettype> = <version>"
requires "libhdf5_hl_cpp%{sonum_HL_CXX}%{?my_suffix}-<targettype> = <version>"
%endif
EOF
%endif
%build
%{?with_hpc:%hpc_setup}
@@ -676,28 +700,7 @@ rm -rf %{buildroot}%{_datadir}/hdf5_examples
%fdupes -s %{buildroot}/%{_datadir}
%endif
%if %{without hpc}
# baselib looks different for different flavors - generate it on the fly
cat > %{_sourcedir}/baselib.conf <<EOF
libhdf5-%{sonum}%{?my_suffix}
libhdf5_hl%{sonum_HL}%{?my_suffix}
libhdf5_fortran%{sonum_HL_F}%{?my_suffix}
libhdf5hl_fortran%{sonum_HL_F}%{?my_suffix}
%if %{without mpi}
libhdf5_cpp%{sonum_CXX}%{?my_suffix}
libhdf5_hl_cpp%{sonum_HL_CXX}%{?my_suffix}
%endif
hdf5%{?my_suffix}-devel
requires %{?my_suffix}-<targettype>
requires "libhdf5-%{sonum}%{?my_suffix}-<targettype> = <version>"
requires "libhdf5_hl%{sonum_HL}%{?my_suffix}-<targettype> = <version>"
requires "libhdf5_fortran%{sonum_HL_F}%{?my_suffix}-<targettype> = <version>"
%if %{without mpi}
requires "libhdf5_cpp%{sonum_CXX}%{?my_suffix}-<targettype> = <version>"
requires "libhdf5_hl_cpp%{sonum_HL_CXX}%{?my_suffix}-<targettype> = <version>"
%endif
EOF
%else
%if %{with hpc}
%{hpc_write_pkgconfig -n hdf5 -l libhdf5}
%{hpc_write_pkgconfig -n hdf5_hl -l libhdf5_hl}
%{hpc_write_pkgconfig -n hdf5_fortran -l libhdf5_fortran}