[htop] - Update to 0.9 - Clean specfile, remove Polish translations, unused patches

Sat Mar 5 13:28:36 UTC 2011

commit fd0de132ad8491d6a6a6d1af4690a97b5224da22
Author: Milos Jakubicek <xjakub at fi.muni.cz>
Date:   Sat Mar 5 14:28:01 2011 +0100

    - Update to 0.9
    - Clean specfile, remove Polish translations, unused patches

 htop-0.8.1-nonprint.patch                          |   11 ---
 htop-0.8.1-processlist.patch                       |   15 ----
 htop-0.8.2-arrays.patch                            |   71 --------------------
 ...system-plpa.patch => htop-0.9-system-plpa.patch |   47 +++++++------
 htop.spec                                          |   24 ++-----
 5 files changed, 32 insertions(+), 136 deletions(-)
---

diff --git a/htop-0.8.3-system-plpa.patch b/htop-0.9-system-plpa.patch
similarity index 63%
rename from htop-0.8.3-system-plpa.patch
rename to htop-0.9-system-plpa.patch
index 1407dfd..7422cad 100644
--- a/htop-0.8.3-system-plpa.patch
+++ b/htop-0.9-system-plpa.patch
@@ -2,43 +2,44 @@ diff -up htop-0.8.3/acinclude.m4.noplpa htop-0.8.3/acinclude.m4
 --- htop-0.8.3/acinclude.m4.noplpa	2010-03-04 15:35:47.457908679 -0500
 +++ htop-0.8.3/acinclude.m4	2010-03-04 15:35:50.721919708 -0500
 @@ -1 +0,0 @@
--m4_include(plpa-1.1/plpa.m4)
-diff -up htop-0.8.3/configure.ac.noplpa htop-0.8.3/configure.ac
---- htop-0.8.3/configure.ac.noplpa	2009-06-23 09:53:18.000000000 -0400
-+++ htop-0.8.3/configure.ac	2010-03-04 15:34:41.578909559 -0500
-@@ -97,12 +97,7 @@ fi
- AC_CHECK_FILE($PROCDIR/stat,,AC_MSG_ERROR(Cannot find /proc/stat. Make sure you have a Linux-compatible /proc filesystem mounted. See the file README for help.))
- 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.))
- 
--PLPA_INCLUDED(plpa-1.1)
--PLPA_INIT(plpa_happy=yes, plpa_happy=no)
--AM_CONDITIONAL([HAVE_PLPA], [test "$plpa_happy" = "yes"])
--if test "$plpa_happy" = "yes"; then
--   AC_DEFINE([HAVE_PLPA], [1], [Have plpa])
--fi
-+AC_CHECK_LIB([plpa], [plpa_sched_getaffinity], [], [missing_libraries="$missing_libraries libplpa"])
- 
- AC_CONFIG_FILES([Makefile htop.1])
- AC_OUTPUT
+-m4_include(plpa-1.3.2/plpa.m4)
 diff -up htop-0.8.3/Makefile.am.noplpa htop-0.8.3/Makefile.am
 --- htop-0.8.3/Makefile.am.noplpa	2009-06-02 15:17:57.000000000 -0400
 +++ htop-0.8.3/Makefile.am	2010-03-04 15:34:41.579909477 -0500
 @@ -1,8 +1,4 @@
  
 -if HAVE_PLPA
--SUBDIRS = plpa-1.1
+-SUBDIRS = plpa-1.3.2
 -endif
 -
+ ACLOCAL_AMFLAGS=-I m4
+
  bin_PROGRAMS = htop
- dist_man_MANS = htop.1
- EXTRA_DIST = $(dist_man_MANS) htop.desktop htop.png scripts/MakeHeader.py \
-@@ -37,9 +33,6 @@ SUFFIXES = .h
+@@ -35,9 +35,6 @@
  
  BUILT_SOURCES = $(myhtopheaders)
  htop_SOURCES = $(myhtopheaders) $(myhtopsources) config.h debug.h
 -if HAVE_PLPA
--htop_LDADD = $(top_builddir)/plpa-1.1/src/libplpa_included.la
+-htop_LDADD = $(top_builddir)/plpa-1.3.2/src/libplpa/libplpa_included.la
 -endif
  
  profile:
  	$(MAKE) all CFLAGS="-pg -O2"
+--- htop-0.9/configure.ac.orig	2011-03-05 13:45:09.000000000 +0100
++++ htop-0.9/configure.ac	2011-03-05 13:45:29.000000000 +0100
+@@ -104,14 +104,7 @@
+ AC_CHECK_FILE($PROCDIR/stat,,AC_MSG_ERROR(Cannot find /proc/stat. Make sure you have a Linux-compatible /proc filesystem mounted. See the file README for help.))
+ 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.))
+ 
+-AC_ARG_ENABLE(plpa, [AC_HELP_STRING([--enable-plpa], [enable PLPA support for CPU affinity])], ,enable_plpa="yes")
+-PLPA_INCLUDED
+-PLPA_INIT([plpa-1.3.2], [plpa_happy=yes], [plpa_happy=no])
+-AM_CONDITIONAL([HAVE_PLPA], [test "$plpa_happy" = "yes" && test "$enable_plpa" = "yes"])
+-if test "$plpa_happy" = "yes" && test "$enable_plpa" = "yes"
+-then
+-   AC_DEFINE([HAVE_PLPA], [1], [Have plpa])
+-fi
++AC_CHECK_LIB([plpa], [plpa_sched_getaffinity], [], [missing_libraries="$missing_libraries libplpa"])
+ 
+ AC_CONFIG_FILES([Makefile htop.1])
+ AC_OUTPUT
diff --git a/htop.spec b/htop.spec
index 3c1c904..11780b3 100644
--- a/htop.spec
+++ b/htop.spec
@@ -1,17 +1,14 @@
 Name:           htop
-Version:        0.8.3
-Release:        4%{?dist}
+Version:        0.9
+Release:        1%{?dist}
 Summary:        Interactive process viewer
-Summary(pl):    Interaktywna przeglądarka procesów
 
 Group:          Applications/System
 License:        GPL+
 URL:            http://htop.sourceforge.net/
 Source0:        http://download.sourceforge.net/htop/%{name}-%{version}.tar.gz
-#Patch0:         %{name}-0.8.1-nonprint.patch
-#Patch1:         %{name}-0.8.1-processlist.patch
-#Patch2:         %{name}-0.8.2-arrays.patch
-Patch3:         htop-0.8.3-system-plpa.patch
+# Use system plpa
+Patch3:         htop-0.9-system-plpa.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -21,19 +18,10 @@ BuildRequires:  ncurses-devel, python, libtool, plpa-devel
 htop is an interactive text-mode process viewer for Linux, similar to
 top(1).
 
-%description -l pl
-htop to interaktywna tekstowa przeglądarka procesów dla Linuksa podobna
-do top(1).
-
-
 %prep
 %setup -q
-#%patch0 -p0
-#%patch1 -p0
-#%patch2 -p0
 %patch3 -p1 -b .noplpa
 sed -i s#"INSTALL_DATA = @INSTALL_DATA@"#"INSTALL_DATA = @INSTALL_DATA@ -p"# Makefile.in
-#sed -i -e '2,3d' -e '9d' htop.desktop
 
 # We will use the plpa system copy instead.
 rm -rf plpa-1.1/
@@ -72,6 +60,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Mar 05 2011 Miloš Jakubíček <xjakub at fi.muni.cz> - 0.9-1
+- Update to 0.9
+- Clean specfile, remove Polish translations, unused patches
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
