From fcc497a78a0bbdb3168e7c097fc92a08398664d08a229a1c2a5aa504c1cf3d07 Mon Sep 17 00:00:00 2001 From: Torsten Duwe Date: Fri, 6 Oct 2017 15:52:17 +0000 Subject: [PATCH] Accepting request 532220 from home:jengelh:branches:hardware unconflict OBS-URL: https://build.opensuse.org/request/show/532220 OBS-URL: https://build.opensuse.org/package/show/hardware/cpupower?expand=0&rev=72 --- cpupower.changes | 6 +++++ cpupower.spec | 66 ++++++++++++++++++++++++------------------------ 2 files changed, 39 insertions(+), 33 deletions(-) diff --git a/cpupower.changes b/cpupower.changes index b4abffb..f106d39 100644 --- a/cpupower.changes +++ b/cpupower.changes @@ -4,6 +4,12 @@ Fri Oct 6 13:01:48 UTC 2017 - josef.moellers@suse.com - Added missing references. [bsc#1041332,bsc#996052,bsc#976983] +------------------------------------------------------------------- +Thu Oct 5 14:52:11 UTC 2017 - jengelh@inai.de + +- Rectify RPM groups. Replace old $RPM_ shell variables by macros. + Apply consistent styling to macros. + ------------------------------------------------------------------- Thu Oct 5 12:02:46 UTC 2017 - josef.moellers@suse.com diff --git a/cpupower.spec b/cpupower.spec index d8bb18b..76efb39 100644 --- a/cpupower.spec +++ b/cpupower.spec @@ -1,7 +1,7 @@ # # spec file for package cpupower # -# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Author: Thomas Renninger # # All modifications and additions to the file contributed by third parties @@ -19,7 +19,7 @@ Name: cpupower # Use this as version when things are in mainline kernel -%define version %(rpm -q --qf '%{VERSION}' kernel-source) +%define version %(rpm -q --qf '%VERSION' kernel-source) Version: 4.11 Release: 0 %define tsversion 17.04.12 @@ -27,8 +27,8 @@ Summary: Tools to determine and set CPU Power related Settings License: GPL-2.0 Group: System/Base Url: https://git.kernel.org/cgit/linux/kernel/git/rafael/linux-pm.git -Source: %{name}-%{version}.tar.bz2 -Source1: turbostat-%{tsversion}.tar.bz2 +Source: %name-%version.tar.bz2 +Source1: turbostat-%tsversion.tar.bz2 Source2: cpupower_export_tarball_from_git.sh Patch20: turbostat_fix_man_perm.patch @@ -49,7 +49,7 @@ and userspace tools easier. %package -n libcpupower0 Summary: Obsolete processor frequency related C-library -Group: System/Base +Group: System/Libraries %description -n libcpupower0 Contains libcpupower and soon possibly other CPU power related @@ -59,7 +59,7 @@ C libraries. Summary: Include files and C-libraries Group: Development/Languages/C and C++ Conflicts: cpufrequtils-devel -Requires: libcpupower0 = %{version} +Requires: libcpupower0 = %version %description devel Include files and C-libraries for C/C++ development @@ -79,7 +79,7 @@ powersave module. %prep %setup -D -b 1 -cd ../turbostat-%{tsversion} +cd ../turbostat-%tsversion %patch20 -p1 %patch22 -p1 %patch23 -p1 @@ -88,62 +88,62 @@ cd ../turbostat-%{tsversion} # This package failed when testing with -Wl,-as-needed being default. # So we disable it here, if you want to retest, just delete this comment and the line below. export SUSE_ASNEEDED=0 -CONF="PACKAGE_BUGREPORT=http://bugs.opensuse.org mandir=%_mandir libdir=%_libdir CPUFRQ_BENCH=true STRIP=true VERSION=%{version}" -export CFLAGS="$RPM_OPT_FLAGS -I ." +CONF="PACKAGE_BUGREPORT=http://bugs.opensuse.org mandir=%_mandir libdir=%_libdir CPUFRQ_BENCH=true STRIP=true VERSION=%version" +export CFLAGS="%optflags -I ." make $CONF %{?_smp_mflags} %ifarch ix86 x86_64 -cd ../turbostat-%{tsversion} +cd ../turbostat-%tsversion export CFLAGS="%optflags -I ." make %{?_smp_mflags} %endif %install export SUSE_ASNEEDED=0 -CONF="PACKAGE_BUGREPORT=http://bugs.opensuse.org mandir=%_mandir libdir=%_libdir CPUFRQ_BENCH=true DESTDIR=$RPM_BUILD_ROOT sbindir=/usr/sbin docdir=%{_docdir}/%{name} confdir=/etc VERSION=%{version}" -make install DESTDIR=$RPM_BUILD_ROOT $CONF +CONF="PACKAGE_BUGREPORT=http://bugs.opensuse.org mandir=%_mandir libdir=%_libdir CPUFRQ_BENCH=true DESTDIR=%buildroot sbindir=%_sbindir docdir=%_docdir/%name confdir=%_sysconfdir VERSION=%version" +%make_install $CONF # copy to examples doc dir to avoid complains from the build # system about an executable in the doc dir. -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} +mkdir -p %buildroot/%_docdir/%name/examples +mv %buildroot//%_docdir/%name/cpufreq-bench_script.sh %buildroot/%_docdir/%name/examples +%find_lang %name %ifarch ix86 x86_64 -cd ../turbostat-%{tsversion} -make install -e DESTDIR="$RPM_BUILD_ROOT" +cd ../turbostat-%tsversion +%make_install -e %endif %post -n libcpupower0 -p /sbin/ldconfig %postun -n libcpupower0 -p /sbin/ldconfig -%files -f %{name}.lang +%files -f %name.lang %defattr (-,root,root) -%{_mandir}/man1/cpupower* -/usr/bin/cpupower +%_mandir/man1/cpupower* +%_bindir/cpupower %ifarch ix86 x86_64 -%{_mandir}/man8/turbostat* -/usr/bin/turbostat +%_mandir/man8/turbostat* +%_bindir/turbostat %endif %files bench %defattr (-,root,root) -%config /etc/cpufreq-bench.conf -/usr/sbin/cpufreq-bench -/usr/bin/cpufreq-bench_plot.sh -%dir %{_docdir}/%{name} -%dir %{_docdir}/%{name}/examples -%{_docdir}/%{name}/examples/cpufreq-bench_script.sh -%{_docdir}/%{name}/README-BENCH +%config %_sysconfdir/cpufreq-bench.conf +%_sbindir/cpufreq-bench +%_bindir/cpufreq-bench_plot.sh +%dir %_docdir/%name +%dir %_docdir/%name/examples +%_docdir/%name/examples/cpufreq-bench_script.sh +%_docdir/%name/README-BENCH %files -n libcpupower0 %defattr(-,root,root) -%{_libdir}/libcpupower*.so.* +%_libdir/libcpupower*.so.* %files devel %defattr(-,root,root) -/usr/include/cpufreq.h -/usr/include/cpuidle.h -%{_libdir}/libcpu*.so +%_includedir/cpufreq.h +%_includedir/cpuidle.h +%_libdir/libcpu*.so %changelog