From 42e65700baa6cbe5db08994fec4f9d8e4e2314cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
Date: Tue, 11 May 2021 19:53:03 +0200
Subject: [PATCH] New version   Resolves: rhbz#1880071

---
 .gitignore                  |  2 +-
 powertop-2.14-pthread.patch | 20 ++++++++++++++++++++
 powertop.spec               | 29 ++++++++++++++++++++++-------
 sources                     |  2 +-
 4 files changed, 44 insertions(+), 9 deletions(-)
 create mode 100644 powertop-2.14-pthread.patch

diff --git a/.gitignore b/.gitignore
index 7af4054..07c909a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-powertop-*.tar.gz
+/powertop-*.tar.gz
diff --git a/powertop-2.14-pthread.patch b/powertop-2.14-pthread.patch
new file mode 100644
index 0000000..1b10d96
--- /dev/null
+++ b/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.spec b/powertop.spec
index fa1003c..2adbc53 100644
--- a/powertop.spec
+++ b/powertop.spec
@@ -1,6 +1,6 @@
 Name:             powertop
-Version:          2.13
-Release:          4%{?dist}
+Version:          2.14
+Release:          1%{?dist}
 Summary:          Power consumption monitor
 
 License:          GPLv2
@@ -10,10 +10,20 @@ Source1:          powertop.service
 
 # Sent upstream
 Patch0:           powertop-2.7-always-create-params.patch
-BuildRequires: make
-BuildRequires:    gettext-devel, ncurses-devel, pciutils-devel, zlib-devel, libnl3-devel
-BuildRequires:    automake, libtool, systemd, autoconf-archive
-BuildRequires:    gcc, gcc-c++
+# https://github.com/fenrus75/powertop/issues/84
+Patch1:           powertop-2.14-pthread.patch
+BuildRequires:    make
+BuildRequires:    gettext-devel
+BuildRequires:    ncurses-devel
+BuildRequires:    pciutils-devel
+BuildRequires:    zlib-devel
+BuildRequires:    libnl3-devel
+BuildRequires:    automake
+BuildRequires:    libtool
+BuildRequires:    systemd
+BuildRequires:    autoconf-archive
+BuildRequires:    gcc
+BuildRequires:    gcc-c++
 Requires(post):   systemd, coreutils
 Requires(preun):  systemd
 Requires(postun): systemd
@@ -26,6 +36,7 @@ computer use more power than necessary while it is idle.
 %prep
 %setup -q
 %patch0 -p1 -b .always-create-params
+%patch1 -p1 -b .pthread
 
 echo "v%{version}" > version-long
 echo '"v%{version}"' > version-short
@@ -34,7 +45,7 @@ echo '"v%{version}"' > version-short
 # workaround for rhbz#1826935
 autoreconf -fi || autoreconf -fi
 %configure
-make %{?_smp_mflags} CFLAGS="%{optflags}"
+make %{?_smp_mflags} CFLAGS="%{optflags}" V=1
 
 %install
 rm -rf %{buildroot}
@@ -68,6 +79,10 @@ touch %{_localstatedir}/cache/powertop/{saved_parameters.powertop,saved_results.
 %{_datadir}/bash-completion/completions/powertop
 
 %changelog
+* Tue May 11 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2.14-1
+- New version
+  Resolves: rhbz#1880071
+
 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.13-4
 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
diff --git a/sources b/sources
index 371401b..3b60e42 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (powertop-2.13.tar.gz) = 8ebeccd17b6f76d9e445382d9ce5b1c00ab2daf4f1e6e133c249bceb35ea582ca3e76da5415fd0b55a28b8a124655dc5ac7a18aaf2a3df955547d77495e59181
+SHA512 (powertop-2.14.tar.gz) = f3e25901fb29405e0c8016643855a209cf9dba589fe9dd3e27c291d44699cebeb00dc8c7264c24436db08deb496759bd106666cb52d9ebd5f831bbb99e30f20f