5 changed files with 33 additions and 356 deletions
--- a/.gitignore
+++ b/.gitignore
@ -6,5 +6,3 @@ xmonad-0.9.1.tar.gz
 /xmonad-0.12.tar.gz
 /xmonad-0.13.tar.gz
 /xmonad-0.15.tar.gz
-/xmonad-0.17.0.tar.gz
-/xmonad-0.17.1.tar.gz
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (xmonad-0.17.1.tar.gz) = cf8aa854112f91298936386681b474daa33ed782459061a0542679359abd06edaa9748a66e2b9f6b9f75eb0078bc728c0d565fcf758105a28c4ba6dda6a4959a
+SHA512 (xmonad-0.15.tar.gz) = f881f3faa4f5a0de7a5a37118cd7041083ae3a7569c7094b55dedb9aa858176789aff459d426b237ebae5cc4598b06de790938775a7ac968c2d76be3f0efc8ba
--- a/xmonad-0.17.0.cabal
+++ b/xmonad-0.17.0.cabal
@ -1,139 +0,0 @@
-name:               xmonad
-version:            0.17.0
-synopsis:           A tiling window manager
-description:        xmonad is a tiling window manager for X. Windows are arranged
-                    automatically to tile the screen without gaps or overlap, maximising
-                    screen use. All features of the window manager are accessible from the
-                    keyboard: a mouse is strictly optional. xmonad is written and
-                    extensible in Haskell. Custom layout algorithms, and other extensions,
-                    may be written by the user in config files. Layouts are applied
-                    dynamically, and different layouts may be used on each workspace.
-                    Xinerama is fully supported, allowing windows to be tiled on several
-                    screens.
-license:            BSD3
-license-file:       LICENSE
-author:             Spencer Janssen, Don Stewart, Adam Vogt, David Roundy, Jason Creighton,
-                    Brent Yorgey, Peter Jones, Peter Simons, Andrea Rossato, Devin Mullins,
-                    Lukas Mai, Alec Berryman, Stefan O'Rear, Daniel Wagner, Peter J. Jones,
-                    Daniel Schoepe, Karsten Schoelzel, Neil Mitchell, Joachim Breitner,
-                    Peter De Wachter, Eric Mertens, Geoff Reedy, Michiel Derhaeg,
-                    Philipp Balzarek, Valery V. Vorotyntsev, Alex Tarkovsky, Fabian Beuke,
-                    Felix Hirn, Michael Sloan, Tomas Janousek, Vanessa McHale, Nicolas Pouillard,
-                    Aaron Denney, Austin Seipp, Benno Fünfstück, Brandon S Allbery, Chris Mears,
-                    Christian Thiemann, Clint Adams, Daniel Neri, David Lazar, Ferenc Wagner,
-                    Francesco Ariis, Gábor Lipták, Ivan N. Veselov, Ivan Tarasov, Javran Cheng,
-                    Jens Petersen, Joey Hess, Jonne Ransijn, Josh Holland, Khudyakov Alexey,
-                    Klaus Weidner, Michael G. Sloan, Mikkel Christiansen, Nicolas Dudebout,
-                    Ondřej Súkup, Paul Hebble, Shachaf Ben-Kiki, Siim Põder, Tim McIver,
-                    Trevor Elliott, Wouter Swierstra, Conrad Irwin, Tim Thelion
-maintainer:         xmonad@haskell.org
-tested-with:        GHC == 8.4.4 || == 8.6.5 || == 8.8.4 || == 8.10.4 || == 9.0.1
-category:           System
-homepage:           http://xmonad.org
-bug-reports:        https://github.com/xmonad/xmonad/issues
-build-type:         Simple
-extra-source-files: README.md
-                    CHANGES.md
-                    CONTRIBUTING.md
-                    INSTALL.md
-                    MAINTAINERS.md
-                    TUTORIAL.md
-                    man/xmonad.1.markdown
-                    man/xmonad.1
-                    man/xmonad.1.html
-                    man/xmonad.hs
-                    util/hpcReport.sh
-cabal-version:      1.12
-
-source-repository head
-  type:     git
-  location: https://github.com/xmonad/xmonad
-
-flag pedantic
-  description: Be pedantic (-Werror and the like)
-  default:     False
-  manual:      True
-
-flag quickcheck-classes
-
-library
-  exposed-modules: XMonad
-                   XMonad.Config
-                   XMonad.Core
-                   XMonad.Layout
-                   XMonad.Main
-                   XMonad.ManageHook
-                   XMonad.Operations
-                   XMonad.StackSet
-  other-modules:   Paths_xmonad
-  hs-source-dirs:  src
-  build-depends:   base                  >= 4.11 && < 5
-                 , X11                   >= 1.10 && < 1.11
-                 , containers
-                 , data-default-class
-                 , directory
-                 , filepath
-                 , mtl
-                 , process
-                 , setlocale
-                 , time
-                 , transformers          >= 0.3
-                 , unix
-  ghc-options:     -funbox-strict-fields -Wall -Wno-unused-do-bind
-  default-language: Haskell2010
-
-  -- Keep this in sync with the oldest version in 'tested-with'
-  if impl(ghc > 8.4.4)
-    ghc-options:   -Wno-unused-imports
-
-  if flag(pedantic)
-    ghc-options:   -Werror
-
-executable xmonad
-  main-is:       Main.hs
-  build-depends: base, xmonad
-  ghc-options:   -Wall -Wno-unused-do-bind
-  default-language: Haskell2010
-
-  -- Keep this in sync with the oldest version in 'tested-with'
-  if impl(ghc > 8.4.4)
-    ghc-options:   -Wno-unused-imports
-
-  if flag(pedantic)
-    ghc-options:   -Werror
-
-test-suite properties
-  type:           exitcode-stdio-1.0
-  main-is:        Properties.hs
-  other-modules:  Instances
-                  Properties.Delete
-                  Properties.Failure
-                  Properties.Floating
-                  Properties.Focus
-                  Properties.GreedyView
-                  Properties.Insert
-                  Properties.Layout.Full
-                  Properties.Layout.Tall
-                  Properties.Screen
-                  Properties.Shift
-                  Properties.Stack
-                  Properties.StackSet
-                  Properties.Swap
-                  Properties.View
-                  Properties.Workspace
-                  Utils
-  hs-source-dirs: tests
-  build-depends:  base
-                , QuickCheck >= 2
-                , X11
-                , containers
-                , xmonad
-  default-language: Haskell2010
-
-  if flag(quickcheck-classes) && impl(ghc > 8.5)
-    -- no quickcheck-classes in LTS-12
-    -- GHC 8.4 and lower needs too much boilerplate (Eq1, Show1, …)
-    build-depends: quickcheck-classes >= 0.4.3
-
-  if flag(pedantic)
-    ghc-options:   -Werror
--- a/xmonad-0.17.1.cabal
+++ b/xmonad-0.17.1.cabal
@ -1,140 +0,0 @@
-name:               xmonad
-version:            0.17.1
-x-revision: 2
-synopsis:           A tiling window manager
-description:        xmonad is a tiling window manager for X. Windows are arranged
-                    automatically to tile the screen without gaps or overlap, maximising
-                    screen use. All features of the window manager are accessible from the
-                    keyboard: a mouse is strictly optional. xmonad is written and
-                    extensible in Haskell. Custom layout algorithms, and other extensions,
-                    may be written by the user in config files. Layouts are applied
-                    dynamically, and different layouts may be used on each workspace.
-                    Xinerama is fully supported, allowing windows to be tiled on several
-                    screens.
-license:            BSD3
-license-file:       LICENSE
-author:             Spencer Janssen, Don Stewart, Adam Vogt, David Roundy, Jason Creighton,
-                    Brent Yorgey, Peter Jones, Peter Simons, Andrea Rossato, Devin Mullins,
-                    Lukas Mai, Alec Berryman, Stefan O'Rear, Daniel Wagner, Peter J. Jones,
-                    Daniel Schoepe, Karsten Schoelzel, Neil Mitchell, Joachim Breitner,
-                    Peter De Wachter, Eric Mertens, Geoff Reedy, Michiel Derhaeg,
-                    Philipp Balzarek, Valery V. Vorotyntsev, Alex Tarkovsky, Fabian Beuke,
-                    Felix Hirn, Michael Sloan, Tomas Janousek, Vanessa McHale, Nicolas Pouillard,
-                    Aaron Denney, Austin Seipp, Benno Fünfstück, Brandon S Allbery, Chris Mears,
-                    Christian Thiemann, Clint Adams, Daniel Neri, David Lazar, Ferenc Wagner,
-                    Francesco Ariis, Gábor Lipták, Ivan N. Veselov, Ivan Tarasov, Javran Cheng,
-                    Jens Petersen, Joey Hess, Jonne Ransijn, Josh Holland, Khudyakov Alexey,
-                    Klaus Weidner, Michael G. Sloan, Mikkel Christiansen, Nicolas Dudebout,
-                    Ondřej Súkup, Paul Hebble, Shachaf Ben-Kiki, Siim Põder, Tim McIver,
-                    Trevor Elliott, Wouter Swierstra, Conrad Irwin, Tim Thelion, Tony Zorman
-maintainer:         xmonad@haskell.org
-tested-with:        GHC == 8.4.4 || == 8.6.5 || == 8.8.4 || == 8.10.7 || == 9.0.2 || == 9.2.2
-category:           System
-homepage:           http://xmonad.org
-bug-reports:        https://github.com/xmonad/xmonad/issues
-build-type:         Simple
-extra-source-files: README.md
-                    CHANGES.md
-                    CONTRIBUTING.md
-                    INSTALL.md
-                    MAINTAINERS.md
-                    TUTORIAL.md
-                    man/xmonad.1.markdown
-                    man/xmonad.1
-                    man/xmonad.1.html
-                    man/xmonad.hs
-                    util/hpcReport.sh
-cabal-version:      1.12
-
-source-repository head
-  type:     git
-  location: https://github.com/xmonad/xmonad
-
-flag pedantic
-  description: Be pedantic (-Werror and the like)
-  default:     False
-  manual:      True
-
-flag quickcheck-classes
-
-library
-  exposed-modules: XMonad
-                   XMonad.Config
-                   XMonad.Core
-                   XMonad.Layout
-                   XMonad.Main
-                   XMonad.ManageHook
-                   XMonad.Operations
-                   XMonad.StackSet
-  other-modules:   Paths_xmonad
-  hs-source-dirs:  src
-  build-depends:   base                  >= 4.11 && < 5
-                 , X11                   >= 1.10 && < 1.11
-                 , containers
-                 , data-default-class
-                 , directory
-                 , filepath
-                 , mtl                   < 2.3
-                 , process
-                 , setlocale
-                 , time
-                 , transformers          >= 0.3
-                 , unix                  < 2.8
-  ghc-options:     -funbox-strict-fields -Wall -Wno-unused-do-bind
-  default-language: Haskell2010
-
-  -- Keep this in sync with the oldest version in 'tested-with'
-  if impl(ghc > 8.4.4)
-    ghc-options:   -Wno-unused-imports
-
-  if flag(pedantic)
-    ghc-options:   -Werror
-
-executable xmonad
-  main-is:       Main.hs
-  build-depends: base, xmonad
-  ghc-options:   -Wall -Wno-unused-do-bind
-  default-language: Haskell2010
-
-  -- Keep this in sync with the oldest version in 'tested-with'
-  if impl(ghc > 8.4.4)
-    ghc-options:   -Wno-unused-imports
-
-  if flag(pedantic)
-    ghc-options:   -Werror
-
-test-suite properties
-  type:           exitcode-stdio-1.0
-  main-is:        Properties.hs
-  other-modules:  Instances
-                  Properties.Delete
-                  Properties.Failure
-                  Properties.Floating
-                  Properties.Focus
-                  Properties.GreedyView
-                  Properties.Insert
-                  Properties.Layout.Full
-                  Properties.Layout.Tall
-                  Properties.Screen
-                  Properties.Shift
-                  Properties.Stack
-                  Properties.StackSet
-                  Properties.Swap
-                  Properties.View
-                  Properties.Workspace
-                  Utils
-  hs-source-dirs: tests
-  build-depends:  base
-                , QuickCheck >= 2
-                , X11
-                , containers
-                , xmonad
-  default-language: Haskell2010
-
-  if flag(quickcheck-classes) && impl(ghc > 8.5)
-    -- no quickcheck-classes in LTS-12
-    -- GHC 8.4 and lower needs too much boilerplate (Eq1, Show1, …)
-    build-depends: quickcheck-classes >= 0.4.3
-
-  if flag(pedantic)
-    ghc-options:   -Werror
--- a/xmonad.spec
+++ b/xmonad.spec
@ -1,58 +1,45 @@
-# generated by cabal-rpm-2.1.0 --stream hackage
-# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/
+# generated by cabal-rpm-2.0.2
+# https://fedoraproject.org/wiki/Packaging:Haskell

 %global pkg_name xmonad
 %global pkgver %{pkg_name}-%{version}

-# testsuite missing deps: quickcheck-classes
+%bcond_without tests

 Name:           %{pkg_name}
-Version:        0.17.1
-Release:        1%{?dist}
+Version:        0.15
+Release:        5%{?dist}
 Summary:        A tiling window manager

-License:        BSD-3-Clause
+License:        BSD
 Url:            https://hackage.haskell.org/package/%{name}
 # Begin cabal-rpm sources:
 Source0:        https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
-Source1:        https://hackage.haskell.org/package/%{pkgver}/%{name}.cabal#/%{pkgver}.cabal
 # End cabal-rpm sources
-Source2:        xmonad-session.desktop
-Source3:        xmonad-start
-Source4:        xmonad.desktop
-Source5:        README.fedora
-Source6:        xmonad-mate-session.desktop
+Source1:        xmonad-session.desktop
+Source2:        xmonad-start
+Source3:        xmonad.desktop
+Source4:        README.fedora
+Source5:        xmonad-mate-session.desktop
 Source7:        xmonad.hs

 # Begin cabal-rpm deps:
-BuildRequires:  dos2unix
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros
-BuildRequires:  ghc-X11-devel
-BuildRequires:  ghc-base-devel
-BuildRequires:  ghc-containers-devel
-BuildRequires:  ghc-data-default-class-devel
-BuildRequires:  ghc-directory-devel
-BuildRequires:  ghc-filepath-devel
-BuildRequires:  ghc-mtl-devel
-BuildRequires:  ghc-process-devel
-BuildRequires:  ghc-setlocale-devel
-BuildRequires:  ghc-time-devel
-BuildRequires:  ghc-transformers-devel
-BuildRequires:  ghc-unix-devel
-%if %{with ghc_prof}
 BuildRequires:  ghc-X11-prof
 BuildRequires:  ghc-base-prof
 BuildRequires:  ghc-containers-prof
-BuildRequires:  ghc-data-default-class-prof
+BuildRequires:  ghc-data-default-prof
 BuildRequires:  ghc-directory-prof
+BuildRequires:  ghc-extensible-exceptions-prof
 BuildRequires:  ghc-filepath-prof
 BuildRequires:  ghc-mtl-prof
 BuildRequires:  ghc-process-prof
 BuildRequires:  ghc-setlocale-prof
-BuildRequires:  ghc-time-prof
-BuildRequires:  ghc-transformers-prof
 BuildRequires:  ghc-unix-prof
+BuildRequires:  ghc-utf8-string-prof
+%if %{with tests}
+BuildRequires:  ghc-QuickCheck-devel
 %endif
 # End cabal-rpm deps
 BuildRequires:  desktop-file-utils
@ -134,7 +121,7 @@ This package provides a basic desktop configuration for xmonad.
 %package core
 Summary:        A tiling window manager
 # for xmessage
-Requires:       xmessage
+Requires:       xorg-x11-apps

 %description core
 This package just provides the core xmonad window manager program.
@ -170,7 +157,6 @@ in a MATE session.
 %package -n ghc-%{name}-doc
 Summary:        Haskell %{name} library documentation
 BuildArch:      noarch
-Requires:       ghc-filesystem

 %description -n ghc-%{name}-doc
 This package provides the Haskell %{name} library documentation.
@ -191,9 +177,8 @@ This package provides the Haskell %{name} profiling library.
 %prep
 # Begin cabal-rpm setup:
 %setup -q
-dos2unix -k -n %{SOURCE1} %{name}.cabal
 # End cabal-rpm setup
-cp -p %SOURCE5 .
+cp -p %SOURCE4 .


 %build
@ -206,20 +191,27 @@ cp -p %SOURCE5 .
 # Begin cabal-rpm install
 %ghc_lib_install
 # End cabal-rpm install
-
 mv %{buildroot}%{_defaultlicensedir}/%{name}{,-core}

 install -p -m 0644 -D man/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
-install -p -m 0644 -D %SOURCE2 %{buildroot}%{_datadir}/xsessions/%{name}.desktop
-install -p -m 0755 -D %SOURCE3 %{buildroot}%{_bindir}/%{name}-start
-desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE4}
-install -p -m 0644 -D %SOURCE6 %{buildroot}%{_datadir}/xsessions/%{name}-mate.desktop
+install -p -m 0644 -D %SOURCE1 %{buildroot}%{_datadir}/xsessions/%{name}.desktop
+install -p -m 0755 -D %SOURCE2 %{buildroot}%{_bindir}/%{name}-start
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE3}
+install -p -m 0644 -D %SOURCE5 %{buildroot}%{_datadir}/xsessions/%{name}-mate.desktop
 install -p -m 0644 -D %SOURCE7 %{buildroot}%{_datadir}/xmonad/xmonad.hs


 %check
-%if %{with tests}
 %cabal_test
+
+
+%if 0%{?fedora} < 31 || 0%{?rhel} < 8
+%post -n ghc-%{name}-devel
+%ghc_pkg_recache
+
+
+%postun -n ghc-%{name}-devel
+%ghc_pkg_recache
 %endif


@ -252,7 +244,7 @@ install -p -m 0644 -D %SOURCE7 %{buildroot}%{_datadir}/xmonad/xmonad.hs


 %files -n ghc-%{name}-devel -f ghc-%{name}-devel.files
-%doc CONTRIBUTING.md TUTORIAL.md
+%doc CONFIG STYLE


 %if %{with haddock}
@ -267,40 +259,6 @@ install -p -m 0644 -D %SOURCE7 %{buildroot}%{_datadir}/xmonad/xmonad.hs


 %changelog
-* Wed Sep 14 2022 Jens Petersen <petersen@redhat.com> - 0.17.1-1
- https://hackage.haskell.org/package/xmonad-0.17.1/changelog
- disable testsuite (missing dependency)
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.17.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri Jun 17 2022 Jens Petersen <petersen@redhat.com> - 0.17.0-2
- rebuild
-
-* Mon May 30 2022 Iurii Mykhalskyi <yriy.pma@gmail.com> - 0.17.0-1
- https://hackage.haskell.org/package/xmonad-0.17.0/changelog
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.15-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Sat Jan 08 2022 Miro Hrončok <mhroncok@redhat.com> - 0.15-11
- Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34
-
-* Fri Aug 06 2021 Jens Petersen <petersen@redhat.com> - 0.15-10
- rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.15-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.15-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Adam Jackson <ajax@redhat.com> - 0.15-7
- Require xmessage not xorg-x11-apps
-
-* Fri Jul 17 2020 Jens Petersen <petersen@redhat.com> - 0.15-6
- refresh to cabal-rpm-2.0.6
-
 * Wed Feb 19 2020 Jens Petersen <petersen@redhat.com> - 0.15-5
 - refresh to cabal-rpm-2.0.2