[htop/el6] Now with specfile goodness

[Adam Miller]

commit b1181c2b736f3ac993c519fa023891ef3d579d8d
Author: Adam Miller <maxamillion at fedoraproject.org>
Date:   Fri Aug 17 16:00:54 2012 -0500

    Now with specfile goodness

 htop.spec |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/htop.spec b/htop.spec
index 55c91d3..b837fae 100644
--- a/htop.spec
+++ b/htop.spec
@@ -1,6 +1,6 @@
 Name:           htop
 Version:        1.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Interactive process viewer
 
 Group:          Applications/System
@@ -40,17 +40,26 @@ rm -rf $RPM_BUILD_ROOT%{libdir}
 rm -rf $RPM_BUILD_ROOT%{includedir}
 
 # remove desktop file
-rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/
+desktop-file-install \
+        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+        --vendor fedora \
+        --delete-original \
+        $RPM_BUILD_ROOT%{_datadir}/applications/htop.desktop
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
 %{_bindir}/htop
+%{_datadir}/applications/fedora-htop.desktop
 %{_datadir}/pixmaps/htop.png
 %{_mandir}/man1/htop.1*
 
 
 %changelog
+* Fri Aug 17 2012 Adam Miller <maxamillion at fedoraproject.org> - 1.0.1-2
+- Rebase on Fedora pkg upon user request
+- Keep desktop-file (removed in Fedora for BZ#689028)
+
 * Tue Jul 10 2012 Miloš Jakubíček <xjakub at fi.muni.cz> - 1.0.1-1
 - Update to 1.0.1
 - Should resolve BZ#782272, BZ#815995, BZ#835221