up to 0.12

- applicative patch no longer needed

diff --git a/applicative.patch b/applicative.patch
deleted file mode 100644 (file)
index eeae761..0000000
--- a/applicative.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -urN xmonad-contrib-0.11.4.orig/XMonad/Hooks/DebugEvents.hs xmonad-contrib-0.11.4/XMonad/Hooks/DebugEvents.hs
---- xmonad-contrib-0.11.4.orig/XMonad/Hooks/DebugEvents.hs     2015-03-29 20:31:49.750052992 +0200
-+++ xmonad-contrib-0.11.4/XMonad/Hooks/DebugEvents.hs  2015-03-29 20:33:37.373383041 +0200
-@@ -30,6 +30,7 @@
- 
- -- import           Graphics.X11.Xlib.Extras.GetAtomName        (getAtomName)
- 
-+import           Control.Applicative
- import           Control.Exception.Extensible         as E
- import           Control.Monad.State
- import           Control.Monad.Reader
-diff -urN xmonad-contrib-0.11.4.orig/XMonad/Util/Invisible.hs xmonad-contrib-0.11.4/XMonad/Util/Invisible.hs
---- xmonad-contrib-0.11.4.orig/XMonad/Util/Invisible.hs        2015-03-29 20:32:10.070052372 +0200
-+++ xmonad-contrib-0.11.4/XMonad/Util/Invisible.hs     2015-03-29 20:31:03.553387735 +0200
-@@ -22,6 +22,8 @@
-                             , fromIMaybe
-                             ) where
- 
-+import Control.Applicative
-+
- -- $usage
- -- A wrapper data type to store layout state that shouldn't be persisted across
- -- restarts. A common wrapped type to use is @Maybe a@.

diff --git a/ghc-xmonad-contrib.spec b/ghc-xmonad-contrib.spec
index ff905b8affcebe39df86f08df169f2817b8fd1d9..cfc9a20dfd0bbfa5cb8185defa504ed2b2bb1699 100644 (file)
--- a/ghc-xmonad-contrib.spec
+++ b/ghc-xmonad-contrib.spec
@@ -1,29 +1,28 @@
 %define                pkgname xmonad-contrib
 Summary:       Third party extensions for xmonad
 Name:          ghc-%{pkgname}
-Version:       0.11.4
+Version:       0.12
 Release:       1
 License:       BSD
 Group:         Development/Languages
 Source0:       http://hackage.haskell.org/package/%{pkgname}-%{version}/%{pkgname}-%{version}.tar.gz
-# Source0-md5: a41c886280a5414105c1cf241f0fd2f4
-Patch0:                applicative.patch
+# Source0-md5: 39345f462f069f2f0e4a488f7e435dbb
 URL:           http://www.xmonad.org
 BuildRequires: ghc >= 6.12.3
-BuildRequires: ghc-X11 >= 1.6
+BuildRequires: ghc-X11 >= 1.6.1
 BuildRequires: ghc-extensible-exceptions
 BuildRequires: ghc-mtl
 BuildRequires: ghc-random
 BuildRequires: ghc-utf8-string
 BuildRequires: rpmbuild(macros) >= 1.608
-BuildRequires: xmonad >= 0.11
+BuildRequires: xmonad >= 0.12
 %requires_eq   ghc
-Requires:      ghc-X11 >= 1.6
+Requires:      ghc-X11 >= 1.6.1
 Requires:      ghc-extensible-exceptions
 Requires:      ghc-mtl
 Requires:      ghc-random
 Requires:      ghc-utf8-string
-Requires:      xmonad >= 0.11
+Requires:      xmonad >= 0.12
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # debuginfo is not useful for ghc
@@ -45,7 +44,6 @@ Dokumentacja w formacie HTML dla %{pkgname}.
 
 %prep
 %setup -q -n %{pkgname}-%{version}
-%patch0 -p1
 
 %build
 runhaskell Setup.lhs configure -v2 \