From d428e7f016912a3e8c7de970fe9fcb43193ef63b Mon Sep 17 00:00:00 2001
From: Yaakov Meir Nemoy <ynemoy@fedoraproject.org>
Date: Wed, 6 May 2009 21:48:56 +0000
Subject: [PATCH] Applies patches from Jens as part of the review

---
 manpage.patch => xmonad-config-manpage.patch |  6 +++---
 xmonad.desktop                               |  2 +-
 xmonad.spec                                  | 15 +++++++++++----
 3 files changed, 15 insertions(+), 8 deletions(-)
 rename manpage.patch => xmonad-config-manpage.patch (64%)

diff --git a/manpage.patch b/xmonad-config-manpage.patch
similarity index 64%
rename from manpage.patch
rename to xmonad-config-manpage.patch
index 671ea98..7384e41 100644
--- a/manpage.patch
+++ b/xmonad-config-manpage.patch
@@ -1,6 +1,6 @@
-diff -r -u -X /home/yankee/Projekten/fedora-devshell/diff.excludes .pkg_src/branches/xmonad-0.8.1_orig/man/xmonad.hs ./man/xmonad.hs
---- .pkg_src/branches/xmonad-0.8.1_orig/man/xmonad.hs	2009-01-16 17:47:27.000000000 -0500
-+++ ./man/xmonad.hs	2009-04-27 18:31:12.195829219 -0400
+diff -r -u -X /home/yankee/Projekten/fedora-devshell/diff.excludes xmonad-0.8.1_orig/man/xmonad.hs xmonad-0.8.1/man/xmonad.hs
+--- xmonad-0.8.1_orig/man/xmonad.hs	2009-01-16 17:47:27.000000000 -0500
++++ xmonad-0.8.1/man/xmonad.hs	2009-04-27 18:31:12.195829219 -0400
 @@ -246,7 +246,8 @@
  
  -- Run xmonad with the settings you specify. No need to modify this.
diff --git a/xmonad.desktop b/xmonad.desktop
index 57cd514..799d921 100644
--- a/xmonad.desktop
+++ b/xmonad.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=xmonad-start
+Name=xmonad
 Comment=Tiling window manager
 Exec=xmonad-start
 Terminal=False
diff --git a/xmonad.spec b/xmonad.spec
index ea4fbc3..42ceb55 100644
--- a/xmonad.spec
+++ b/xmonad.spec
@@ -8,7 +8,7 @@
 
 Name:           xmonad
 Version:        0.8.1
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        A tiling window manager
 
 Group:          User Interface/X
@@ -17,7 +17,7 @@ URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{nam
 Source0:        http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
 Source1:        xmonad.desktop
 Source2:        xmonad-start
-Patch0:		manpage.patch
+Patch0:         xmonad-config-manpage.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch: %{ix86} x86_64 ppc alpha
@@ -91,7 +91,7 @@ This package contains profiling libraries for %{name}.
 
 %prep
 %setup -q
-%patch0 -p0
+%patch0 -p1 -b .orig
 
 %build
 %ifarch ppc
@@ -149,7 +149,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc CONFIG LICENSE README STYLE TODO man/%{name}.hs
+%doc CONFIG LICENSE README STYLE TODO man/%{name}.hs.orig
 %attr(755,root,root) %{_bindir}/%{name}
 %attr(755,root,root) %{_bindir}/%{name}-start
 %{_mandir}/man1/%{name}.1*
@@ -174,6 +174,13 @@ fi
 
 
 %changelog
+* Wed May  6 2009 Yaakov M. Nemoy <ynemoy@fedoraproject.org> - 0.8.1-12
+- applies changes from jens' patch
+- renames xmonad.desktop entry
+- adds .orig of the xmonad default config
+- modifies manpage patch to use 'better' filenames
+- renames manpage patch
+
 * Mon Apr 27 2009 Yaakov M. Nemoy <yankee@localhost.localdomain> - 0.8.1-11
 - adds runghc hack taken from haddock