[powertop] New version

[Jaroslav Škarvada]

commit d449850aad481cb9928fe6a9947b2bb536f89ab7
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Thu Aug 16 13:37:51 2012 +0200

    New version
    
    - Removed patches (all upstreamed): show-watts-only-if-discharging,
      valid-html-output, factor-out-powertop-init, catch-fstream-errors

 .gitignore                                        |    1 +
 powertop-2.0-catch-fstream-errors.patch           |   98 ----
 powertop-2.0-factor-out-powertop-init.patch       |  199 -------
 powertop-2.0-show-watts-only-if-discharging.patch |   12 -
 powertop-2.0-valid-html-output.patch              |  640 ---------------------
 powertop.spec                                     |   29 +-
 sources                                           |    2 +-
 7 files changed, 12 insertions(+), 969 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2d01509..a25a40f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 powertop-*.tar.bz2
+/powertop-2.1.tar.gz
diff --git a/powertop.spec b/powertop.spec
index 1c2fd4e..61f70a6 100644
--- a/powertop.spec
+++ b/powertop.spec
@@ -1,26 +1,18 @@
 Name:          powertop
-Version:       2.0
-Release:       4%{?dist}
+Version:       2.1
+Release:       1%{?dist}
 Summary:       Power consumption monitor
 
 Group:         Applications/System
 License:       GPLv2
 URL:           http://01.org/powertop/
-Source0:       http://01.org/powertop/sites/default/files/downloads/%{name}-%{version}.tar.bz2
+Source0:       http://01.org/powertop/sites/default/files/downloads/%{name}-%{version}.tar.gz
 
 # Sent upstream
 Patch0:        powertop-2.0-always-create-params.patch
 Patch1:        powertop-2.0-html-escape.patch
-# Sent upstream
-Patch2:        powertop-2.0-show-watts-only-if-discharging.patch
-# Sent upstream
-Patch3:        powertop-2.0-valid-html-output.patch
-# Patch for rhbz#823502, backported from upstream
-Patch4:        powertop-2.0-factor-out-powertop-init.patch
-# Patch for rhbz#832497, backported from upstream
-Patch5:        powertop-2.0-catch-fstream-errors.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gettext, ncurses-devel, pciutils-devel, zlib-devel, libnl-devel
+BuildRequires: gettext, ncurses-devel, pciutils-devel, zlib-devel, libnl3-devel
 
 %description
 PowerTOP is a tool that finds the software component(s) that make your
@@ -30,10 +22,6 @@ computer use more power than necessary while it is idle.
 %setup -q
 %patch0 -p1 -b .always-create-params
 %patch1 -p1 -b .html-escape
-%patch2 -p1 -b .show-watts-only-if-discharging
-%patch3 -p1 -b .valid-html-output
-%patch4 -p1 -b .factor-out-powertop-init
-%patch5 -p1 -b .catch-fstream-errors
 
 %build
 %configure
@@ -54,17 +42,20 @@ touch %{_localstatedir}/cache/powertop/{saved_parameters.powertop,saved_results.
 rm -rf %{buildroot}
 
 %files -f %{name}.lang
-%files
 %defattr(-,root,root,-)
 %doc COPYING README TODO
 %dir %{_localstatedir}/cache/powertop
 %ghost %{_localstatedir}/cache/powertop/saved_parameters.powertop
 %ghost %{_localstatedir}/cache/powertop/saved_results.powertop
 %{_sbindir}/powertop
-# No man page yet.
-#%{_mandir}/man8/powertop.8*
+%{_mandir}/man8/powertop.8*
 
 %changelog
+* Thu Aug 16 2012 Jaroslav Škarvada <jskarvad at redhat.com> - 2.1-1
+- New version
+- Removed patches (all upstreamed): show-watts-only-if-discharging,
+  valid-html-output, factor-out-powertop-init, catch-fstream-errors
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 38ab083..706e1da 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8f27e2b0bf1c68b1f5a9a98294238bb2  powertop-2.0.tar.bz2
+069b6b81d1bdddcc350797b1d87484c3  powertop-2.1.tar.gz