Applies patches from Jens as part of the review
This commit is contained in:
parent
c599a5c2d3
commit
d428e7f016
@ -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
|
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
|
||||||
--- .pkg_src/branches/xmonad-0.8.1_orig/man/xmonad.hs 2009-01-16 17:47:27.000000000 -0500
|
--- 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
|
+++ xmonad-0.8.1/man/xmonad.hs 2009-04-27 18:31:12.195829219 -0400
|
||||||
@@ -246,7 +246,8 @@
|
@@ -246,7 +246,8 @@
|
||||||
|
|
||||||
-- Run xmonad with the settings you specify. No need to modify this.
|
-- Run xmonad with the settings you specify. No need to modify this.
|
@ -1,6 +1,6 @@
|
|||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Encoding=UTF-8
|
Encoding=UTF-8
|
||||||
Name=xmonad-start
|
Name=xmonad
|
||||||
Comment=Tiling window manager
|
Comment=Tiling window manager
|
||||||
Exec=xmonad-start
|
Exec=xmonad-start
|
||||||
Terminal=False
|
Terminal=False
|
||||||
|
15
xmonad.spec
15
xmonad.spec
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
Name: xmonad
|
Name: xmonad
|
||||||
Version: 0.8.1
|
Version: 0.8.1
|
||||||
Release: 11%{?dist}
|
Release: 12%{?dist}
|
||||||
Summary: A tiling window manager
|
Summary: A tiling window manager
|
||||||
|
|
||||||
Group: User Interface/X
|
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
|
Source0: http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
|
||||||
Source1: xmonad.desktop
|
Source1: xmonad.desktop
|
||||||
Source2: xmonad-start
|
Source2: xmonad-start
|
||||||
Patch0: manpage.patch
|
Patch0: xmonad-config-manpage.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
# fedora ghc archs:
|
# fedora ghc archs:
|
||||||
ExclusiveArch: %{ix86} x86_64 ppc alpha
|
ExclusiveArch: %{ix86} x86_64 ppc alpha
|
||||||
@ -91,7 +91,7 @@ This package contains profiling libraries for %{name}.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p0
|
%patch0 -p1 -b .orig
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%ifarch ppc
|
%ifarch ppc
|
||||||
@ -149,7 +149,7 @@ fi
|
|||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root,-)
|
%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}
|
||||||
%attr(755,root,root) %{_bindir}/%{name}-start
|
%attr(755,root,root) %{_bindir}/%{name}-start
|
||||||
%{_mandir}/man1/%{name}.1*
|
%{_mandir}/man1/%{name}.1*
|
||||||
@ -174,6 +174,13 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%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
|
* Mon Apr 27 2009 Yaakov M. Nemoy <yankee@localhost.localdomain> - 0.8.1-11
|
||||||
- adds runghc hack taken from haddock
|
- adds runghc hack taken from haddock
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user