[powertop] New version

[Jaroslav Škarvada]

commit 57d89b49328f9a9ec54c40d10856362f320564a8
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Mon Nov 25 16:43:19 2013 +0100

    New version
    
      Resolves: rhbz#1034113
    - Dropped unlimit-fds, fd-limit-err, reg-net-params  patches (all upstreamed)

 powertop-2.4-fd-limit-err.patch   |   38 ---------------------
 powertop-2.4-reg-net-params.patch |   33 -------------------
 powertop-2.4-unlimit-fds.patch    |   65 -------------------------------------
 powertop.spec                     |   20 ++++-------
 sources                           |    2 +-
 5 files changed, 9 insertions(+), 149 deletions(-)
---
diff --git a/powertop.spec b/powertop.spec
index a9f9576..f1753b8 100644
--- a/powertop.spec
+++ b/powertop.spec
@@ -1,6 +1,6 @@
 Name:           powertop
-Version:        2.4
-Release:        6%{?dist}
+Version:        2.5
+Release:        1%{?dist}
 Summary:        Power consumption monitor
 
 Group:          Applications/System
@@ -14,12 +14,6 @@ Patch0:         powertop-2.3-always-create-params.patch
 Patch1:         powertop-2.3-man-fix.patch
 # Sent upstream (http://github.com/fenrus75/powertop/pull/12)
 Patch2:         powertop-2.3-ondemand-check.patch
-# Accepted upstream
-Patch3:         powertop-2.4-unlimit-fds.patch
-# Accepted upstream
-Patch4:         powertop-2.4-fd-limit-err.patch
-# Sent upstream
-Patch5:         powertop-2.4-reg-net-params.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gettext, ncurses-devel, pciutils-devel, zlib-devel, libnl3-devel
 Requires(post): coreutils
@@ -33,9 +27,6 @@ computer use more power than necessary while it is idle.
 %patch0 -p1 -b .always-create-params
 %patch1 -p1 -b .man-fix
 %patch2 -p1 -b .ondemand-check
-%patch3 -p1 -b .unlimit-fds
-%patch4 -p1 -b .fd-limit-err
-%patch5 -p1 -b .reg-net-params
 
 # remove left over object files
 find . -name "*.o" -exec rm {} \;
@@ -68,9 +59,14 @@ rm -rf %{buildroot}
 %{_mandir}/man8/powertop.8*
 
 %changelog
+* Mon Nov 25 2013 Jaroslav Škarvada <jskarvad at redhat.com> - 2.5-1
+- New version
+  Resolves: rhbz#1034113
+- Dropped unlimit-fds, fd-limit-err, reg-net-params  patches (all upstreamed)
+
 * Tue Oct 29 2013 Jaroslav Škarvada <jskarvad at redhat.com> - 2.4-6
 - Fixed some possible unregistered parameters errors
-  Resolve: rhbz#947425
+  Resolves: rhbz#947425
 
 * Thu Oct 10 2013 Jaroslav Škarvada <jskarvad at redhat.com> - 2.4-5
 - New version of unlimit-fds patch
diff --git a/sources b/sources
index 4d4d02b..9598d8a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3aa686bb245d6683b86cba9a6a4b8c6d  powertop-2.4.tar.gz
+806bbcbd44fcea1f807c9582fc1f7d3e  powertop-2.5.tar.gz