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
This commit is contained in:
parent
c207bd3f4d
commit
90d3cad6fb
@ -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
|
Mon Mar 6 07:59:52 UTC 2017 - Thomas.Blume@suse.com
|
||||||
|
|
||||||
|
12
hwloc.spec
12
hwloc.spec
@ -91,11 +91,7 @@ This package contains the run time libraries for hwloc.
|
|||||||
%package data
|
%package data
|
||||||
Summary: Run time data for hwloc
|
Summary: Run time data for hwloc
|
||||||
Group: Development/Libraries/C and C++
|
Group: Development/Libraries/C and C++
|
||||||
%if 0%{?sle_version} > 120300
|
%if 0%{?sle_version} > 120300 || 0%{?is_opensuse}
|
||||||
BuildArch: noarch
|
|
||||||
%endif
|
|
||||||
%if 0%{?is_opensuse}
|
|
||||||
Group: System/Libraries
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -105,10 +101,7 @@ This package contains the run time data for the hwloc.
|
|||||||
%package doc
|
%package doc
|
||||||
Summary: Documentation for hwloc
|
Summary: Documentation for hwloc
|
||||||
Group: Documentation/Other
|
Group: Documentation/Other
|
||||||
%if 0%{?sle_version} > 120300
|
%if 0%{?sle_version} > 120300 || 0%{?is_opensuse}
|
||||||
BuildArch: noarch
|
|
||||||
%endif
|
|
||||||
%if 0%{?is_opensuse}
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -142,7 +135,6 @@ mv %{buildroot}%{_datadir}/hwloc/hwloc-dump-hwdata.service %{buildroot}%{_libexe
|
|||||||
rm %{buildroot}%{_datadir}/hwloc/hwloc-dump-hwdata.service
|
rm %{buildroot}%{_datadir}/hwloc/hwloc-dump-hwdata.service
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%fdupes -s %{buildroot}/%{_mandir}/man1
|
%fdupes -s %{buildroot}/%{_mandir}/man1
|
||||||
%fdupes -s %{buildroot}/%{_mandir}/man7
|
%fdupes -s %{buildroot}/%{_mandir}/man7
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user