Accepting request 234764 from home:Dmitry_R:branches:Base:System

- Update to version 1.0.3
  * Tag all children ('c' key)
  * Fixes in accounting of guest time when using virtualization
  * Performance improvements
  * Further performance improvements due to conditional parsing
    of IO data depending on selected fields.
  * Better consistency in coloring.
  * Increase limit of buffer when tracing a deep nested process tree.
  * Display pagefault stats.
  * BUGFIX: Fix crash when adding meters and toggling detailed CPU time.
  * Add column to track the OOM-killer score of processes
  * Rebase htop-stdgnu.patch

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

htop-1.0.2.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ee60657b044ece0df096c053060df7abf3cce3a568ab34d260049e6a37ccd8a1
-size 388499

htop-1.0.3.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:055c57927f75847fdc222b5258b079a9542811a9dcf5421c615c7e17f55d1829
+size 399306

htop-stdgnu.patch

@@ -1,12 +1,29 @@
---- htop-1.0.2.orig/configure.ac
+Index: htop-1.0.3/Makefile.am
-+++ htop-1.0.2/configure.ac
+===================================================================
+--- htop-1.0.3.orig/Makefile.am
++++ htop-1.0.3/Makefile.am
+@@ -10,8 +10,8 @@ applications_DATA = htop.desktop
+ pixmapdir = $(datadir)/pixmaps
+ pixmap_DATA = htop.png
+ 
+-htop_CFLAGS = -pedantic -Wall -Wextra -std=c99 -rdynamic -D_XOPEN_SOURCE_EXTENDED -DSYSCONFDIR=\"$(sysconfdir)\"
+-AM_CPPFLAGS = -DNDEBUG
++htop_CFLAGS = -Wall -Wextra -DSYSCONFDIR=\"$(sysconfdir)\"
++AM_CPPFLAGS = -include config.h -DNDEBUG
+ 
+ myhtopsources = AvailableMetersPanel.c CategoriesPanel.c CheckItem.c \
+ ClockMeter.c ColorsPanel.c ColumnsPanel.c CPUMeter.c CRT.c \
+Index: htop-1.0.3/configure.ac
+===================================================================
+--- htop-1.0.3.orig/configure.ac
++++ htop-1.0.3/configure.ac
 @@ -1,11 +1,12 @@
  #                                               -*- Autoconf -*-
  # Process this file with autoconf to produce a configure script.
  
 -AC_PREREQ(2.65)
-+AC_PREREQ([2.60])
++AC_PREREQ([2.65])
- AC_INIT([htop],[1.0.2],[loderunner@users.sourceforge.net])
+ AC_INIT([htop],[1.0.3],[hisham@gobolinux.org])
  
  # The following two lines are required by hwloc scripts
  AC_USE_SYSTEM_EXTENSIONS
@@ -14,7 +31,7 @@
  AC_CANONICAL_TARGET
  
  AM_INIT_AUTOMAKE([1.11])
-@@ -14,15 +15,15 @@ AC_CONFIG_HEADER([config.h])
+@@ -14,15 +15,14 @@ AC_CONFIG_HEADER([config.h])
  AC_CONFIG_MACRO_DIR([m4])
  
  # Checks for programs.
@@ -27,17 +44,16 @@
 -AC_PROG_LIBTOOL
 +#AC_DISABLE_SHARED
 +#AC_ENABLE_STATIC
-+#LT_INIT
++#AC_PROG_LIBTOOL
  
 -# Checks for libraries.
 -AC_CHECK_LIB([m], [ceil], [], [missing_libraries="$missing_libraries libm"])
-+
 +AC_SEARCH_LIBS([ceil], [m])
  
  # Checks for header files.
  AC_HEADER_DIRENT
-@@ -30,7 +31,7 @@ AC_HEADER_STDC
+@@ -30,7 +30,7 @@ AC_HEADER_STDC
- AC_CHECK_HEADERS([stdlib.h string.h strings.h sys/param.h sys/time.h unistd.h curses.h],[:],[
+ AC_CHECK_HEADERS([stdlib.h string.h strings.h sys/param.h sys/time.h unistd.h],[:],[
    missing_headers="$missing_headers $ac_header"
  ])
 -AC_CHECK_HEADERS([execinfo.h],[:],[:])
@@ -45,14 +61,14 @@
  
  # Checks for typedefs, structures, and compiler characteristics.
  AC_HEADER_STDBOOL
-@@ -40,17 +41,9 @@ AC_TYPE_UID_T
+@@ -40,17 +40,8 @@ AC_TYPE_UID_T
  
  # Checks for library functions.
  AC_FUNC_CLOSEDIR_VOID
 -AC_TYPE_SIGNAL
--AC_FUNC_STAT
+ AC_FUNC_STAT
 -AC_CHECK_FUNCS([memmove strncasecmp strstr strdup])
- 
+-
 -save_cflags="${CFLAGS}"
 -CFLAGS="${CFLAGS} -std=c99"
 -AC_MSG_CHECKING([whether gcc -std=c99 option works])
@@ -60,12 +76,11 @@
 -   AC_MSG_RESULT([yes]),
 -   AC_MSG_ERROR([htop is written in C99. A newer version of gcc is required.]))
 -CFLAGS="$save_cflags"
-+AC_FUNC_STAT
 +AC_CHECK_FUNCS_ONCE([memmove strncasecmp strstr strdup])
  
  PROCDIR=/proc
  AC_ARG_WITH(proc, [  --with-proc=DIR      Location of a Linux-compatible proc filesystem (default=/proc).],
-@@ -61,33 +54,33 @@ AC_ARG_WITH(proc, [  --with-proc=DIR
+@@ -61,33 +52,33 @@ AC_ARG_WITH(proc, [  --with-proc=DIR
     fi,
     AC_DEFINE(PROCDIR, "/proc", [Path of proc filesystem]))
  
@@ -105,7 +120,7 @@
  if test "x$enable_unicode" = xyes; then
     AC_CHECK_LIB([ncursesw], [refresh], [], [
        missing_libraries="$missing_libraries libncursesw"
-@@ -113,7 +106,7 @@ AC_CHECK_FILE($PROCDIR/stat,,AC_MSG_ERRO
+@@ -117,7 +108,7 @@ AC_CHECK_FILE($PROCDIR/stat,,AC_MSG_ERRO
  AC_CHECK_FILE($PROCDIR/meminfo,,AC_MSG_ERROR(Cannot find /proc/meminfo. Make sure you have a Linux-compatible /proc filesystem mounted. See the file README for help.))
  fi
  
@@ -114,7 +129,7 @@
  if test "x$enable_native_affinity" = xyes -a "x$cross_compiling" = xno; then
     AC_MSG_CHECKING([for usable sched_setaffinity])
     AC_RUN_IFELSE([
-@@ -134,7 +127,7 @@ if test "x$enable_native_affinity" = xye
+@@ -138,14 +129,14 @@ if test "x$enable_native_affinity" = xye
     AC_DEFINE(HAVE_NATIVE_AFFINITY, 1, [Define if native sched_setaffinity and sched_getaffinity are to be used.])
  fi
  
@@ -123,16 +138,11 @@
  if test "x$enable_hwloc" = xyes
  then
     AC_CHECK_LIB([hwloc], [hwloc_linux_get_tid_cpubind], [], [missing_libraries="$missing_libraries libhwloc"])
---- htop-1.0.2.orig/Makefile.am
+    AC_CHECK_HEADERS([hwloc.h],[:], [missing_headers="$missing_headers $ac_header"])
-+++ htop-1.0.2/Makefile.am
+ fi
-@@ -10,8 +10,8 @@ applications_DATA = htop.desktop
- pixmapdir = $(datadir)/pixmaps
- pixmap_DATA = htop.png
  
--htop_CFLAGS = -pedantic -Wall -Wextra -std=c99 -rdynamic -D_XOPEN_SOURCE_EXTENDED -DSYSCONFDIR=\"$(sysconfdir)\"
+-AC_ARG_ENABLE(oom, [AC_HELP_STRING([--enable-oom], [enable OOM score reporting])], ,enable_oom="no")
--AM_CPPFLAGS = -DNDEBUG
++AC_ARG_ENABLE(oom, [AS_HELP_STRING([--enable-oom],[enable OOM score reporting])], ,enable_oom="no")
-+htop_CFLAGS = -Wall -Wextra -DSYSCONFDIR=\"$(sysconfdir)\"
+ if test "x$enable_oom" = xyes; then
-+AM_CPPFLAGS = -include config.h -DNDEBUG
+     AC_DEFINE(HAVE_OOM, 1, [Define if OOM score support enabled.])
- 
+ fi
- myhtopsources = AvailableMetersPanel.c CategoriesPanel.c CheckItem.c \
- ClockMeter.c ColorsPanel.c ColumnsPanel.c CPUMeter.c CRT.c \

htop.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Mon May 19 18:57:58 UTC 2014 - dmitry_r@opensuse.org
+
+- Update to version 1.0.3
+  * Tag all children ('c' key)
+  * Fixes in accounting of guest time when using virtualization
+  * Performance improvements
+  * Further performance improvements due to conditional parsing
+    of IO data depending on selected fields.
+  * Better consistency in coloring.
+  * Increase limit of buffer when tracing a deep nested process tree.
+  * Display pagefault stats.
+  * BUGFIX: Fix crash when adding meters and toggling detailed CPU time.
+  * Add column to track the OOM-killer score of processes
+  * Rebase htop-stdgnu.patch
+
 -------------------------------------------------------------------
 Thu Dec 26 21:02:27 UTC 2013 - crrodriguez@opensuse.org
 

htop.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package htop
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,14 +17,13 @@
 
 
 Name:           htop
-Version:        1.0.2
+Version:        1.0.3
 Release:        0
 Summary:        An Interactive text-mode Process Viewer for Linux
 License:        GPL-2.0+
 Group:          System/Monitoring
-Url:            http://htop.sourceforge.net
+Url:            http://hisham.hm/htop
-
+Source0:        http://hisham.hm/htop/releases/%{version}/%{name}-%{version}.tar.gz
-Source0:        %{name}-%{version}.tar.gz
 Patch0:         htop-desktop-file-fix-thoenig-01.patch
 Patch1:         htop-stdgnu.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build