update to 0.17.1

.gitignore

@@ -11,3 +11,4 @@ xmonad-contrib-0.9.1.tar.gz
 /xmonad-contrib-0.15.tar.gz
 /xmonad-contrib-0.16.tar.gz
 /xmonad-contrib-0.17.0.tar.gz
+/xmonad-contrib-0.17.1.tar.gz

ghc-xmonad-contrib.spec

@@ -1,26 +1,26 @@
-# generated by cabal-rpm-2.0.9
+# generated by cabal-rpm-2.0.12 --stream hackage
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/
 
 %global pkg_name xmonad-contrib
 %global pkgver %{pkg_name}-%{version}
 
+%bcond_without tests
+
 Name:           ghc-%{pkg_name}
-Version:        0.17.0
-Release:        3%{?dist}
-Summary:        Community-maintained extensions extensions for xmonad
+Version:        0.17.1
+Release:        1%{?dist}
+Summary:        Community-maintained extensions for xmonad
 
 License:        BSD
 Url:            https://hackage.haskell.org/package/%{pkg_name}
 # Begin cabal-rpm sources:
 Source0:        https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
-Source1:        https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal
 # End cabal-rpm sources
 Patch0:         xmonad-contrib-use_xft-flag.patch
-Patch2:         xmonad-contrib-0.17.0-ewmh-set-NET_WM_STATE.patch
+Patch2:         xmonad-contrib-ewmh-set-NET_WM_STATE.patch
 Patch4:         xmonad-contrib-0.17.0-PositionStore-dont-rescale-with-screen.patch
 
 # Begin cabal-rpm deps:
-BuildRequires:  dos2unix
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros
 BuildRequires:  ghc-X11-prof
@@ -28,6 +28,7 @@ BuildRequires:  ghc-X11-xft-prof
 BuildRequires:  ghc-base-prof
 BuildRequires:  ghc-bytestring-prof
 BuildRequires:  ghc-containers-prof
+BuildRequires:  ghc-deepseq-prof
 BuildRequires:  ghc-directory-prof
 BuildRequires:  ghc-filepath-prof
 BuildRequires:  ghc-mtl-prof
@@ -37,6 +38,10 @@ BuildRequires:  ghc-time-prof
 BuildRequires:  ghc-unix-prof
 BuildRequires:  ghc-utf8-string-prof
 BuildRequires:  ghc-xmonad-prof
+%if %{with tests}
+BuildRequires:  ghc-QuickCheck-devel
+BuildRequires:  ghc-hspec-devel
+%endif
 # End cabal-rpm deps
 
 %description
@@ -90,7 +95,6 @@ This package provides the Haskell %{pkg_name} profiling library.
 %prep
 # Begin cabal-rpm setup:
 %setup -q -n %{pkgver}
-dos2unix -k -n %{SOURCE1} %{pkg_name}.cabal
 # End cabal-rpm setup
 %patch0 -p1 -b .orig-xft
 %patch2 -p1 -b .orig-NET_WM_STATE
@@ -109,6 +113,12 @@ dos2unix -k -n %{SOURCE1} %{pkg_name}.cabal
 # End cabal-rpm install
 
 
+%check
+%if %{with tests}
+%cabal_test
+%endif
+
+
 %files -f %{name}.files
 # Begin cabal-rpm files:
 %license LICENSE
@@ -131,6 +141,9 @@ dos2unix -k -n %{SOURCE1} %{pkg_name}.cabal
 
 
 %changelog
+* Wed Sep 14 2022 Jens Petersen <petersen@redhat.com> - 0.17.1-1
+- https://hackage.haskell.org/package/xmonad-contrib-0.17.1/changelog
+
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.17.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (xmonad-contrib-0.17.0.tar.gz) = 357ef80565690a1e652f79c877964181134c7f02a5d325dbf3890246588ce8a545e91126041bcc2af3d9ebf5b3be28f4866ee9ede76ddbf0fc0387871319a900
+SHA512 (xmonad-contrib-0.17.1.tar.gz) = 07f989623f4d9affae564ba36a180721910c1a0acf3d23e0e548fc48bb4dcd9864987c521c28251f6443cdd5134ded8e8bb18c6f78d06cb00c386ff6ad59c97e

xmonad-contrib-0.17.0-ewmh-set-NET_WM_STATE.patch

@@ -1,15 +0,0 @@
-diff --git a/XMonad/Hooks/EwmhDesktops.hs b/XMonad/Hooks/EwmhDesktops.hs
-index f6dd58ec..91409931 100644
---- a/XMonad/Hooks/EwmhDesktops.hs
-+++ b/XMonad/Hooks/EwmhDesktops.hs
-@@ -460,6 +460,10 @@ setActiveWindow w = withDisplay $ \dpy -> do
-     r <- asks theRoot
-     a <- getAtom "_NET_ACTIVE_WINDOW"
-     io $ changeProperty32 dpy r a wINDOW propModeReplace [fromIntegral w]
-+    -- init _NET_WM_STATE to prevent gtk3 making apps look unfocused
-+    a' <- getAtom "_NET_WM_STATE"
-+    c' <- getAtom "ATOM"
-+    io $ changeProperty32 dpy w a' c' propModeAppend []
- 
- setSupported :: X ()
- setSupported = withDisplay $ \dpy -> do

xmonad-contrib-ewmh-set-NET_WM_STATE.patch

@@ -0,0 +1,14 @@
+diff -up xmonad-contrib-0.17.1/XMonad/Hooks/EwmhDesktops.hs~ xmonad-contrib-0.17.1/XMonad/Hooks/EwmhDesktops.hs
+--- xmonad-contrib-0.17.1/XMonad/Hooks/EwmhDesktops.hs~	2001-09-09 09:46:40.000000000 +0800
++++ xmonad-contrib-0.17.1/XMonad/Hooks/EwmhDesktops.hs	2022-09-14 20:50:49.173905849 +0800
+@@ -490,6 +490,10 @@ setActiveWindow w = withDisplay $ \dpy -
+     r <- asks theRoot
+     a <- getAtom "_NET_ACTIVE_WINDOW"
+     io $ changeProperty32 dpy r a wINDOW propModeReplace [fromIntegral w]
++    -- init _NET_WM_STATE to prevent gtk3 making apps look unfocused
++    a' <- getAtom "_NET_WM_STATE"
++    c' <- getAtom "ATOM"
++    io $ changeProperty32 dpy w a' c' propModeAppend []
+ 
+ setDesktopViewport :: [Position] -> X ()
+ setDesktopViewport positions = withDisplay $ \dpy -> do