- fixed install

[packages/kernel-tools.git] / kernel-tools.spec

diff --git a/kernel-tools.spec b/kernel-tools.spec
index 346dfd6a97039d7a68f79a800a0c710f45ba142d..46a3ed0c43a213f96abf937c462856144ed8c76f 100644 (file)
--- a/kernel-tools.spec
+++ b/kernel-tools.spec
@@ -15,26 +15,27 @@
 %undefine      with_libunwind
 %endif
 
-%define                basever         4.0
-%define                postver         .0
+%define                basever         4.1
+%define                postver         .6
 Summary:       Assortment of tools for the Linux kernel
 Summary(pl.UTF-8):     Zestaw narzędzi dla jądra Linuksa
 Name:          kernel-tools
 Version:       %{basever}%{postver}
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         Applications/System
 Source0:       https://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
-# Source0-md5: a86916bd12798220da9eb4a1eec3616d
+# Source0-md5: fe9dc0f6729f36400ea81aa41d614c37
 Source1:       cpupower.service
 Source2:       cpupower.config
 %if "%{postver}" != ".0"
 Patch0:                https://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5:  1fec75551b2f55fced43df8394b1fd9a
+# Patch0-md5:  7dea69f02c906206f88df48085069eb6
 %endif
 Patch1:                x32.patch
 URL:           http://www.kernel.org/
 %ifarch %{x8664}
+BuildRequires: gcc-multilib-32
 BuildRequires: gcc-multilib-x32
 %endif
 BuildRequires: gettext-tools
@@ -328,29 +329,13 @@ install -p dslm $RPM_BUILD_ROOT%{_sbindir}
 
 %ifarch %{ix86} %{x8664} x32
 install -d $RPM_BUILD_ROOT%{_mandir}/man8
-# broken makefile, install manually
-%if 0
 %{__make} install \
        -C tools/power/x86/x86_energy_perf_policy \
        DESTDIR=$RPM_BUILD_ROOT
-%else
-cd tools/power/x86/x86_energy_perf_policy
-install -p x86_energy_perf_policy $RPM_BUILD_ROOT%{_bindir}
-cp -p x86_energy_perf_policy.8 $RPM_BUILD_ROOT%{_mandir}/man8
-cd -
-%endif
 
-# broken makefile, install manually
-%if 0
 %{__make} install \
        -C tools/power/x86/turbostat \
        DESTDIR=$RPM_BUILD_ROOT
-%else
-cd tools/power/x86/turbostat
-cp -p turbostat.8 $RPM_BUILD_ROOT%{_mandir}/man8
-cd -
-install -p turbostat $RPM_BUILD_ROOT%{_bindir}/turbostat
-%endif
 %endif
 
 %if %{with perf}