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 - eich@suse.com
+
+- 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 <