rpms/htop/EL-4 htop.spec,1.19,1.20

[Adam Miller]

Author: maxamillion

Update of /cvs/extras/rpms/htop/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16807

Modified Files:
	htop.spec 
Log Message:
- "htop aborts after hitting F6 key" fixed (#504795)
- Arrays patch from upstream, patch and build for EPEL




Index: htop.spec
===================================================================
RCS file: /cvs/extras/rpms/htop/EL-4/htop.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- htop.spec	3 Jun 2009 18:54:36 -0000	1.19
+++ htop.spec	18 Jun 2009 21:28:21 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           htop
 Version:        0.8.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Interactive process viewer
 Summary(pl):    Interaktywna przeglądarka procesów
 
@@ -10,6 +10,7 @@ URL:            http://htop.sourceforge.
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 BuildRequires:  desktop-file-utils
@@ -28,6 +29,7 @@ do top(1).
 %setup -q
 #%patch0 -p0 
 #%patch1 -p0
+%patch2 -p0
 sed -i s#"INSTALL_DATA = @INSTALL_DATA@"#"INSTALL_DATA = @INSTALL_DATA@ -p"# Makefile.in
 #sed -i -e '2,3d' -e '9d' htop.desktop
 
@@ -47,8 +49,8 @@ desktop-file-install \
         $RPM_BUILD_ROOT%{_datadir}/applications/htop.desktop
 
 #remove empty directories
-rm -rf $RPM_BUILD_ROOT%{prefix}/lib
-rm -rf $RPM_BUILD_ROOT%{prefix}/include
+rm -rf $RPM_BUILD_ROOT%{libdir}
+rm -rf $RPM_BUILD_ROOT%{includedir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -64,6 +66,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jun 18 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.8.2-2
+- "htop aborts after hitting F6 key" fixed (#504795)
+- Arrays patch from upstream, patch and build for EPEL
+
 * Tue Jun 02 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.8.2-1
 - New release, build for EPEL