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 - 0.9-2 +- Clean up spec to match current guidelines +- Drop desktop file. Resolves rhbz#689028 + * Sat Mar 05 2011 Miloš Jakubíček - 0.9-1 - Update to 0.9 - Clean specfile, remove Polish translations, unused patches