diff --git a/backport-powertop-2.14-pthread.patch b/backport-powertop-2.14-pthread.patch new file mode 100644 index 0000000..1b10d96 --- /dev/null +++ b/backport-powertop-2.14-pthread.patch @@ -0,0 +1,20 @@ +diff --git a/configure.ac b/configure.ac +index 2571c5d..c913368 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3,6 +3,7 @@ + + AC_PREREQ([2.69]) + AC_INIT([powertop], [2.14], [powertop@lists.01.org], [], [https://01.org/powertop]) ++AC_CANONICAL_TARGET + AM_INIT_AUTOMAKE([ + -Wall + 1.12.2 +@@ -37,6 +38,7 @@ AC_PROG_CC + AC_PROG_INSTALL + AM_PROG_CC_C_O + PKG_PROG_PKG_CONFIG ++AX_PTHREAD + + # Checks for libraries. + diff --git a/powertop-2.13.tar.gz b/powertop-2.13.tar.gz deleted file mode 100644 index 58c74d0..0000000 Binary files a/powertop-2.13.tar.gz and /dev/null differ diff --git a/powertop-2.14.tar.gz b/powertop-2.14.tar.gz new file mode 100644 index 0000000..021d61c Binary files /dev/null and b/powertop-2.14.tar.gz differ diff --git a/powertop.spec b/powertop.spec index 2851ff5..c6fd967 100644 --- a/powertop.spec +++ b/powertop.spec @@ -1,6 +1,6 @@ Name: powertop -Version: 2.13 -Release: 2 +Version: 2.14 +Release: 1 Summary: Power consumption tool for Linux License: GPLv2 URL: http://01.org/powertop/ @@ -8,7 +8,9 @@ Source0: https://01.org/sites/default/files/downloads//%{name}-%{ve Source1: powertop.service Patch1: backport-powertop-2.7-always-create-params.patch +Patch2: backport-powertop-2.14-pthread.patch +BuildRequires: autoconf automake libtool BuildRequires: gcc gcc-c++ systemd BuildRequires: gettext-devel ncurses-devel pciutils-devel zlib-devel libnl3-devel Requires(post): coreutils @@ -27,6 +29,8 @@ management settings for cases where the Linux distribution has not enabled these %autosetup -n %{name}-%{version} -p1 %build +# workaroud for 'error: too many loops' +autoreconf -fi || autoreconf -fi %configure %make_build @@ -54,7 +58,7 @@ touch %{_localstatedir}/cache/powertop/{saved_parameters.powertop,saved_results. %files -f %{name}.lang %defattr(-,root,root) -%doc COPYING README TODO +%doc COPYING README.md README.traceevent CONTRIBUTE.md TODO %{_sbindir}/powertop %{_unitdir}/powertop.service %dir %{_localstatedir}/cache/powertop @@ -67,6 +71,9 @@ touch %{_localstatedir}/cache/powertop/{saved_parameters.powertop,saved_results. %changelog +* Mon Feb 21 2022 panxiaohe - 2.14-1 +- update to 2.14 + * Fri Jul 30 2021 chenyanpanHW - 2.13-2 - DESC: delete -Sgit from %autosetup, and delete BuildRequires git