From 90e2ae311272b7cb1aebc247119ac63240d1ca9d143056fbc106d8d2869f32b9 Mon Sep 17 00:00:00 2001
From: OBS User buildservice-autocommit <null@suse.de>
Date: Tue, 2 Nov 2010 13:40:52 +0000
Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/htop revision
 15.0

OBS-URL: https://build.opensuse.org/package/show/Base:System/htop?expand=0&rev=52d68323e6bd054e0fcc5d19c87bc62a

From a0d7897455656f638d3b9f957eb21f49de4476f592dcede82814ecc96215335c Mon Sep 17 00:00:00 2001
From: Petr Uzel <puzel@suse.com>
Date: Mon, 29 Nov 2010 10:16:12 +0000
Subject: [PATCH 2/2] update to htop-0.9

OBS-URL: https://build.opensuse.org/package/show/Base:System/htop?expand=0&rev=10
---
 htop-0.8.3.tar.bz2                  |  3 ---
 htop-0.9.tar.bz2                    |  3 +++
 htop-non-printable-characters.patch | 17 -----------------
 htop.changes                        | 23 +++++++++++++++++++++++
 htop.spec                           | 11 +++++------
 5 files changed, 31 insertions(+), 26 deletions(-)
 delete mode 100644 htop-0.8.3.tar.bz2
 create mode 100644 htop-0.9.tar.bz2
 delete mode 100644 htop-non-printable-characters.patch

diff --git a/htop-0.8.3.tar.bz2 b/htop-0.8.3.tar.bz2
deleted file mode 100644
index ddd3abd..0000000
--- a/htop-0.8.3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ac4cc48cefda0703297a5ec8e1969f831524b378408279c2b8f9490dce91ba52
-size 296281
diff --git a/htop-0.9.tar.bz2 b/htop-0.9.tar.bz2
new file mode 100644
index 0000000..a4db4f6
--- /dev/null
+++ b/htop-0.9.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9a54594f142e270edf02bb3473362bae1f5f5415714a9492062fccb04e1f7f1d
+size 335451
diff --git a/htop-non-printable-characters.patch b/htop-non-printable-characters.patch
deleted file mode 100644
index 3bc6b46..0000000
--- a/htop-non-printable-characters.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: htop-0.8.1/RichString.c
-===================================================================
---- htop-0.8.1.orig/RichString.c
-+++ htop-0.8.1/RichString.c
-@@ -56,11 +56,11 @@ inline void RichString_appendn(RichStrin
-    if (len<0)
-       return;
-    int last = MIN(RICHSTRING_MAXLEN - 1, len + this->len);
-    for (int i = this->len, j = 0; i < last; i++, j++) {
-       memset(&this->chstr[i], 0, sizeof(this->chstr[i]));
--      this->chstr[i].chars[0] = data[j];
-+      this->chstr[i].chars[0] = (data[j] > 31) ? data[j] : '?';
-       this->chstr[i].attr = attrs;
-    }
-    this->chstr[last].chars[0] = 0;
-    this->len = last;
- }
diff --git a/htop.changes b/htop.changes
index c7f48d7..00eff8a 100644
--- a/htop.changes
+++ b/htop.changes
@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Mon Nov 29 09:54:23 UTC 2010 - puzel@novell.com
+
+- update to htop-0.9
+  * Add support for "steal"/guest CPU time measurement
+    in virtualization environments
+  * Expand and collapse subtrees using '+' and '-' when in tree-view
+  * Support for cgroups
+  * Show custom thread names
+  * Add support for STARTTIME field
+  * Upgrade PLPA to version 1.3.2
+  * Fix license terms with regard to PLPA
+  * getopt-based long options and --no-color
+  * BUGFIX: Fix display of nan% in CPU meters
+  * BUGFIX: Fix memory leak
+  * Add Bash/emacs style navigation keys
+  * Improve battery meter support
+  * BUGFIX: Fix IO-wait color in "Black on White" scheme
+  * BUGFIX: Fix search by process name when list is filtered by
+    user.
+  * BUGFIX: Fix alignment for display of memory values above 100G
+- drop htop-non-printable-characters.patch (in upstream)
+
 -------------------------------------------------------------------
 Sun Oct 31 12:37:02 UTC 2010 - jengelh@medozas.de
 
diff --git a/htop.spec b/htop.spec
index 629312f..bb0062a 100644
--- a/htop.spec
+++ b/htop.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package htop (Version 0.8.3)
+# spec file for package htop (Version 0.9)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -21,13 +21,12 @@
 Name:           htop
 Url:            http://htop.sourceforge.net
 Summary:        An Interactive text-mode Process Viewer for Linux
-Version:        0.8.3
+Version:        0.9
 Release:        9
 License:        GPLv2+
 Group:          System/Monitoring
 Source0:        %{name}-%{version}.tar.bz2
-Patch0:         %{name}-desktop-file-fix-thoenig-01.patch
-Patch1:         %{name}-non-printable-characters.patch
+Patch0:         htop-desktop-file-fix-thoenig-01.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  ncurses-devel python
 BuildRequires:  update-desktop-files
@@ -50,11 +49,11 @@ Authors:
 %prep
 %setup
 %patch0 -p0
-%patch1 -p1
 
 %build
 %configure \
-	--enable-taskstats			
+	--enable-taskstats \
+	--enable-cgroup
 make %{?_smp_mflags}
 
 %install