rpms/htop/F-13 htop.spec,1.23,1.24

Tom Callaway spot at fedoraproject.org
Thu Mar 4 20:41:08 UTC 2010


Author: spot

Update of /cvs/pkgs/rpms/htop/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3893/F-13

Modified Files:
	htop.spec 
Log Message:
use system plpa


Index: htop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/htop/F-13/htop.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- htop.spec	25 Jul 2009 02:16:37 -0000	1.23
+++ htop.spec	4 Mar 2010 20:41:08 -0000	1.24
@@ -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.sourcefo
 #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 at redhat.com> - 0.8.3-3
+- use plpa system copy instead of embedded one
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



More information about the scm-commits mailing list