From 06c116d4ea11f5e301460b2970bfbd1296d1ac18 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 1 Apr 2011 14:33:58 +0900 Subject: [PATCH] use desktop-file-install; disable hscolour not haddock --- xmonad.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/xmonad.spec b/xmonad.spec index 1f5ca00..252ee34 100644 --- a/xmonad.spec +++ b/xmonad.spec @@ -1,6 +1,6 @@ %global pkg_name xmonad -%global without_haddock 1 +%global without_hscolour 1 %global common_summary A tiling window manager @@ -21,7 +21,7 @@ on several screens. Name: %{pkg_name} Version: 0.9.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A tiling window manager Group: User Interface/X @@ -65,7 +65,7 @@ cp -p %SOURCE4 . install -p -m 0644 -D man/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 install -p -m 0644 -D %SOURCE1 %{buildroot}%{_datadir}/xsessions/%{name}.desktop install -p -m 0755 -D %SOURCE2 %{buildroot}%{_bindir}/%{name}-start -install -p -m 0644 -D %SOURCE3 %{buildroot}%{_datadir}/applications/%{name}.desktop +desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE3} rm %{buildroot}%{_datadir}/%{name}-%{version}/man/xmonad.hs @@ -84,6 +84,10 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/man/xmonad.hs %changelog +* Fri Apr 1 2011 Jens Petersen - 0.9.2-5 +- use desktop-file-install to install xmonad.desktop correctly +- really disable hscolour not haddock + * Fri Mar 11 2011 Jens Petersen - 0.9.2-4 - disable hscolour for now to build