[xmonad/f13/master: 10/10] backport desktop support from F14

[Jens Petersen]

commit 6747303ca5b0ca6be972f0da07c9034ddd9c0906
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Sep 17 12:24:44 2010 +1000

    backport desktop support from F14
    
    - add application desktop file for gnome-session to find xmonad
      so setting /desktop/gnome/session/required_components/windowmanager now works
    - move display of manpage for new users from xmonad.hs to xmonad-start
      and only display it when no ~/.xmonad/
    - drop skel file and dont create ~/.xmonad by default
    - update to latest ghc-rpm-macros and add hscolour (cabal2spec-0.22.2)

 xmonad-dynamic-link.patch |   12 ------------
 xmonad.spec               |   21 +++++----------------
 2 files changed, 5 insertions(+), 28 deletions(-)
---
diff --git a/xmonad.spec b/xmonad.spec
index 8a560e9..992bfc7 100644
--- a/xmonad.spec
+++ b/xmonad.spec
@@ -22,7 +22,7 @@ on several screens.
 
 Name:           %{pkg_name}
 Version:        0.9.1
-Release:        6%{?dist}
+Release:        5.1%{?dist}
 Summary:        A tiling window manager
 
 Group:          User Interface/X
@@ -34,11 +34,10 @@ Source1:        xmonad-session.desktop
 Source2:        xmonad-start
 Source3:        xmonad.desktop
 Source4:        README.fedora
-Patch1:         xmonad-dynamic-link.patch
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
 BuildRequires:  ghc, ghc-doc, ghc-prof
-BuildRequires:  ghc-rpm-macros >= 0.8.1
+BuildRequires:  ghc-rpm-macros >= 0.7.2
 %if %{with hscolour}
 BuildRequires:  hscolour
 %endif
@@ -55,7 +54,6 @@ Requires:       xorg-x11-apps
 
 %prep
 %setup -q
-%patch1 -p1 -b .orig
 cp -p %SOURCE4 .
 
 
@@ -89,26 +87,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xsessions/%{name}.desktop
 
 
-%ghc_binlib_package -o 0.9.1-5
+%ghc_binlib_package
 
 
 %changelog
-* Sun Sep 12 2010 Jens Petersen <petersen at redhat.com> - 0.9.1-6
+* Fri Sep 17 2010 Jens Petersen <petersen at redhat.com> - 0.9.1-5.1
 - add application desktop file for gnome-session to find xmonad
   so setting /desktop/gnome/session/required_components/windowmanager now works
-- add xmonad-dynamic-link.patch to dynamically link customized xmonad
 - move display of manpage for new users from xmonad.hs to xmonad-start
   and only display it when no ~/.xmonad/
 - drop skel file and dont create ~/.xmonad by default
-
-* Sat Sep  4 2010 Jens Petersen <petersen at redhat.com> - 0.9.1-5
-- update to ghc-rpm-macros-0.8.1, hscolour and drop doc pkg (cabal2spec-0.22.2)
-
-* Fri Jun 25 2010 Jens Petersen <petersen at redhat.com> - 0.9.1-4
-- strip dynamic files (cabal2spec-0.21.4)
-
-* Tue Apr 27 2010 Jens Petersen <petersen at redhat.com> - 0.9.1-3
-- rebuild against ghc-6.12.2
+- update to latest ghc-rpm-macros and add hscolour (cabal2spec-0.22.2)
 
 * Wed Jan 13 2010 Jens Petersen <petersen at redhat.com> - 0.9.1-2
 - rebuild against ghc-mtl package