From 90d3cad6fbc80e0267f52c8367d441285fdcbd4e99fa1a6585e18340fef09f17 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 21 Nov 2017 12:23:25 +0000 Subject: [PATCH] Accepting request 544116 from home:namtrac:branches:devel:libraries:c_c++ - Fix build on Leap where both sle_version is defined and is_opensuse is True. OBS-URL: https://build.opensuse.org/request/show/544116 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/hwloc?expand=0&rev=26 --- hwloc.changes | 6 ++++++ hwloc.spec | 12 ++---------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/hwloc.changes b/hwloc.changes index 45dbd05..56288ff 100644 --- a/hwloc.changes +++ b/hwloc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Nov 21 09:52:50 UTC 2017 - idonmez@suse.com + +- Fix build on Leap where both sle_version is defined and + is_opensuse is True. + ------------------------------------------------------------------- Mon Mar 6 07:59:52 UTC 2017 - Thomas.Blume@suse.com diff --git a/hwloc.spec b/hwloc.spec index 1ab18da..bb90c33 100644 --- a/hwloc.spec +++ b/hwloc.spec @@ -91,11 +91,7 @@ This package contains the run time libraries for hwloc. %package data 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 +%if 0%{?sle_version} > 120300 || 0%{?is_opensuse} BuildArch: noarch %endif @@ -105,10 +101,7 @@ 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} +%if 0%{?sle_version} > 120300 || 0%{?is_opensuse} BuildArch: noarch %endif @@ -142,7 +135,6 @@ mv %{buildroot}%{_datadir}/hwloc/hwloc-dump-hwdata.service %{buildroot}%{_libexe rm %{buildroot}%{_datadir}/hwloc/hwloc-dump-hwdata.service %endif - %fdupes -s %{buildroot}/%{_mandir}/man1 %fdupes -s %{buildroot}/%{_mandir}/man7