Hello community, here is the log from the commit of package hdf5 for openSUSE:Factory checked in at 2019-01-05 14:42:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hdf5 (Old) and /work/SRC/openSUSE:Factory/.hdf5.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hdf5" Sat Jan 5 14:42:21 2019 rev:52 rq:662712 version:1.10.4 Changes: -------- --- /work/SRC/openSUSE:Factory/hdf5/hdf5.changes 2018-12-18 15:01:22.201982589 +0100 +++ /work/SRC/openSUSE:Factory/.hdf5.new.28833/hdf5.changes 2019-01-05 14:42:22.428479446 +0100 @@ -1,0 +2,12 @@ +Thu Jan 3 11:39:58 UTC 2019 - e...@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 <toddrme2...@gmail.com> + +- Use upstream-recommended %{_rpmconfigdir}/macros.d directory + for the rpm macros. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hdf5.spec ++++++ --- /var/tmp/diff_new_pack.yCCJbC/_old 2019-01-05 14:42:23.376478641 +0100 +++ /var/tmp/diff_new_pack.yCCJbC/_new 2019-01-05 14:42:23.380478638 +0100 @@ -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 @@ %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 @@ %{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 @@ %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