6 changed files with 107 additions and 363 deletions
--- a/.gitignore
+++ b/.gitignore
@ -13,19 +13,3 @@
 /xmobar-0.24.1.tar.gz
 /xmobar-0.24.3.tar.gz
 /xmobar-0.24.5.tar.gz
-/xmobar-0.27.tar.gz
-/iwlib-0.1.0.tar.gz
-/xmobar-0.29.4.tar.gz
-/xmobar-0.32.tar.gz
-/xmobar-0.33.tar.gz
-/xmobar-0.34.tar.gz
-/xmobar-0.35.1.tar.gz
-/netlink-1.1.1.0.tar.gz
-/pretty-hex-1.1.tar.gz
-/xmobar-0.36.tar.gz
-/xmobar-0.37.tar.gz
-/xmobar-0.38.tar.gz
-/xmobar-0.43.tar.gz
-/xmobar-0.46.tar.gz
-/xmobar-0.48.1.tar.gz
-/xmobar-0.50.tar.gz
--- a/4
+++ b/4
@ -1,3 +1 @@
-SHA512 (netlink-1.1.1.0.tar.gz) = 2bb3d3c1a86e2de61e18a50366d9ecfa863df4959533db5ab3b127b4e02853cf4295ce7519a8ba7bbee9af0534c510aae99c567a5b23e8587e8e56113f530da3
-SHA512 (pretty-hex-1.1.tar.gz) = e61223ea492d179e21dd0b26626e6dd32cc24e9e895e27ecedcdc20f70e7ca1db8ef69754a4273a4776d0574570c1d85de6e240f9d3ca0af003bd45416df7c3c
-SHA512 (xmobar-0.50.tar.gz) = 5458bd5a84f38062b211f918ce7964216189b4ae3ccf48164cc47bb5acf053b5ae4e35987564887d44bafcc3899f9d6e7228b91362a077351d5447f1f45bf940
+SHA512 (xmobar-0.24.5.tar.gz) = b7f4c8b206640d7d0fc60e326fffdc31f4c00df0ffac86102d40035bc632c808cfa19485073059a9c9a01c45b7a9e0aa2bba8dfa27ce9df79d1247a3a13073d4
--- a/xmobar-0.23.1-flags.patch
+++ b/xmobar-0.23.1-flags.patch
@ -0,0 +1,35 @@
+diff -u -r -U5 --no-dereference xmobar-0.23.1/xmobar.cabal xmobar-0.23.1.flags/xmobar.cabal
+--- xmobar-0.23.1/xmobar.cabal	2015-04-14 13:08:19.000000000 -0400
+++ xmobar-0.23.1.flags/xmobar.cabal	2015-07-19 14:03:49.517088869 -0400
+@@ -26,27 +26,27 @@
+   location:  git://github.com/jaor/xmobar.git
+   branch:    master
+ 
+ flag with_xft
+   description: Use Xft to render text. UTF-8 support included.
+-  default: False
+  default: True
+ 
+ flag with_utf8
+   description: With UTF-8 support.
+   default: True
+ 
+ flag with_inotify
+   description: inotify support (modern Linux only). Required for the Mail and MBox plugins.
+-  default: False
+  default: True
+ 
+ flag with_iwlib
+   description: Wireless info support. Required for the Wireless plugin, needs iwlib installed.
+-  default: False
+  default: True
+ 
+ flag with_mpd
+   description: MPD support. Needs libmpd installed.
+-  default: False
+  default: True
+ 
+ flag all_extensions
+   description: Includes all optional extensions.
+   default: False
+ 
--- a/xmobar-0.24.1-fonts.patch
+++ b/xmobar-0.24.1-fonts.patch
@ -0,0 +1,43 @@
+diff -u -r -U5 --no-dereference xmobar-0.24.1/samples/xmobar.config xmobar-0.24.1.fonts/samples/xmobar.config
+--- xmobar-0.24.1/samples/xmobar.config	2016-07-28 17:46:52.000000000 -0400
+++ xmobar-0.24.1.fonts/samples/xmobar.config	2016-08-04 21:35:45.540931471 -0400
+@@ -1,6 +1,6 @@
+-Config { font = "-misc-fixed-*-*-*-*-10-*-*-*-*-*-*-*"
+Config { font = "xft:mono-12"
+        , additionalFonts = []
+        , borderColor = "black"
+        , border = TopB
+        , bgColor = "black"
+        , fgColor = "grey"
+diff -u -r -U5 --no-dereference xmobar-0.24.1/src/Config.hs xmobar-0.24.1.fonts/src/Config.hs
+--- xmobar-0.24.1/src/Config.hs	2016-07-28 17:46:52.000000000 -0400
+++ xmobar-0.24.1.fonts/src/Config.hs	2016-08-04 21:35:45.541931473 -0400
+@@ -108,11 +108,11 @@
+               deriving ( Read, Eq )
+ 
+ -- | The default configuration values
+ defaultConfig :: Config
+ defaultConfig =
+-    Config { font = "-misc-fixed-*-*-*-*-10-*-*-*-*-*-*-*"
+    Config { font = "xft:mono-12"
+            , additionalFonts = []
+            , bgColor = "#000000"
+            , fgColor = "#BFBFBF"
+            , alpha   = 255
+            , position = Top
+diff -u -r -U5 --no-dereference xmobar-0.24.1/src/XUtil.hsc xmobar-0.24.1.fonts/src/XUtil.hsc
+--- xmobar-0.24.1/src/XUtil.hsc	2016-07-28 17:46:52.000000000 -0400
+++ xmobar-0.24.1.fonts/src/XUtil.hsc	2016-08-04 21:35:45.542931475 -0400
+@@ -98,11 +98,11 @@
+ #else
+            fmap Core $ initCoreFont d s
+ #endif
+ 
+ miscFixedFont :: String
+-miscFixedFont = "-misc-fixed-*-*-*-*-*-*-*-*-*-*-*-*"
+miscFixedFont = "-misc-fixed-*-*-*-*-13-*-*-*-*-*-*-*"
+ 
+ -- | Given a fontname returns the font structure. If the font name is
+ --  not valid the default font will be loaded and returned.
+ initCoreFont :: Display -> String -> IO FontStruct
+ initCoreFont d s = do
--- a/xmobar-flags.patch
+++ b/xmobar-flags.patch
@ -1,25 +0,0 @@
-xmobar-0.35.1/xmobar.cabal.orig	2001-09-09 09:46:40.000000000 +0800
-+++ xmobar-0.35.1/xmobar.cabal	2020-08-18 20:29:58.797400927 +0800
-@@ -37,7 +37,7 @@
- 
- flag with_inotify
-   description: inotify support (modern Linux only). Required for the Mail and MBox plugins.
-  default: False
-+  default: True
- 
- flag with_iwlib
-   description: Wireless info support via Wext ioctls (deprecated). Required for the Wireless plugin, needs iwlib installed.
-@@ -45,11 +45,11 @@
- 
- flag with_nl80211
-   description: Wireless info support via nl80211. Required for the Wireless plugin on systems running Linux, the kernel.
-  default: False
-+  default: True
- 
- flag with_mpd
-   description: MPD support. Needs libmpd installed.
-  default: False
-+  default: True
- 
- flag all_extensions
-   description: Includes all optional extensions.
--- a/xmobar.spec
+++ b/xmobar.spec
@ -1,63 +1,33 @@
-# generated by cabal-rpm-2.3.2 --subpackage
-# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/
+# generated by cabal-rpm-0.12.1
+# https://fedoraproject.org/wiki/Packaging:Haskell

-%global pkg_name xmobar
-%global pkgver %{pkg_name}-%{version}
-%{?haskell_setup}
-
-%global netlink netlink-1.1.1.0
-%global prettyhex pretty-hex-1.1
-
-%global subpkgs %{prettyhex} %{netlink}
-
-# needs alsa-mixer package
-%bcond tests 0
-
-Name:           %{pkg_name}
-Version:        0.50
-# can only be reset when all subpkgs bumped
-Release:        38%{?dist}
+Name:           xmobar
+Version:        0.24.5
+Release:        3%{?dist}
 Summary:        A minimalistic text-based status bar

-License:        BSD-3-Clause
-URL:            https://hackage.haskell.org/package/xmobar
-# Begin cabal-rpm sources:
-Source0:        https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
-Source1:        https://hackage.haskell.org/package/%{netlink}/%{netlink}.tar.gz
-Source2:        https://hackage.haskell.org/package/%{prettyhex}/%{prettyhex}.tar.gz
-# End cabal-rpm sources
+License:        BSD
+Url:            https://hackage.haskell.org/package/%{name}
+Source0:        https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
+Source1:        xmobar.desktop
+Patch0:         xmobar-0.23.1-flags.patch
+Patch1:         xmobar-0.24.1-fonts.patch

-Source10:       xmobar.desktop
-Patch0:         xmobar-flags.patch
-
-# Begin cabal-rpm deps:
-BuildRequires:  ghc-rpm-macros-extra
 BuildRequires:  ghc-Cabal-devel
+BuildRequires:  ghc-rpm-macros
+# Begin cabal-rpm deps:
+BuildRequires:  ghc-HTTP-devel
 BuildRequires:  ghc-X11-devel
 BuildRequires:  ghc-X11-xft-devel
-BuildRequires:  ghc-aeson-devel
-BuildRequires:  ghc-async-devel
-BuildRequires:  ghc-base-devel
 BuildRequires:  ghc-bytestring-devel
-BuildRequires:  ghc-cairo-devel
-BuildRequires:  ghc-cereal-devel
-BuildRequires:  ghc-colour-devel
 BuildRequires:  ghc-containers-devel
 BuildRequires:  ghc-directory-devel
-BuildRequires:  ghc-extensible-exceptions-devel
-BuildRequires:  ghc-extra-devel
 BuildRequires:  ghc-filepath-devel
 BuildRequires:  ghc-hinotify-devel
-BuildRequires:  ghc-http-client-tls-devel
-BuildRequires:  ghc-http-conduit-devel
-BuildRequires:  ghc-http-types-devel
 BuildRequires:  ghc-libmpd-devel
 BuildRequires:  ghc-mtl-devel
-#BuildRequires:  ghc-netlink-devel
 BuildRequires:  ghc-old-locale-devel
-BuildRequires:  ghc-pango-devel
 BuildRequires:  ghc-parsec-devel
-BuildRequires:  ghc-parsec-numbers-devel
 BuildRequires:  ghc-process-devel
 BuildRequires:  ghc-regex-compat-devel
 BuildRequires:  ghc-stm-devel
@ -65,51 +35,9 @@ BuildRequires:  ghc-time-devel
 BuildRequires:  ghc-transformers-devel
 BuildRequires:  ghc-unix-devel
 BuildRequires:  ghc-utf8-string-devel
-%if %{with ghc_prof}
-BuildRequires:  ghc-X11-prof
-BuildRequires:  ghc-X11-xft-prof
-BuildRequires:  ghc-aeson-prof
-BuildRequires:  ghc-async-prof
-BuildRequires:  ghc-base-prof
-BuildRequires:  ghc-bytestring-prof
-BuildRequires:  ghc-cairo-prof
-BuildRequires:  ghc-cereal-prof
-BuildRequires:  ghc-colour-prof
-BuildRequires:  ghc-containers-prof
-BuildRequires:  ghc-directory-prof
-BuildRequires:  ghc-extensible-exceptions-prof
-BuildRequires:  ghc-extra-prof
-BuildRequires:  ghc-filepath-prof
-BuildRequires:  ghc-hinotify-prof
-BuildRequires:  ghc-http-client-tls-prof
-BuildRequires:  ghc-http-conduit-prof
-BuildRequires:  ghc-http-types-prof
-BuildRequires:  ghc-libmpd-prof
-BuildRequires:  ghc-mtl-prof
-#BuildRequires:  ghc-netlink-prof
-BuildRequires:  ghc-old-locale-prof
-BuildRequires:  ghc-pango-prof
-BuildRequires:  ghc-parsec-prof
-BuildRequires:  ghc-parsec-numbers-prof
-BuildRequires:  ghc-process-prof
-BuildRequires:  ghc-regex-compat-prof
-BuildRequires:  ghc-stm-prof
-BuildRequires:  ghc-time-prof
-BuildRequires:  ghc-transformers-prof
-BuildRequires:  ghc-unix-prof
-BuildRequires:  ghc-utf8-string-prof
-%endif
-%if %{with tests}
-BuildRequires:  ghc-hspec-devel
-BuildRequires:  ghc-temporary-devel
-%endif
 BuildRequires:  libXrandr-devel
 BuildRequires:  libXrender-devel
-# for missing dep 'netlink':
-BuildRequires:  ghc-monad-loops-devel
-%if %{with ghc_prof}
-BuildRequires:  ghc-monad-loops-prof
-%endif
+BuildRequires:  wireless-tools-devel
 # End cabal-rpm deps
 BuildRequires:  desktop-file-utils
 BuildRequires:  libXpm-devel
@ -121,255 +49,36 @@ Inspired by the Ion3 status bar, it supports similar features, like dynamic
 color management, output templates, and extensibility through plugins.


-%package -n ghc-%{name}
-Summary:        Haskell %{name} library
-
-%description -n ghc-%{name}
-This package provides the Haskell %{name} shared library.
-
-
-%package -n ghc-%{name}-devel
-Summary:        Haskell %{name} library development files
-Provides:       ghc-%{name}-static = %{version}-%{release}
-Provides:       ghc-%{name}-static%{?_isa} = %{version}-%{release}
-%if %{defined ghc_version}
-Requires:       ghc-compiler = %{ghc_version}
-%endif
-Requires:       ghc-%{name}%{?_isa} = %{version}-%{release}
-# Begin cabal-rpm deps:
-Requires:       libXrandr-devel%{?_isa}
-Requires:       libXrender-devel%{?_isa}
-# End cabal-rpm deps
-
-%description -n ghc-%{name}-devel
-This package provides the Haskell %{name} library development files.
-
-
-%if %{with haddock}
-%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.
-%endif
-
-
-%if %{with ghc_prof}
-%package -n ghc-%{name}-prof
-Summary:        Haskell %{name} profiling library
-Requires:       ghc-%{name}-devel%{?_isa} = %{version}-%{release}
-Supplements:    (ghc-%{name}-devel and ghc-prof)
-
-%description -n ghc-%{name}-prof
-This package provides the Haskell %{name} profiling library.
-%endif
-
-
-%global main_version %{version}
-
-%if %{defined ghclibdir}
-%ghc_lib_subpackage -l BSD-3-Clause %{netlink}
-%ghc_lib_subpackage -l BSD-3-Clause %{prettyhex}
-%endif
-
-%global version %{main_version}
-
-
 %prep
-# Begin cabal-rpm setup:
-%setup -q -a1 -a2
-%autopatch -p1
-# End cabal-rpm setup
+%setup -q
+%patch0 -p1 -b .orig
+%patch1 -p1 -b .fonts


 %build
-# Begin cabal-rpm build:
-%ghc_libs_build %{subpkgs}
-%ghc_lib_build
-# End cabal-rpm build
-
-cd etc
+%ghc_bin_build
+cd samples
 %{_bindir}/ghc %{!?ghc_without_dynamic:-dynamic} --make xmonadpropwrite.hs
 cd -


 %install
-# Begin cabal-rpm install
-%ghc_libs_install %{subpkgs}
-%ghc_lib_install
-# End cabal-rpm install
-
-desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE10}
-install --mode=0755 -p etc/xmonadpropwrite %{buildroot}%{_bindir}/xmonadpropwrite
-
-rm %{buildroot}%{_bindir}/{dump_nl80211,dump_rtnetlink,genlinfo}
-
-
-%check
-%if %{with tests}
-PATH=%{buildroot}%{_bindir}:$PATH
-%cabal_test
-%endif
+desktop-file-install                         \
+  --dir=%{buildroot}%{_datadir}/applications \
+   %{SOURCE1}
+%ghc_bin_install
+install --mode=0755 -p samples/xmonadpropwrite %{buildroot}%{_bindir}/xmonadpropwrite


 %files
-# Begin cabal-rpm files:
 %license license
-%doc changelog.md readme.org
-%{_bindir}/%{name}
-# End cabal-rpm files
-%{_bindir}/xmonadpropwrite
+%doc news.md readme.md samples/xmobar.config
+%attr(755,root,root) %{_bindir}/%{name}
+%attr(755,root,root) %{_bindir}/xmonadpropwrite
 %{_datadir}/applications/xmobar.desktop
-%doc etc/xmobar.config
-
-
-%files -n ghc-%{name} -f ghc-%{name}.files
-# Begin cabal-rpm files:
-%license license
-# End cabal-rpm files
-
-
-%files -n ghc-%{name}-devel -f ghc-%{name}-devel.files
-%doc changelog.md readme.org
-
-
-%if %{with haddock}
-%files -n ghc-%{name}-doc -f ghc-%{name}-doc.files
-%license license
-%endif
-
-
-%if %{with ghc_prof}
-%files -n ghc-%{name}-prof -f ghc-%{name}-prof.files
-%endif


 %changelog
-* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.50-38
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Mon Jan 26 2026 Jens Petersen <petersen@redhat.com> - 0.50-37
- https://hackage.haskell.org/package/xmobar-0.50/changelog
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.48.1-36
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Mon Aug 11 2025 Jens Petersen <petersen@redhat.com> - 0.48.1-35
- Rebuild
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.48.1-34
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Sun Mar 30 2025 Jens Petersen <petersen@redhat.com> - 0.48.1-33
- Rebuild
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.48.1-32
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Sun Jul 21 2024 Jens Petersen <petersen@redhat.com> - 0.48.1-31
- https://hackage.haskell.org/package/xmobar-0.48.1/changelog
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.46-30
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.46-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jul 29 2023 Jens Petersen <petersen@redhat.com> - 0.46-28
- rebuild
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.46-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sun Jan 22 2023 Jens Petersen <petersen@redhat.com> - 0.46-26
- https://hackage.haskell.org/package/xmobar-0.46/changelog
- refresh to cabal-rpm-2.1.0 with SPDX migration
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.43-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Tue Jun 07 2022 Jens Petersen <petersen@redhat.com> - 0.43-24
- https://hackage.haskell.org/package/xmobar-0.43/changelog
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.38-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Sat Jan 08 2022 Miro Hrončok <mhroncok@redhat.com> - 0.38-22
- Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34
-
-* Thu Aug  5 2021 Jens Petersen <petersen@redhat.com> - 0.38-21
- update to 0.38
-
-* Thu Aug  5 2021 Jens Petersen <petersen@redhat.com> - 0.37-20
- update to 0.37
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.36-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.36-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Aug 31 18:00:21 +08 2020 Jens Petersen <petersen@redhat.com> - 0.36-17
- update to 0.36
-  https://hackage.haskell.org/package/xmobar-0.36/changelog
-
-* Wed Aug 19 2020 Jens Petersen <petersen@redhat.com> - 0.35.1-16
- switch from iwlib to netlink (#1860943)
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.35.1-15
- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.35.1-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Jul 16 2020 Jens Petersen <petersen@redhat.com> - 0.35.1-13
- update to 0.35.1
-
-* Fri Jun 19 2020 Jens Petersen <petersen@redhat.com> - 0.34-12
- update to 0.34
-
-* Wed Jun 10 2020 Jens Petersen <petersen@redhat.com> - 0.33-11
- update to 0.33
-
-* Mon Feb 24 2020 Jens Petersen <petersen@redhat.com> - 0.32-10
- drop the libm patch
-
-* Sun Feb 23 2020 Jens Petersen <petersen@redhat.com> - 0.32-9
- update to 0.32
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.29.4-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Sep 13 2019 Jens Petersen <petersen@redhat.com> - 0.29.4-7
- add doc and prof subpackages (cabal-rpm-1.0)
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.29.4-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Mon Mar  4 2019 Jens Petersen <petersen@redhat.com> - 0.29.4-5
- rebuild without -O0 for s390x
-
-* Sat Feb 23 2019 Jens Petersen <petersen@redhat.com> - 0.29.4-4
- update to 0.29.4
- now binlib
- drop xft font patch for now
-
-* Sun Feb 17 2019 Jens Petersen <petersen@redhat.com> - 0.27-3
- refresh to cabal-rpm-0.13
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.27-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sun Jul 22 2018 Jens Petersen <petersen@redhat.com> - 0.27-1
- update to 0.27
- subpackage new iwlib dep
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.24.5-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
 * Thu Feb 15 2018 Jens Petersen <petersen@redhat.com> - 0.24.5-3
 - remove _isa from buildrequires (#1545206)