pool/hdf5
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Only build one example package for all flavors, do not

Browse Source 
include dependencies as these would be flavor specific
  (bsc#1088547).

OBS-URL: https://build.opensuse.org/package/show/science/hdf5?expand=0&rev=73
This commit is contained in:
Egbert Eich 2018-04-07 22:33:46 +00:00 committed by Git OBS Bridge
parent 1645debc18
commit 500a1619cf
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hdf5.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sat Apr 7 22:31:05 UTC 2018 - eich@suse.com
- Only build one example package for all flavors, do not
include dependencies as these would be flavor specific
(bsc#1088547).
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Mar 31 23:53:50 UTC 2018 - stefan.bruens@rwth-aachen.de Sat Mar 31 23:53:50 UTC 2018 - stefan.bruens@rwth-aachen.de

18
hdf5.spec
View File

@ -412,12 +412,6 @@ This package provides the static libraries for the %{flavor} version of HDF5.
%package -n %{pname}-examples %package -n %{pname}-examples
Summary: Examples for %{name} Summary: Examples for %{name}
Group: Documentation/Other Group: Documentation/Other
Requires: %{libname -l _cpp -s %{sonum_CXX}} = %{version}
Requires: %{libname -l _fortran -s %{sonum_F}} = %{version}
Requires: %{libname -l _hl -s %{sonum_HL}} = %{version}
Requires: %{libname -l _hl_cpp -s %{sonum_HL_CXX}} = %{version}
Requires: %{libname -l hl_fortran -s %{sonum_HL_F}} = %{version}
Requires: %{libname -s %{sonum}} = %{version}
%description -n %{pname}-examples %description -n %{pname}-examples
HDF5 is a data model, library, and file format for storing and HDF5 is a data model, library, and file format for storing and
@ -560,11 +554,9 @@ make install DESTDIR=%{buildroot}
find %{buildroot} -type f -name "*.la" -delete -print find %{buildroot} -type f -name "*.la" -delete -print
%if %{without mpi} %if %{without mpi} && %{without hpc}
find %{buildroot}%{_datadir}/hdf5_examples -type f \ find %{buildroot}%{_datadir}/hdf5_examples -type f \
| grep -v ".sh$" | xargs chmod 644 | grep -v ".sh$" | xargs chmod 644
%if %{without hpc}
# rpm macro for version checking # rpm macro for version checking
mkdir -p %{buildroot}%{_sysconfdir}/rpm mkdir -p %{buildroot}%{_sysconfdir}/rpm
cat > %{buildroot}%{_sysconfdir}/rpm/macros.hdf5 <<EOF cat > %{buildroot}%{_sysconfdir}/rpm/macros.hdf5 <<EOF
@ -574,7 +566,6 @@ cat > %{buildroot}%{_sysconfdir}/rpm/macros.hdf5 <<EOF
%_hdf5_sonum %{sonum} %_hdf5_sonum %{sonum}
%_hdf5_version %{version} %_hdf5_version %{version}
EOF EOF
%endif
%else %else
# delete examples from parallel builds # delete examples from parallel builds
rm -rf %{buildroot}%{_datadir}/hdf5_examples rm -rf %{buildroot}%{_datadir}/hdf5_examples
@ -675,18 +666,15 @@ export HDF5_Make_Ignore=yes
%hpc_module_delete_if_default %hpc_module_delete_if_default
%endif %endif
%if %{without mpi} %if %{without mpi} && %{without hpc}
%files -n %{pname}-examples %files -n %{pname}-examples
%defattr(-,root,root) %defattr(-,root,root)
%{_datadir}/hdf5_examples %{_datadir}/hdf5_examples
%if 0%{without hpc}
%files -n %{pname}-devel-data %files -n %{pname}-devel-data
%defattr(-,root,root,-) %defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/rpm/macros.hdf5 %config(noreplace) %{_sysconfdir}/rpm/macros.hdf5
%endif %endif
%endif # flavor == serial
%files -n %{name} %files -n %{name}
%defattr(-,root,root) %defattr(-,root,root)