diff --git a/.gitignore b/.gitignore index 866d8ae..5e0c315 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/powertop-2.14.tar.gz +SOURCES/powertop-2.15.tar.gz diff --git a/.powertop.metadata b/.powertop.metadata index 620ece6..45300a6 100644 --- a/.powertop.metadata +++ b/.powertop.metadata @@ -1 +1 @@ -3783086487352b5b51d4ca36d2c258dfbef6a60f SOURCES/powertop-2.14.tar.gz +57d9bbfb5e06a89c503c4bff2029157aae20760e SOURCES/powertop-2.15.tar.gz diff --git a/SOURCES/powertop-2.14-pthread.patch b/SOURCES/powertop-2.14-pthread.patch deleted file mode 100644 index 1b10d96..0000000 --- a/SOURCES/powertop-2.14-pthread.patch +++ /dev/null @@ -1,20 +0,0 @@ -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/SPECS/powertop.spec b/SPECS/powertop.spec index 587f154..a9f672d 100644 --- a/SPECS/powertop.spec +++ b/SPECS/powertop.spec @@ -1,6 +1,6 @@ Name: powertop -Version: 2.14 -Release: 2%{?dist} +Version: 2.15 +Release: 1%{?dist} Summary: Power consumption monitor License: GPLv2 @@ -10,8 +10,6 @@ Source1: powertop.service # Sent upstream Patch0: powertop-2.7-always-create-params.patch -# https://github.com/fenrus75/powertop/issues/84 -Patch1: powertop-2.14-pthread.patch BuildRequires: make BuildRequires: gettext-devel BuildRequires: ncurses-devel @@ -34,9 +32,7 @@ PowerTOP is a tool that finds the software component(s) that make your computer use more power than necessary while it is idle. %prep -%setup -q -%patch0 -p1 -b .always-create-params -%patch1 -p1 -b .pthread +%autosetup -p1 echo "v%{version}" > version-long echo '"v%{version}"' > version-short @@ -79,6 +75,10 @@ touch %{_localstatedir}/cache/powertop/{saved_parameters.powertop,saved_results. %{_datadir}/bash-completion/completions/powertop %changelog +* Tue Nov 8 2022 Jaroslav Škarvada - 2.15-1 +- New version + Resolves: rhbz#2044132 + * Tue Aug 10 2021 Mohan Boddu - 2.14-2 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688