rpms/htop/F-8 .cvsignore, 1.8, 1.9 htop.spec, 1.11, 1.12 sources, 1.9, 1.10

[Rafał Psota (rafalzaq)]

Author: rafalzaq

Update of /cvs/extras/rpms/htop/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24374

Modified Files:
	.cvsignore htop.spec sources 
Log Message:
update to 0.7


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/htop/F-8/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	16 Dec 2006 20:09:25 -0000	1.8
+++ .cvsignore	11 Feb 2008 21:58:56 -0000	1.9
@@ -1 +1 @@
-htop-0.6.5.tar.gz
+htop-0.7.tar.gz


Index: htop.spec
===================================================================
RCS file: /cvs/extras/rpms/htop/F-8/htop.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- htop.spec	16 Dec 2006 20:09:25 -0000	1.11
+++ htop.spec	11 Feb 2008 21:58:56 -0000	1.12
@@ -1,10 +1,10 @@
 Name:           htop
-Version:        0.6.5
+Version:        0.7
 Release:        1%{?dist}
 Summary:        Interactive process viewer
 
 Group:          Applications/System
-License:        GPL
+License:        GPL+
 URL:            http://htop.sourceforge.net/
 Source0:        http://download.sourceforge.net/htop/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -19,39 +19,42 @@
 
 %prep
 %setup -q
-
+sed -i s#"INSTALL_DATA = @INSTALL_DATA@"#"INSTALL_DATA = @INSTALL_DATA@ -p"# Makefile.in
+sed -i -e '2,3d' -e '7d' htop.desktop
 
 %build
-%configure \
-        --disable-dependency-tracking
+%configure
 make %{?_smp_mflags}
 
 
 %install
-rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install \
-        --dir %{buildroot}%{_datadir}/applications \
+        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
         --vendor fedora \
         --delete-original \
-        %{buildroot}%{_datadir}/applications/htop.desktop
+        --remove-category=Applications \
+        $RPM_BUILD_ROOT%{_datadir}/applications/htop.desktop
 
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING ChangeLog README TODO
+%doc AUTHORS COPYING ChangeLog README TODO
 %{_bindir}/htop
-%{_datadir}/applications/*htop.desktop
+%{_datadir}/applications/fedora-htop.desktop
 %{_datadir}/pixmaps/htop.png
 %{_mandir}/man1/htop.1*
 
 
 %changelog
+* Mon Feb 11 2008 Rafał Psota <rafalzaq at gmail.com> - 0.7-1
+- update to 0.7
 * Sat Dec  9 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 0.6.5-1
 - Update to 0.6.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/htop/F-8/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	16 Dec 2006 20:09:25 -0000	1.9
+++ sources	11 Feb 2008 21:58:56 -0000	1.10
@@ -1 +1 @@
-180aa7c9db7106ed1197b1e408660a0e  htop-0.6.5.tar.gz
+4afc961fa709167e1b434682897991f9  htop-0.7.tar.gz