diff --git a/hwloc.changes b/hwloc.changes index 6873c6e..45dbd05 100644 --- a/hwloc.changes +++ b/hwloc.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Mar 6 07:59:52 UTC 2017 - Thomas.Blume@suse.com + +- make hwloc-dump-hwdata only available on x86, as it is only + supported for Intel Knights Landing Xeon Phi platforms +- revert sub packages for SLE from no-arch to arch specific in order + to keep backward compatibility +- fix typo in specfile + ------------------------------------------------------------------- Wed Feb 8 12:46:42 UTC 2017 - jengelh@inai.de diff --git a/hwloc.spec b/hwloc.spec index 04f6e46..1ab18da 100644 --- a/hwloc.spec +++ b/hwloc.spec @@ -86,23 +86,34 @@ Group: System/Libraries Requires: %{name}-data %description -n %{lname} -Package contains run time libraries for the hwloc. +This package contains the run time libraries for hwloc. %package data -Summary: Runtime data for hwloc +Summary: Run time data for hwloc +Group: Development/Libraries/C and C++ +%if 0%{?sle_version} > 120300 +BuildArch: noarch +%endif +%if 0%{?is_opensuse} Group: System/Libraries BuildArch: noarch +%endif %description data -This package contains the runtime data for hwloc. +This package contains the run time data for the hwloc. %package doc Summary: Documentation for hwloc Group: Documentation/Other +%if 0%{?sle_version} > 120300 BuildArch: noarch +%endif +%if 0%{?is_opensuse} +BuildArch: noarch +%endif %description doc -This package contains the documentation for hwlock. +This package contains the documentation for hwloc. %prep %setup -q -n %{name}-%{name}-%{mainversion} @@ -122,6 +133,16 @@ rm -rf %{buildroot}%{_libdir}/libhwloc.la # documentation will be handled by % doc macro rm -rf %{buildroot}%{_datadir}/doc/ + +# This binary is built only for intel architectures +%ifarch %{ix86} x86_64 +mkdir -p %{buildroot}%{_libexecdir}/systemd/system +mv %{buildroot}%{_datadir}/hwloc/hwloc-dump-hwdata.service %{buildroot}%{_libexecdir}/systemd/system/hwloc-dump-hwdata.service +%else +rm %{buildroot}%{_datadir}/hwloc/hwloc-dump-hwdata.service +%endif + + %fdupes -s %{buildroot}/%{_mandir}/man1 %fdupes -s %{buildroot}/%{_mandir}/man7 @@ -142,17 +163,15 @@ make %{?_smp_mflags} check || : %files %defattr(-, root, root, -) %doc AUTHORS COPYING NEWS README VERSION -# This binary is built only for intel architectures -%ifarch %{ix86} x86_64 -%attr(0755,root,root) %{_sbindir}/hwloc-dump-hwdata -%endif %{_mandir}/man1/hwloc* %{_mandir}/man1/lstopo* %{_bindir}/hwloc* %{_bindir}/lstopo* -%dir %{_datadir}/hwloc %{_datadir}/applications/*.desktop -%{_datadir}/hwloc/hwloc-dump-hwdata.service +%ifarch %{ix86} x86_64 +%attr(0755,root,root) %{_sbindir}/hwloc-dump-hwdata +%{_libexecdir}/systemd/system/hwloc-dump-hwdata.service +%endif %files devel %defattr(-, root, root, -)