From af3e5b5050b216d967711e0d940c4ee68d97ea3c Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@vicerveza.homeunix.net>
Date: Fri, 18 Mar 2011 20:44:35 +0000
Subject: Updating powertop.

svn path=/nixpkgs/trunk/; revision=26426
---
 pkgs/os-specific/linux/powertop/default.nix         |  8 ++++----
 pkgs/os-specific/linux/powertop/powertop-1.13.patch | 15 +++++++++++++++
 pkgs/os-specific/linux/powertop/powertop-1.8.patch  | 13 -------------
 3 files changed, 19 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/os-specific/linux/powertop/powertop-1.13.patch
 delete mode 100644 pkgs/os-specific/linux/powertop/powertop-1.8.patch

diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix
index ca04fc49d144..aaa7d6f04e09 100644
--- a/pkgs/os-specific/linux/powertop/default.nix
+++ b/pkgs/os-specific/linux/powertop/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, ncurses, gettext}:
 
 stdenv.mkDerivation {
-  name = "powertop-1.11";
+  name = "powertop-1.13";
   src = fetchurl {
-    url = http://www.lesswatts.org/projects/powertop/download/powertop-1.11.tar.gz;
-    sha256 = "1wl0c7sav5rf7andnx704vs3n5gj2b5g1adx8zjfbbgvwm9wrrvh";
+    url = http://www.lesswatts.org/projects/powertop/download/powertop-1.13.tar.gz;
+    sha256 = "164dqp6msdaxpi2bmvwawasyrf1sfvanlc9ddp97v1wnjh46dj1b";
   };
-  patches = [./powertop-1.8.patch];
+  patches = [./powertop-1.13.patch];
   buildInputs = [ncurses gettext];
 }
diff --git a/pkgs/os-specific/linux/powertop/powertop-1.13.patch b/pkgs/os-specific/linux/powertop/powertop-1.13.patch
new file mode 100644
index 000000000000..d8a7d546c54c
--- /dev/null
+++ b/pkgs/os-specific/linux/powertop/powertop-1.13.patch
@@ -0,0 +1,15 @@
+diff -ru powertop-1.13/Makefile powertop-1.13.new/Makefile
+--- powertop-1.13/Makefile
++++ powertop-1.13.new/Makefile
+@@ -1,6 +1,6 @@
+ VERSION = 1.13
+ 
+-BINDIR=/usr/bin
+-LOCALESDIR=/usr/share/locale
+-MANDIR=/usr/share/man/man8
++BINDIR=${out}/bin
++LOCALESDIR=${out}/share/locale
++MANDIR=${out}/share/man/man8
+ WARNFLAGS=-Wall  -W -Wshadow -W -Wformat -Wimplicit-function-declaration -Wimplicit-int
+ CFLAGS?=-Os -g ${WARNFLAGS}
+ CC?=gcc
diff --git a/pkgs/os-specific/linux/powertop/powertop-1.8.patch b/pkgs/os-specific/linux/powertop/powertop-1.8.patch
deleted file mode 100644
index 0a0d0e553822..000000000000
--- a/pkgs/os-specific/linux/powertop/powertop-1.8.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru powertop-1.8/Makefile powertop-1.8.new/Makefile
---- powertop-1.8/Makefile	2007-08-19 19:43:08.000000000 +0200
-+++ powertop-1.8.new/Makefile	2007-09-23 12:54:59.000000000 +0200
-@@ -1,6 +1,6 @@
--BINDIR=/usr/bin
--LOCALESDIR=/usr/share/locale
--MANDIR=/usr/share/man/man1
-+BINDIR=${out}/bin
-+LOCALESDIR=${out}/share/locale
-+MANDIR=${out}/share/man/man1
- WARNFLAGS=-Wall  -W -Wshadow
- CFLAGS?=-Os -g ${WARNFLAGS}
- CC?=gcc
-- 
cgit 1.4.1