use system plpa

htop-0.8.3-system-plpa.patch

@@ -0,0 +1,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
+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
+-endif
+-
+ 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
+ 
+ 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
+-endif
+ 
+ profile:
+ 	$(MAKE) all CFLAGS="-pg -O2"

htop.spec

@@ -1,6 +1,6 @@
 Name:           htop
 Version:        0.8.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Interactive process viewer
 Summary(pl):    Interaktywna przeglądarka procesów
 
@@ -11,10 +11,11 @@ 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
-BuildRequires:  ncurses-devel, python
+BuildRequires:  ncurses-devel, python, libtool, plpa-devel
 
 %description
 htop is an interactive text-mode process viewer for Linux, similar to
@@ -30,9 +31,14 @@ do top(1).
 #%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/
+autoreconf -i
+
 %build
 %configure
 make %{?_smp_mflags}
@@ -66,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Mar  4 2010 Tom "spot" Callaway <tcallawa@redhat.com> - 0.8.3-3
+- use plpa system copy instead of embedded one
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild