From 01b524096cb297619731718e2cc69bcba43aa431 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 8 Jan 2022 11:12:54 +0100 Subject: [PATCH 01/20] Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34 --- xmobar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmobar.spec b/xmobar.spec index a13a7d7..ca43a7a 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -14,7 +14,7 @@ Name: %{pkg_name} Version: 0.38 # can only be reset when all subpkgs bumped -Release: 21%{?dist} +Release: 22%{?dist} Summary: A minimalistic text-based status bar License: BSD @@ -202,6 +202,9 @@ rm %{buildroot}%{_bindir}/{dump_nl80211,dump_rtnetlink,genlinfo} %changelog +* Sat Jan 08 2022 Miro Hrončok - 0.38-22 +- Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34 + * Thu Aug 5 2021 Jens Petersen - 0.38-21 - update to 0.38 From 5b140f7876f378988dcb5738ce74577c4986857a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:17:38 +0000 Subject: [PATCH 02/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmobar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmobar.spec b/xmobar.spec index ca43a7a..649c4a6 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -14,7 +14,7 @@ Name: %{pkg_name} Version: 0.38 # can only be reset when all subpkgs bumped -Release: 22%{?dist} +Release: 23%{?dist} Summary: A minimalistic text-based status bar License: BSD @@ -202,6 +202,9 @@ rm %{buildroot}%{_bindir}/{dump_nl80211,dump_rtnetlink,genlinfo} %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 0.38-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Sat Jan 08 2022 Miro Hrončok - 0.38-22 - Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34 From d8df8a479c49675f0d897b5f5b9b400f1e889849 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 7 Jun 2022 15:47:42 +0800 Subject: [PATCH 03/20] update to 0.43 --- .gitignore | 1 + sources | 2 +- xmobar.spec | 10 +++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3b1023b..24c4f87 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /xmobar-0.36.tar.gz /xmobar-0.37.tar.gz /xmobar-0.38.tar.gz +/xmobar-0.43.tar.gz diff --git a/sources b/sources index 48bdce5..f85f25d 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (netlink-1.1.1.0.tar.gz) = 2bb3d3c1a86e2de61e18a50366d9ecfa863df4959533db5ab3b127b4e02853cf4295ce7519a8ba7bbee9af0534c510aae99c567a5b23e8587e8e56113f530da3 SHA512 (pretty-hex-1.1.tar.gz) = e61223ea492d179e21dd0b26626e6dd32cc24e9e895e27ecedcdc20f70e7ca1db8ef69754a4273a4776d0574570c1d85de6e240f9d3ca0af003bd45416df7c3c -SHA512 (xmobar-0.38.tar.gz) = 1dc644f3b876b5ba6295176f2662bb890f5f898c020a4b44118dff70c584344ca4c7bb3abd8f4f8da8bc7b4745cb370fa77f08d1b64b9e7f97f19c6c8ed4b478 +SHA512 (xmobar-0.43.tar.gz) = 0922cb4136bcd597669f6b4684ca56e7ed257eb58706cc3f499c83cee35f4cc30a1ea1d86066bcd06d007e9236e4ff2e47e48be9cb71122e4ae7abae0605bd56 diff --git a/xmobar.spec b/xmobar.spec index 649c4a6..03a4f73 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.0.10 --subpackage +# generated by cabal-rpm-2.0.12 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name xmobar @@ -12,9 +12,9 @@ %bcond_with tests Name: %{pkg_name} -Version: 0.38 +Version: 0.43 # can only be reset when all subpkgs bumped -Release: 23%{?dist} +Release: 24%{?dist} Summary: A minimalistic text-based status bar License: BSD @@ -33,6 +33,7 @@ BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros-extra 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 @@ -202,6 +203,9 @@ rm %{buildroot}%{_bindir}/{dump_nl80211,dump_rtnetlink,genlinfo} %changelog +* Tue Jun 07 2022 Jens Petersen - 0.43-24 +- https://hackage.haskell.org/package/xmobar-0.43/changelog + * Sat Jan 22 2022 Fedora Release Engineering - 0.38-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 1fc305e6c67aa47c984f31528d4dc36e71e00c26 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:19:38 +0000 Subject: [PATCH 04/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmobar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmobar.spec b/xmobar.spec index 03a4f73..9152f99 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -14,7 +14,7 @@ Name: %{pkg_name} Version: 0.43 # can only be reset when all subpkgs bumped -Release: 24%{?dist} +Release: 25%{?dist} Summary: A minimalistic text-based status bar License: BSD @@ -203,6 +203,9 @@ rm %{buildroot}%{_bindir}/{dump_nl80211,dump_rtnetlink,genlinfo} %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 0.43-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Tue Jun 07 2022 Jens Petersen - 0.43-24 - https://hackage.haskell.org/package/xmobar-0.43/changelog From 23900ab63e53fe3dfa95f19a612913dd8457f977 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 23 Jan 2023 02:08:03 +0800 Subject: [PATCH 05/20] update to 0.46 --- .gitignore | 1 + sources | 2 +- xmobar-flags.patch | 9 ------- xmobar.spec | 63 ++++++++++++++++++++++++++++++++++++---------- 4 files changed, 52 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 24c4f87..3837556 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /xmobar-0.37.tar.gz /xmobar-0.38.tar.gz /xmobar-0.43.tar.gz +/xmobar-0.46.tar.gz diff --git a/sources b/sources index f85f25d..002d86a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (netlink-1.1.1.0.tar.gz) = 2bb3d3c1a86e2de61e18a50366d9ecfa863df4959533db5ab3b127b4e02853cf4295ce7519a8ba7bbee9af0534c510aae99c567a5b23e8587e8e56113f530da3 SHA512 (pretty-hex-1.1.tar.gz) = e61223ea492d179e21dd0b26626e6dd32cc24e9e895e27ecedcdc20f70e7ca1db8ef69754a4273a4776d0574570c1d85de6e240f9d3ca0af003bd45416df7c3c -SHA512 (xmobar-0.43.tar.gz) = 0922cb4136bcd597669f6b4684ca56e7ed257eb58706cc3f499c83cee35f4cc30a1ea1d86066bcd06d007e9236e4ff2e47e48be9cb71122e4ae7abae0605bd56 +SHA512 (xmobar-0.46.tar.gz) = 37ebef56c3046b45ec83025ab8233827f50dcc3aa48691e06ac00c59b8bedeafd5860c94e36d54d3f499217a27a12641b0e98f6f0f248b9d56a22d1b103c50c8 diff --git a/xmobar-flags.patch b/xmobar-flags.patch index f2f9eba..61ddeb6 100644 --- a/xmobar-flags.patch +++ b/xmobar-flags.patch @@ -1,14 +1,5 @@ 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 -@@ -29,7 +29,7 @@ - - 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. @@ -37,7 +37,7 @@ flag with_inotify diff --git a/xmobar.spec b/xmobar.spec index 9152f99..acce9a2 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.0.12 --subpackage +# generated by cabal-rpm-2.1.0 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name xmobar @@ -12,12 +12,12 @@ %bcond_with tests Name: %{pkg_name} -Version: 0.43 +Version: 0.46 # can only be reset when all subpkgs bumped -Release: 25%{?dist} +Release: 26%{?dist} Summary: A minimalistic text-based status bar -License: BSD +License: BSD-3-Clause Url: https://hackage.haskell.org/package/%{name} # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz @@ -31,25 +31,52 @@ Patch0: xmobar-flags.patch # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros-extra +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-colour-devel +BuildRequires: ghc-containers-devel +BuildRequires: ghc-directory-devel +BuildRequires: ghc-extensible-exceptions-devel +BuildRequires: ghc-filepath-devel +BuildRequires: ghc-http-client-tls-devel +BuildRequires: ghc-http-conduit-devel +BuildRequires: ghc-http-types-devel +BuildRequires: ghc-mtl-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 +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-cereal-prof +BuildRequires: ghc-cairo-prof +BuildRequires: ghc-colour-prof BuildRequires: ghc-containers-prof BuildRequires: ghc-directory-prof BuildRequires: ghc-extensible-exceptions-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 @@ -59,6 +86,7 @@ BuildRequires: ghc-time-prof BuildRequires: ghc-transformers-prof BuildRequires: ghc-unix-prof BuildRequires: ghc-utf8-string-prof +%endif BuildRequires: libXrandr-devel BuildRequires: libXrender-devel %if %{with tests} @@ -66,7 +94,12 @@ BuildRequires: ghc-hspec-devel BuildRequires: ghc-temporary-devel %endif # for missing dep 'netlink': +BuildRequires: ghc-cereal-devel +BuildRequires: ghc-monad-loops-devel +%if %{with ghc_prof} +BuildRequires: ghc-cereal-prof BuildRequires: ghc-monad-loops-prof +%endif # End cabal-rpm deps BuildRequires: desktop-file-utils BuildRequires: libXpm-devel @@ -147,7 +180,7 @@ This package provides the Haskell %{name} profiling library. %ghc_lib_build # End cabal-rpm build -cd examples +cd etc %{_bindir}/ghc %{!?ghc_without_dynamic:-dynamic} --make xmonadpropwrite.hs cd - @@ -159,7 +192,7 @@ cd - # End cabal-rpm install desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE10} -install --mode=0755 -p examples/xmonadpropwrite %{buildroot}%{_bindir}/xmonadpropwrite +install --mode=0755 -p etc/xmonadpropwrite %{buildroot}%{_bindir}/xmonadpropwrite rm %{buildroot}%{_bindir}/{dump_nl80211,dump_rtnetlink,genlinfo} @@ -173,12 +206,12 @@ rm %{buildroot}%{_bindir}/{dump_nl80211,dump_rtnetlink,genlinfo} %files # Begin cabal-rpm files: %license license -%doc changelog.md examples readme.org +%doc changelog.md readme.org %{_bindir}/%{name} # End cabal-rpm files %{_bindir}/xmonadpropwrite %{_datadir}/applications/xmobar.desktop -%doc examples/xmobar.config +%doc etc/xmobar.config %files -n ghc-%{name} -f ghc-%{name}.files @@ -188,7 +221,7 @@ rm %{buildroot}%{_bindir}/{dump_nl80211,dump_rtnetlink,genlinfo} %files -n ghc-%{name}-devel -f ghc-%{name}-devel.files -%doc changelog.md examples readme.org +%doc changelog.md readme.org %if %{with haddock} @@ -203,6 +236,10 @@ rm %{buildroot}%{_bindir}/{dump_nl80211,dump_rtnetlink,genlinfo} %changelog +* Sun Jan 22 2023 Jens Petersen - 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 - 0.43-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 5d7d32cbbc8f3f080302288f6f8b8b91e9413d87 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 20 Jul 2023 01:09:55 +0800 Subject: [PATCH 06/20] cabal-rpm-2.1.2 puts %autopatch --- xmobar.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xmobar.spec b/xmobar.spec index acce9a2..b3daf86 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.1.0 --subpackage +# generated by cabal-rpm-2.1.2 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name xmobar @@ -170,8 +170,8 @@ This package provides the Haskell %{name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -a1 -a2 +%autopatch -p1 # End cabal-rpm setup -%patch0 -p1 -b .orig %build From 0f894e76aae60937dfb8b961abbf8d5c5a50ff7c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:03:50 +0000 Subject: [PATCH 07/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmobar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmobar.spec b/xmobar.spec index b3daf86..c965173 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -14,7 +14,7 @@ Name: %{pkg_name} Version: 0.46 # can only be reset when all subpkgs bumped -Release: 26%{?dist} +Release: 27%{?dist} Summary: A minimalistic text-based status bar License: BSD-3-Clause @@ -236,6 +236,9 @@ rm %{buildroot}%{_bindir}/{dump_nl80211,dump_rtnetlink,genlinfo} %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0.46-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sun Jan 22 2023 Jens Petersen - 0.46-26 - https://hackage.haskell.org/package/xmobar-0.46/changelog - refresh to cabal-rpm-2.1.0 with SPDX migration From 77f5da791913b90f7947f974a38b60921796a670 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 29 Jul 2023 22:35:21 +0800 Subject: [PATCH 08/20] bump release --- xmobar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmobar.spec b/xmobar.spec index c965173..200f0b3 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -14,7 +14,7 @@ Name: %{pkg_name} Version: 0.46 # can only be reset when all subpkgs bumped -Release: 27%{?dist} +Release: 28%{?dist} Summary: A minimalistic text-based status bar License: BSD-3-Clause @@ -236,6 +236,9 @@ rm %{buildroot}%{_bindir}/{dump_nl80211,dump_rtnetlink,genlinfo} %changelog +* Sat Jul 29 2023 Jens Petersen - 0.46-28 +- rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 0.46-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From a5d0c9ec4e1794e59dbb4911035efbfa5dc42600 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:54:29 +0000 Subject: [PATCH 09/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xmobar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmobar.spec b/xmobar.spec index 200f0b3..01fbf68 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -14,7 +14,7 @@ Name: %{pkg_name} Version: 0.46 # can only be reset when all subpkgs bumped -Release: 28%{?dist} +Release: 29%{?dist} Summary: A minimalistic text-based status bar License: BSD-3-Clause @@ -236,6 +236,9 @@ rm %{buildroot}%{_bindir}/{dump_nl80211,dump_rtnetlink,genlinfo} %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 0.46-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 29 2023 Jens Petersen - 0.46-28 - rebuild From a9feba8ca9cfd8af5a779a8f34d1cd215a607805 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 14 Jul 2024 23:35:36 +0800 Subject: [PATCH 10/20] refresh to cabal-rpm-2.2.1 --- xmobar.spec | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/xmobar.spec b/xmobar.spec index 01fbf68..993de74 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -1,11 +1,13 @@ -# generated by cabal-rpm-2.1.2 --subpackage +# generated by cabal-rpm-2.2.1 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/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 @@ -38,15 +40,19 @@ 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-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 @@ -66,15 +72,19 @@ 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-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 @@ -94,10 +104,8 @@ BuildRequires: ghc-hspec-devel BuildRequires: ghc-temporary-devel %endif # for missing dep 'netlink': -BuildRequires: ghc-cereal-devel BuildRequires: ghc-monad-loops-devel %if %{with ghc_prof} -BuildRequires: ghc-cereal-prof BuildRequires: ghc-monad-loops-prof %endif # End cabal-rpm deps @@ -160,8 +168,8 @@ This package provides the Haskell %{name} profiling library. %global main_version %{version} %if %{defined ghclibdir} -%ghc_lib_subpackage %{netlink} -%ghc_lib_subpackage %{prettyhex} +%ghc_lib_subpackage -l BSD-3-Clause %{netlink} +%ghc_lib_subpackage -l BSD-3-Clause %{prettyhex} %endif %global version %{main_version} @@ -199,6 +207,7 @@ rm %{buildroot}%{_bindir}/{dump_nl80211,dump_rtnetlink,genlinfo} %check %if %{with tests} +PATH=%{buildroot}%{_bindir}:$PATH %cabal_test %endif From fbf8af74a12b32a8cfb28576a48f9762761bc56d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:15:18 +0000 Subject: [PATCH 11/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xmobar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmobar.spec b/xmobar.spec index 993de74..0cd0544 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -16,7 +16,7 @@ Name: %{pkg_name} Version: 0.46 # can only be reset when all subpkgs bumped -Release: 29%{?dist} +Release: 30%{?dist} Summary: A minimalistic text-based status bar License: BSD-3-Clause @@ -245,6 +245,9 @@ PATH=%{buildroot}%{_bindir}:$PATH %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 0.46-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 0.46-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 8ef68a3c9017c06f5d981fd3321b9546b75ca0fe Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 21 Jul 2024 11:46:40 +0800 Subject: [PATCH 12/20] update to 0.48.1 --- .gitignore | 1 + sources | 2 +- xmobar.spec | 9 +++++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3837556..6037b3e 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /xmobar-0.38.tar.gz /xmobar-0.43.tar.gz /xmobar-0.46.tar.gz +/xmobar-0.48.1.tar.gz diff --git a/sources b/sources index 002d86a..5879509 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (netlink-1.1.1.0.tar.gz) = 2bb3d3c1a86e2de61e18a50366d9ecfa863df4959533db5ab3b127b4e02853cf4295ce7519a8ba7bbee9af0534c510aae99c567a5b23e8587e8e56113f530da3 SHA512 (pretty-hex-1.1.tar.gz) = e61223ea492d179e21dd0b26626e6dd32cc24e9e895e27ecedcdc20f70e7ca1db8ef69754a4273a4776d0574570c1d85de6e240f9d3ca0af003bd45416df7c3c -SHA512 (xmobar-0.46.tar.gz) = 37ebef56c3046b45ec83025ab8233827f50dcc3aa48691e06ac00c59b8bedeafd5860c94e36d54d3f499217a27a12641b0e98f6f0f248b9d56a22d1b103c50c8 +SHA512 (xmobar-0.48.1.tar.gz) = 69c4929f1d74100f886d4a259da279dd8ca39ec4380fcfdb3bda74025a21e307aeac53b30407c5868ed2e879bf62e7dbbb34321ccfd0874883d731b1ca606059 diff --git a/xmobar.spec b/xmobar.spec index 0cd0544..b4c5d8a 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -14,9 +14,9 @@ %bcond_with tests Name: %{pkg_name} -Version: 0.46 +Version: 0.48.1 # can only be reset when all subpkgs bumped -Release: 30%{?dist} +Release: 31%{?dist} Summary: A minimalistic text-based status bar License: BSD-3-Clause @@ -45,6 +45,7 @@ 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 @@ -77,6 +78,7 @@ 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 @@ -245,6 +247,9 @@ PATH=%{buildroot}%{_bindir}:$PATH %changelog +* Sun Jul 21 2024 Jens Petersen - 0.48.1-31 +- https://hackage.haskell.org/package/xmobar-0.48.1/changelog + * Sat Jul 20 2024 Fedora Release Engineering - 0.46-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 6a0119fa39650b30c23a4c6331573fcd91f27a19 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:03:30 +0000 Subject: [PATCH 13/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- xmobar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmobar.spec b/xmobar.spec index b4c5d8a..4baa793 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -16,7 +16,7 @@ Name: %{pkg_name} Version: 0.48.1 # can only be reset when all subpkgs bumped -Release: 31%{?dist} +Release: 32%{?dist} Summary: A minimalistic text-based status bar License: BSD-3-Clause @@ -247,6 +247,9 @@ PATH=%{buildroot}%{_bindir}:$PATH %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 0.48.1-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sun Jul 21 2024 Jens Petersen - 0.48.1-31 - https://hackage.haskell.org/package/xmobar-0.48.1/changelog From b65a227e8f200caa459633b41cca056ec9144bf5 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 23 Feb 2025 20:39:59 +0800 Subject: [PATCH 14/20] cabal-rpm-2.3.0 --- xmobar.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xmobar.spec b/xmobar.spec index 4baa793..5bf4541 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.2.1 --subpackage +# generated by cabal-rpm-2.3.0 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name xmobar @@ -11,7 +11,7 @@ %global subpkgs %{prettyhex} %{netlink} # needs alsa-mixer package -%bcond_with tests +%bcond tests 0 Name: %{pkg_name} Version: 0.48.1 @@ -20,7 +20,7 @@ Release: 32%{?dist} Summary: A minimalistic text-based status bar License: BSD-3-Clause -Url: https://hackage.haskell.org/package/%{name} +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 From c22dea03965c8eaa194a466246d8341b7a2d40e3 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 30 Mar 2025 23:02:59 +0800 Subject: [PATCH 15/20] Bump release --- xmobar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmobar.spec b/xmobar.spec index 5bf4541..e2bab4b 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -16,7 +16,7 @@ Name: %{pkg_name} Version: 0.48.1 # can only be reset when all subpkgs bumped -Release: 32%{?dist} +Release: 33%{?dist} Summary: A minimalistic text-based status bar License: BSD-3-Clause @@ -247,6 +247,9 @@ PATH=%{buildroot}%{_bindir}:$PATH %changelog +* Sun Mar 30 2025 Jens Petersen - 0.48.1-33 +- Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 0.48.1-32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 5f49532ca1254cfbe5ac4cadf012a3693dbb4352 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:57:07 +0000 Subject: [PATCH 16/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- xmobar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmobar.spec b/xmobar.spec index e2bab4b..b126b62 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -16,7 +16,7 @@ Name: %{pkg_name} Version: 0.48.1 # can only be reset when all subpkgs bumped -Release: 33%{?dist} +Release: 34%{?dist} Summary: A minimalistic text-based status bar License: BSD-3-Clause @@ -247,6 +247,9 @@ PATH=%{buildroot}%{_bindir}:$PATH %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.48.1-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Mar 30 2025 Jens Petersen - 0.48.1-33 - Rebuild From c88beac7bce74c862a31e6c172d489bf4279e7d2 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 12 Aug 2025 02:19:31 +0800 Subject: [PATCH 17/20] Bump release --- xmobar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmobar.spec b/xmobar.spec index b126b62..51d4632 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -16,7 +16,7 @@ Name: %{pkg_name} Version: 0.48.1 # can only be reset when all subpkgs bumped -Release: 34%{?dist} +Release: 35%{?dist} Summary: A minimalistic text-based status bar License: BSD-3-Clause @@ -247,6 +247,9 @@ PATH=%{buildroot}%{_bindir}:$PATH %changelog +* Mon Aug 11 2025 Jens Petersen - 0.48.1-35 +- Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 0.48.1-34 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 32157daaf1b6bddcd9b06c8366d2445657fb90aa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:46:48 +0000 Subject: [PATCH 18/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- xmobar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmobar.spec b/xmobar.spec index 51d4632..f8a167c 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -16,7 +16,7 @@ Name: %{pkg_name} Version: 0.48.1 # can only be reset when all subpkgs bumped -Release: 35%{?dist} +Release: 36%{?dist} Summary: A minimalistic text-based status bar License: BSD-3-Clause @@ -247,6 +247,9 @@ PATH=%{buildroot}%{_bindir}:$PATH %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 0.48.1-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Mon Aug 11 2025 Jens Petersen - 0.48.1-35 - Rebuild From e36a13c9180601f2a30b54727d8bd2e5d002f41d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 26 Jan 2026 22:52:07 +0800 Subject: [PATCH 19/20] update to 0.50 --- .gitignore | 1 + sources | 2 +- xmobar.spec | 15 +++++++++------ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 6037b3e..2b1b8ab 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ /xmobar-0.43.tar.gz /xmobar-0.46.tar.gz /xmobar-0.48.1.tar.gz +/xmobar-0.50.tar.gz diff --git a/sources b/sources index 5879509..71c4e96 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (netlink-1.1.1.0.tar.gz) = 2bb3d3c1a86e2de61e18a50366d9ecfa863df4959533db5ab3b127b4e02853cf4295ce7519a8ba7bbee9af0534c510aae99c567a5b23e8587e8e56113f530da3 SHA512 (pretty-hex-1.1.tar.gz) = e61223ea492d179e21dd0b26626e6dd32cc24e9e895e27ecedcdc20f70e7ca1db8ef69754a4273a4776d0574570c1d85de6e240f9d3ca0af003bd45416df7c3c -SHA512 (xmobar-0.48.1.tar.gz) = 69c4929f1d74100f886d4a259da279dd8ca39ec4380fcfdb3bda74025a21e307aeac53b30407c5868ed2e879bf62e7dbbb34321ccfd0874883d731b1ca606059 +SHA512 (xmobar-0.50.tar.gz) = 5458bd5a84f38062b211f918ce7964216189b4ae3ccf48164cc47bb5acf053b5ae4e35987564887d44bafcc3899f9d6e7228b91362a077351d5447f1f45bf940 diff --git a/xmobar.spec b/xmobar.spec index f8a167c..9753d79 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.3.0 --subpackage +# generated by cabal-rpm-2.3.2 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name xmobar @@ -14,9 +14,9 @@ %bcond tests 0 Name: %{pkg_name} -Version: 0.48.1 +Version: 0.50 # can only be reset when all subpkgs bumped -Release: 36%{?dist} +Release: 37%{?dist} Summary: A minimalistic text-based status bar License: BSD-3-Clause @@ -31,8 +31,8 @@ Source10: xmobar.desktop Patch0: xmobar-flags.patch # Begin cabal-rpm deps: -BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros-extra +BuildRequires: ghc-Cabal-devel BuildRequires: ghc-X11-devel BuildRequires: ghc-X11-xft-devel BuildRequires: ghc-aeson-devel @@ -99,12 +99,12 @@ BuildRequires: ghc-transformers-prof BuildRequires: ghc-unix-prof BuildRequires: ghc-utf8-string-prof %endif -BuildRequires: libXrandr-devel -BuildRequires: libXrender-devel %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} @@ -247,6 +247,9 @@ PATH=%{buildroot}%{_bindir}:$PATH %changelog +* Mon Jan 26 2026 Jens Petersen - 0.50-37 +- https://hackage.haskell.org/package/xmobar-0.50/changelog + * Sat Jan 17 2026 Fedora Release Engineering - 0.48.1-36 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From ade92f31b75b47cb31a5f37bff528349de3c4edf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:19:34 +0000 Subject: [PATCH 20/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- xmobar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmobar.spec b/xmobar.spec index 9753d79..65e035b 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -16,7 +16,7 @@ Name: %{pkg_name} Version: 0.50 # can only be reset when all subpkgs bumped -Release: 37%{?dist} +Release: 38%{?dist} Summary: A minimalistic text-based status bar License: BSD-3-Clause @@ -247,6 +247,9 @@ PATH=%{buildroot}%{_bindir}:$PATH %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 0.50-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Mon Jan 26 2026 Jens Petersen - 0.50-37 - https://hackage.haskell.org/package/xmobar-0.50/changelog