Accepting request 662712 from science

- Do not build non-HPC on SLE: This helps to save some build
  cycles.

- Use upstream-recommended %{_rpmconfigdir}/macros.d directory
  for the rpm macros.

OBS-URL: https://build.opensuse.org/request/show/662712
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hdf5?expand=0&rev=52

hdf5.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Jan  3 11:39:58 UTC 2019 - eich@suse.com
+
+- Do not build non-HPC on SLE: This helps to save some build
+  cycles.
+
+-------------------------------------------------------------------
+Wed Dec 19 19:54:05 UTC 2018 - Todd R <toddrme2178@gmail.com>
+
+- Use upstream-recommended %{_rpmconfigdir}/macros.d directory
+  for the rpm macros.
+
 -------------------------------------------------------------------
 Wed Dec 12 15:28:48 UTC 2018 - Todd R <toddrme2178@gmail.com>
 

hdf5.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package hdf5
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -153,6 +153,11 @@ ExclusiveArch:  do_not_build
 %global mpi_flavor mpich
 %endif
 
+# Don't build non-HPC on SLE
+%if !0%{?is_opensuse} && !0%{?with_hpc:1}
+ExclusiveArch:  do_not_build
+%endif
+
 # Disable until resource issue is resolved.
 %if "%mpi_flavor" == "openmpi"
 %define _do_check 0
@@ -578,8 +583,8 @@ 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
+mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d/
+cat > %{buildroot}%{_rpmconfigdir}/macros.d/macros.hdf5 <<EOF
 #
 # RPM macros for hdf5 packaging
 #
@@ -697,7 +702,7 @@ export HDF5_Make_Ignore=yes
 %if %{without hpc}
 %files -n %{pname}-devel-data
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/rpm/macros.hdf5
+%{_rpmconfigdir}/macros.d/macros.hdf5
 %endif
 %endif # ?mpi