diff --git a/cpupower.changes b/cpupower.changes index 3c343f2..c10347e 100644 --- a/cpupower.changes +++ b/cpupower.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 14 13:32:00 UTC 2014 - trenn@suse.de + +- turbostat is an x86 (in fact an Intel) only tool + exclude it for other archs to fix building of the package there again + ------------------------------------------------------------------- Fri Jan 31 15:48:18 UTC 2014 - trenn@suse.de diff --git a/cpupower.spec b/cpupower.spec index 44fbd2d..3bf3392 100644 --- a/cpupower.spec +++ b/cpupower.spec @@ -87,8 +87,10 @@ CONF="PACKAGE_BUGREPORT=http://bugs.opensuse.org mandir=%_mandir libdir=%_libdir export CFLAGS="$RPM_OPT_FLAGS -I ." make $CONF %{?_smp_mflags} +%ifarch ix86 x86_64 cd ../turbostat-%{tsversion} make %{?_smp_mflags} +%endif %install export SUSE_ASNEEDED=0 @@ -100,8 +102,10 @@ mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name}/examples mv $RPM_BUILD_ROOT/%{_docdir}/%{name}/cpufreq-bench_script.sh $RPM_BUILD_ROOT/%{_docdir}/%{name}/examples %find_lang %{name} +%ifarch ix86 x86_64 cd ../turbostat-%{tsversion} make install -e DESTDIR="$RPM_BUILD_ROOT" +%endif %post -n libcpupower0 -p /sbin/ldconfig @@ -110,9 +114,11 @@ make install -e DESTDIR="$RPM_BUILD_ROOT" %files -f %{name}.lang %defattr (-,root,root) %{_mandir}/man1/cpupower* -%{_mandir}/man8/turbostat* /usr/bin/cpupower +%ifarch ix86 x86_64 +%{_mandir}/man8/turbostat* /usr/bin/turbostat +%endif %files bench %defattr (-,root,root)