From 500a1619cf144e84fdf3fc5fbee44ab688f2e2b29261ad8e2514c9b07bb96610 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.com>
Date: Sat, 7 Apr 2018 22:33:46 +0000
Subject: [PATCH 1/2] - Only build one example package for all flavors, do not 
  include dependencies as these would be flavor specific   (bsc#1088547).

OBS-URL: https://build.opensuse.org/package/show/science/hdf5?expand=0&rev=73
---
 hdf5.changes |  8 ++++++++
 hdf5.spec    | 18 +++---------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/hdf5.changes b/hdf5.changes
index 8f59939..583b9df 100644
--- a/hdf5.changes
+++ b/hdf5.changes
@@ -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
 
diff --git a/hdf5.spec b/hdf5.spec
index b290826..855b5eb 100644
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -412,12 +412,6 @@ This package provides the static libraries for the %{flavor} version of HDF5.
 %package -n %{pname}-examples
 Summary:        Examples for %{name}
 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
 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
 
-%if %{without mpi}
+%if %{without mpi} && %{without hpc}
 find %{buildroot}%{_datadir}/hdf5_examples -type f \
                  | grep -v ".sh$" | xargs chmod 644
-
- %if %{without hpc}
 # rpm macro for version checking
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
 cat > %{buildroot}%{_sysconfdir}/rpm/macros.hdf5 <<EOF
@@ -574,7 +566,6 @@ cat > %{buildroot}%{_sysconfdir}/rpm/macros.hdf5 <<EOF
 %_hdf5_sonum  %{sonum}
 %_hdf5_version  %{version}
 EOF
- %endif
 %else
 # delete examples from parallel builds
 rm -rf %{buildroot}%{_datadir}/hdf5_examples
@@ -675,18 +666,15 @@ export HDF5_Make_Ignore=yes
 %hpc_module_delete_if_default
 %endif
 
-%if %{without mpi}
+%if %{without mpi} && %{without hpc}
 %files -n %{pname}-examples
 %defattr(-,root,root)
 %{_datadir}/hdf5_examples
 
- %if 0%{without hpc}
-
 %files -n %{pname}-devel-data
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/rpm/macros.hdf5
- %endif
-%endif # flavor == serial
+%endif
 
 %files -n %{name}
 %defattr(-,root,root)

From 8f51185408c54a8e3736ea5e2a90e0c91d5ea98cfe8b6f20f99aa4cd036b9e95 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.com>
Date: Sun, 8 Apr 2018 05:38:46 +0000
Subject: [PATCH 2/2] - Only build one examples package for all flavors, do not

OBS-URL: https://build.opensuse.org/package/show/science/hdf5?expand=0&rev=74
---
 hdf5.changes | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/hdf5.changes b/hdf5.changes
index 583b9df..0e3b444 100644
--- a/hdf5.changes
+++ b/hdf5.changes
@@ -1,8 +1,7 @@
-
 -------------------------------------------------------------------
 Sat Apr  7 22:31:05 UTC 2018 - eich@suse.com
 
-- Only build one example package for all flavors, do not
+- Only build one examples package for all flavors, do not
   include dependencies as these would be flavor specific
   (bsc#1088547).