- rel 2; use perf_xxx for slang/gtk commands (instead of perf-xxx), so it detects...

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

diff --git a/kernel-tools.spec b/kernel-tools.spec
index 963a17807a3719b07e39ae3847a4bec632e6e010..7799895a051ade28fbdab16dcf2f7c2c1da8b961 100644 (file)
--- a/kernel-tools.spec
+++ b/kernel-tools.spec
@@ -1,14 +1,14 @@
-# TODO
-# - optflags
+# TODO:
+# - redefine: PACKAGE_BUGREPORT=cpufreq@vger.kernel.org
+# -n python-perf?
 
-#
 # Conditional build:
 %bcond_without verbose         # verbose build (V=1)
 %bcond_without perf            # perf tools
 
-%define                rel             0.5
+%define                rel             2
 %define                basever 3.7
-%define                postver .1
+%define                postver .2
 Summary:       Assortment of tools for the Linux kernel
 Summary(pl.UTF-8):     Zestaw narzędzi dla jądra Linuksa
 Name:          kernel-tools
@@ -20,7 +20,7 @@ Source0:      http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
 # Source0-md5: 21223369d682bcf44bcdfe1521095983
 %if "%{postver}" != ".0"
 Patch0:                http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2
-# Patch0-md5:  c391dc1a1b4dae81aaef6f08a0594813
+# Patch0-md5:  b88977838a2a52ff4fb4e82b30726496
 %endif
 Source1:       cpupower.service
 Source2:       cpupower.config
@@ -63,6 +63,7 @@ Summary:      cpupower - Shows and sets processor power related values
 Summary(pl.UTF-8):     cpupower - wyświetlanie i ustawianie wartości związanych z zużyciem energii przez procesor
 Group:         Applications/System
 Requires(post,preun,postun):   systemd-units >= 38
+Requires:      %{name}-cpupower-libs = %{version}-%{release}
 Requires:      systemd-units >= 0.38
 Provides:      cpufreq-utils = 1:009-0.6.p1
 Provides:      cpufrequtils = 1:009-0.6.p1
@@ -71,7 +72,6 @@ Obsoletes:    cpufreq-utils < 1:009-0.6.p1
 Obsoletes:     cpufrequtils < 1:009-0.6.p1
 Obsoletes:     cpupowerutils < 1:009-0.6.p1
 Obsoletes:     cpuspeed < 1:1.5-16
-Requires:      %{name}-cpupower-libs = %{version}-%{release}
 
 %description cpupower
 cpupower is a collection of tools to examine and tune power saving
@@ -98,7 +98,9 @@ Summary(pl.UTF-8):    Pliki programistyczne biblioteki cpupower
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-cpupower-libs = %{version}-%{release}
+Provides:      cpufrequtils-devel = 1:009-0.6.p1
 Provides:      cpupowerutils-devel = 1:009-0.6.p1
+Obsoletes:     cpufrequtils-devel < 1:009-0.6.p1
 Obsoletes:     cpupowerutils-devel < 1:009-0.6.p1
 
 %description cpupower-libs-devel
@@ -204,23 +206,29 @@ cd linux-%{basever}
 # cpupower
 %{__make} -C tools/power/cpupower \
        %{makeopts} \
-       CPUFREQ_BENCH=false
+       CPUFREQ_BENCH=false \
+       OPTIMIZATION="%{rpmcflags}" \
+       STRIPCMD=true
 
 %ifarch %{ix86}
 %{__make} -C tools/power/cpupower/debug/i386 centrino-decode powernow-k8-decode \
-       %{makeopts} \
+       CC="%{__cc}" \
+       CFLAGS="%{rpmcflags}"
 %endif
 
 %ifarch %{x8664}
 %{__make} -C tools/power/cpupower/debug/x86_64 centrino-decode powernow-k8-decode \
-       %{makeopts}
+       CC="%{__cc}" \
+       CFLAGS="%{rpmcflags}"
 %endif
 
 %ifarch %{ix86} %{x8664}
 %{__make} -C tools/power/x86/x86_energy_perf_policy \
-       %{makeopts}
+       CC="%{__cc}" \
+       CFLAGS="%{rpmcflags}"
 %{__make} -C tools/power/x86/turbostat \
-       %{makeopts}
+       CC="%{__cc}" \
+       CFLAGS="%{rpmcflags} -Wall"
 %endif
 
 # slabinfo
@@ -236,6 +244,7 @@ install -d $PWD/perf-{slang,gtk}
        O=$PWD/perf-slang \
        NO_GTK2=1 \
        %{makeopts} \
+       CFLAGS_OPTIMIZE="%{rpmcflags}" \
        prefix=%{_prefix} \
        perfexecdir=%{_datadir}/perf-core \
        template_dir=%{_datadir}/perf-core/templates
@@ -244,6 +253,7 @@ install -d $PWD/perf-{slang,gtk}
 %{__make} -C tools/perf all man \
        O=$PWD/perf-gtk \
        %{makeopts} \
+       CFLAGS_OPTIMIZE="%{rpmcflags}" \
        prefix=%{_prefix} \
        perfexecdir=%{_datadir}/perf-core \
        template_dir=%{_datadir}/perf-core/templates
@@ -252,6 +262,7 @@ install -d $PWD/perf-{slang,gtk}
 # gen_init_cpio
 %{__make} -C usr gen_init_cpio \
        %{makeopts} \
+       CFLAGS="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -315,24 +326,26 @@ PWD=${PWD:-$(pwd)}
        O=$PWD/perf-slang \
        NO_GTK2=1 \
        CC="%{__cc}" \
+       CFLAGS_OPTIMIZE="%{rpmcflags}" \
        %{?with_verbose:V=1} \
        prefix=%{_prefix} \
        perfexecdir=%{_datadir}/perf-core \
        template_dir=%{_datadir}/perf-core/templates \
        DESTDIR=$RPM_BUILD_ROOT
-%{__mv} $RPM_BUILD_ROOT%{_bindir}/perf{,-slang}
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/perf{,_slang}
 
 # perf gtk
 %{__make} -j1 install install-man \
        -C tools/perf \
        O=$PWD/perf-gtk \
        CC="%{__cc}" \
+       CFLAGS_OPTIMIZE="%{rpmcflags}" \
        %{?with_verbose:V=1} \
        prefix=%{_prefix} \
        perfexecdir=%{_datadir}/perf-core \
        template_dir=%{_datadir}/perf-core/templates \
        DESTDIR=$RPM_BUILD_ROOT
-%{__mv} $RPM_BUILD_ROOT%{_bindir}/perf{,-gtk}
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/perf{,_gtk}
 
 %py_comp $RPM_BUILD_ROOT%{_datadir}/perf-core/scripts/python
 %py_ocomp $RPM_BUILD_ROOT%{_datadir}/perf-core/scripts/python
@@ -419,11 +432,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files perf-gtk
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/perf-gtk
+%attr(755,root,root) %{_bindir}/perf_gtk
 
 %files perf-slang
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/perf-slang
+%attr(755,root,root) %{_bindir}/perf_slang
 
 %files -n bash-completion-perf
 %defattr(644,root,root,755)