Hello community, here is the log from the commit of package hdf5 for openSUSE:Factory checked in at 2018-06-25 11:38:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hdf5 (Old) and /work/SRC/openSUSE:Factory/.hdf5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hdf5" Mon Jun 25 11:38:45 2018 rev:46 rq:618379 version:1.10.1 Changes: -------- --- /work/SRC/openSUSE:Factory/hdf5/hdf5.changes 2018-04-30 22:58:26.377553743 +0200 +++ /work/SRC/openSUSE:Factory/.hdf5.new/hdf5.changes 2018-06-25 11:38:53.521251619 +0200 @@ -1,0 +2,7 @@ +Tue Jun 19 06:15:06 UTC 2018 - [email protected] + +- Handle license file using %license where applicable. +- Package example package also for HPC build and create + a master file for it. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hdf5.spec ++++++ --- /var/tmp/diff_new_pack.sF6mHo/_old 2018-06-25 11:38:56.545140001 +0200 +++ /var/tmp/diff_new_pack.sF6mHo/_new 2018-06-25 11:38:56.549139853 +0200 @@ -171,6 +171,7 @@ %define my_incdir %hpc_includedir %define package_name %{hpc_package_name %_vers} %define libname(l:s:) lib%{pname}%{-l*}%{hpc_package_name_tail %{?_vers}} + %define vname %{pname}_%{_vers}-hpc %else %if %{without mpi} %define my_prefix %_prefix @@ -187,6 +188,7 @@ %define package_name %pname%{?my_suffix} %endif %define libname(l:s:) lib%{pname}%{!-l:%{-s:-}}%{-l*}%{-s*}%{?my_suffix} + %define vname %{pname} %endif # TODO: The so numbers autodetected by update_so_version.sh @@ -241,7 +243,7 @@ %hpc_requires BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel BuildRequires: lua-lmod -BuildRequires: suse-hpc +BuildRequires: suse-hpc >= 0.2 %if %{with mpi} BuildRequires: %{mpi_flavor}%{?mpi_vers}-%{compiler_family}%{?c_f_ver}-hpc-macros-devel %endif @@ -409,16 +411,18 @@ This package provides the static libraries for the %{flavor} version of HDF5. -%package -n %{pname}-examples +%package -n %{vname}-examples Summary: Examples for %{name} Group: Documentation/Other -%description -n %{pname}-examples +%description -n %{vname}-examples HDF5 is a data model, library, and file format for storing and managing data. It supports an unlimited variety of datatypes. This package provides examples of HDF5 library use. +%{?!with_mpi:%{?with_hpc:%{hpc_master_package -n %{pname}-hpc-examples -M %{vname}-examples}}} + %if %{with hpc} %package module Summary: Module files for %{name} @@ -551,12 +555,19 @@ %{?with_hpc:%hpc_debug} make install DESTDIR=%{buildroot} - find %{buildroot} -type f -name "*.la" -delete -print -%if %{without mpi} && %{without hpc} -find %{buildroot}%{_datadir}/hdf5_examples -type f \ +%if %{without mpi} +find %{buildroot}%{_prefix}/share/hdf5_examples -type f \ | grep -v ".sh$" | xargs chmod 644 +%if %{with hpc} +# copy to versioned subdir +install -m 755 -d %{buildroot}%{_prefix}/share/%{version} +mv %{buildroot}%{_prefix}/share/hdf5_examples/* \ + %{buildroot}%{_prefix}/share/%{version} +mv %{buildroot}%{_prefix}/share/%{version} \ + %{buildroot}%{_prefix}/share/hdf5_examples +%else # rpm macro for version checking mkdir -p %{buildroot}%{_sysconfdir}/rpm cat > %{buildroot}%{_sysconfdir}/rpm/macros.hdf5 <<EOF @@ -566,9 +577,10 @@ %_hdf5_sonum %{sonum} %_hdf5_version %{version} EOF +%endif %else # delete examples from parallel builds -rm -rf %{buildroot}%{_datadir}/hdf5_examples +rm -rf %{buildroot}%{_prefix}/share/hdf5_examples %endif %if 0%{?suse_version} >= 1110 @@ -666,15 +678,24 @@ %hpc_module_delete_if_default %endif -%if %{without mpi} && %{without hpc} -%files -n %{pname}-examples +%if 0%{?sle_version} > 120200 || 0%{?suse_version} > 1320 +%define mylicense %license +%else +%define mylicense %doc +%endif + +%if %{without mpi} +%files -n %{vname}-examples %defattr(-,root,root) -%{_datadir}/hdf5_examples +%{?with_hpc:%dir %{_prefix}/share/hdf5_examples} +%{_prefix}/share/hdf5_examples%{?with_hpc:/%{version}} +%if %{without hpc} %files -n %{pname}-devel-data %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/rpm/macros.hdf5 %endif +%endif %files -n %{name} %defattr(-,root,root) @@ -705,7 +726,8 @@ %files -n %{libname -s %{sonum}} %defattr(-,root,root) -%doc COPYING ACKNOWLEDGMENTS README.txt +%doc ACKNOWLEDGMENTS README.txt +%mylicense COPYING ## %if %{without mpi} %doc release_docs/HISTORY-1_8_0-1_10_0.txt @@ -718,7 +740,7 @@ %files -n %{libname -l _hl -s %{sonum_HL}} %defattr(-,root,root) -%doc COPYING +%mylicense COPYING %defattr(0755,root,root) %{?with_hpc:%hpc_dirs} %{my_libdir}/libhdf5_hl.so.%{sonum_HL} @@ -727,7 +749,7 @@ %if %{without mpi} %files -n %{libname -l _cpp -s %{sonum_CXX}} %defattr(-,root,root) -%doc COPYING +%mylicense COPYING %defattr(0755,root,root) %{?with_hpc:%hpc_dirs} %{my_libdir}/libhdf5_cpp.so.%{sonum_CXX} @@ -735,7 +757,7 @@ %files -n %{libname -l _hl_cpp -s %{sonum_HL_CXX}} %defattr(-,root,root) -%doc COPYING +%mylicense COPYING %defattr(0755,root,root) %{?with_hpc:%hpc_dirs} %{my_libdir}/libhdf5_hl_cpp.so.%{sonum_HL_CXX} @@ -744,7 +766,7 @@ %files -n %{libname -l _fortran -s %{sonum_F}} %defattr(-,root,root) -%doc COPYING +%mylicense COPYING %defattr(0755,root,root) %{?with_hpc:%hpc_dirs} %{my_libdir}/libhdf5_fortran.so.%{sonum_F} @@ -752,7 +774,7 @@ %files -n %{libname -l hl_fortran -s %{sonum_HL_F}} %defattr(-,root,root) -%doc COPYING +%mylicense COPYING %defattr(0755,root,root) %{?with_hpc:%hpc_dirs} %{my_libdir}/libhdf5hl_fortran.so.%{sonum_HL_F}
