diff --git a/xmonad-0.10-X11-1.6.patch b/xmonad-0.10-X11-1.6.patch new file mode 100644 index 0000000..fe0f6b7 --- /dev/null +++ b/xmonad-0.10-X11-1.6.patch @@ -0,0 +1,12 @@ +diff -u xmonad-0.10/xmonad.cabal\~ xmonad-0.10/xmonad.cabal +--- xmonad-0.10/xmonad.cabal~ 2011-11-19 08:14:36.000000000 +0900 ++++ xmonad-0.10/xmonad.cabal 2012-06-11 10:46:59.925650241 +0900 +@@ -46,7 +46,7 @@ + build-depends: base < 5 && >=3, containers, directory, process, filepath, extensible-exceptions + else + build-depends: base < 3 +- build-depends: X11>=1.5.0.0 && < 1.6, mtl, unix, ++ build-depends: X11>=1.5.0.0 && < 1.7, mtl, unix, + utf8-string >= 0.3 && < 0.4 + + if true diff --git a/xmonad.spec b/xmonad.spec index e422375..6e747a2 100644 --- a/xmonad.spec +++ b/xmonad.spec @@ -18,7 +18,7 @@ on several screens. Name: %{pkg_name} Version: 0.10 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A tiling window manager Group: User Interface/X @@ -47,6 +47,7 @@ BuildRequires: ghc-unix-prof BuildRequires: ghc-utf8-string-prof Requires: %{pkg_name}-basic = %{version}-%{release} Requires: %{pkg_name}-config = %{version}-%{release} +Patch1: xmonad-0.10-X11-1.6.patch %description %{common_description} @@ -111,6 +112,7 @@ in a GNOME session. %prep %setup -q +%patch1 -p1 -b .orig cp -p %SOURCE4 . @@ -176,6 +178,9 @@ rm %{buildroot}%{_docdir}/%{name}-%{version}/LICENSE %changelog +* Mon Jun 11 2012 Jens Petersen - 0.10-12 +- allow building with X11-1.6 + * Thu May 31 2012 Jens Petersen - 0.10-11 - really fix xmonad-start to use hardware-platform correctly