[htop] Clean up spec to match current guidelines Drop desktop file. Resolves rhbz#689028

Rahul Sundaram sundaram at fedoraproject.org
Sat Mar 19 06:35:49 UTC 2011


commit c0cd99ad56270f35e3a0df77d840b06181e4b7d6
Author: Rahul <sundaram at fedoraproject.org>
Date:   Sat Mar 19 12:14:01 2011 +0530

    Clean up spec to match current guidelines
    Drop desktop file. Resolves rhbz#689028

 htop.spec |   21 +++++++--------------
 1 files changed, 7 insertions(+), 14 deletions(-)
---
diff --git a/htop.spec b/htop.spec
index 11780b3..32e9a39 100644
--- a/htop.spec
+++ b/htop.spec
@@ -1,6 +1,6 @@
 Name:           htop
 Version:        0.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Interactive process viewer
 
 Group:          Applications/System
@@ -9,9 +9,7 @@ URL:            http://htop.sourceforge.net/
 Source0:        http://download.sourceforge.net/htop/%{name}-%{version}.tar.gz
 # Use system plpa
 Patch3:         htop-0.9-system-plpa.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  desktop-file-utils
 BuildRequires:  ncurses-devel, python, libtool, plpa-devel
 
 %description
@@ -31,35 +29,30 @@ autoreconf -i
 %configure
 make %{?_smp_mflags}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install \
-        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-        --vendor fedora \
-        --delete-original \
-        $RPM_BUILD_ROOT%{_datadir}/applications/htop.desktop
-
 #remove empty direcories
 rm -rf $RPM_BUILD_ROOT%{libdir}
 rm -rf $RPM_BUILD_ROOT%{includedir}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
+# remove desktop file
+rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
 %{_bindir}/htop
-%{_datadir}/applications/fedora-htop.desktop
 %{_datadir}/pixmaps/htop.png
 %{_mandir}/man1/htop.1*
 
 
 %changelog
+* Sat Mar 19 2011 Rahul Sundaram <sundaram at fedoraproject.org> - 0.9-2
+- Clean up spec to match current guidelines
+- Drop desktop file. Resolves rhbz#689028
+
 * 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


More information about the scm-commits mailing list