rpms/xmonad/devel xmonad-config-manpage.patch, NONE, 1.1 xmonad.desktop, 1.1, 1.2 xmonad.spec, 1.1, 1.2 manpage.patch, 1.1, NONE

[Yaakov Meir Nemoy]

Author: ynemoy

Update of /cvs/pkgs/rpms/xmonad/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30425

Modified Files:
	xmonad.desktop xmonad.spec 
Added Files:
	xmonad-config-manpage.patch 
Removed Files:
	manpage.patch 
Log Message:
Applies patches from Jens as part of the review


xmonad-config-manpage.patch:

--- NEW FILE xmonad-config-manpage.patch ---
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.
 --
-main = xmonad defaults
+main = do spawn "xterm -e '/usr/bin/man xmonad'"
+          xmonad defaults
 
 -- A structure containing your configuration settings, overriding
 -- fields in the default config. Any you don't override, will 


Index: xmonad.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/xmonad/devel/xmonad.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xmonad.desktop	6 May 2009 21:19:57 -0000	1.1
+++ xmonad.desktop	6 May 2009 21:48:56 -0000	1.2
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=xmonad-start
+Name=xmonad
 Comment=Tiling window manager
 Exec=xmonad-start
 Terminal=False


Index: xmonad.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmonad/devel/xmonad.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xmonad.spec	6 May 2009 21:19:58 -0000	1.1
+++ xmonad.spec	6 May 2009 21:48:56 -0000	1.2
@@ -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.o
 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 librarie
 
 %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 at 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 at localhost.localdomain> - 0.8.1-11
 - adds runghc hack taken from haddock
 


--- manpage.patch DELETED ---