diff --git a/.gitignore b/.gitignore index 2b1b8ab..24c4f87 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,3 @@ /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 diff --git a/sources b/sources index 71c4e96..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.50.tar.gz) = 5458bd5a84f38062b211f918ce7964216189b4ae3ccf48164cc47bb5acf053b5ae4e35987564887d44bafcc3899f9d6e7228b91362a077351d5447f1f45bf940 +SHA512 (xmobar-0.43.tar.gz) = 0922cb4136bcd597669f6b4684ca56e7ed257eb58706cc3f499c83cee35f4cc30a1ea1d86066bcd06d007e9236e4ff2e47e48be9cb71122e4ae7abae0605bd56 diff --git a/xmobar-flags.patch b/xmobar-flags.patch index 61ddeb6..f2f9eba 100644 --- a/xmobar-flags.patch +++ b/xmobar-flags.patch @@ -1,5 +1,14 @@ 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 65e035b..9152f99 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -1,26 +1,24 @@ -# generated by cabal-rpm-2.3.2 --subpackage +# generated by cabal-rpm-2.0.12 --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 -%bcond tests 0 +%bcond_with tests Name: %{pkg_name} -Version: 0.50 +Version: 0.43 # can only be reset when all subpkgs bumped -Release: 38%{?dist} +Release: 25%{?dist} Summary: A minimalistic text-based status bar -License: BSD-3-Clause -URL: https://hackage.haskell.org/package/xmobar +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/%{netlink}/%{netlink}.tar.gz @@ -31,54 +29,18 @@ Source10: xmobar.desktop Patch0: xmobar-flags.patch # Begin cabal-rpm deps: -BuildRequires: ghc-rpm-macros-extra BuildRequires: ghc-Cabal-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 -BuildRequires: ghc-time-devel -BuildRequires: ghc-transformers-devel -BuildRequires: ghc-unix-devel -BuildRequires: ghc-utf8-string-devel -%if %{with ghc_prof} +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 -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 @@ -88,7 +50,6 @@ 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 @@ -98,18 +59,14 @@ 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} 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 # End cabal-rpm deps BuildRequires: desktop-file-utils BuildRequires: libXpm-devel @@ -170,8 +127,8 @@ This package provides the Haskell %{name} profiling library. %global main_version %{version} %if %{defined ghclibdir} -%ghc_lib_subpackage -l BSD-3-Clause %{netlink} -%ghc_lib_subpackage -l BSD-3-Clause %{prettyhex} +%ghc_lib_subpackage %{netlink} +%ghc_lib_subpackage %{prettyhex} %endif %global version %{main_version} @@ -180,8 +137,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 @@ -190,7 +147,7 @@ This package provides the Haskell %{name} profiling library. %ghc_lib_build # End cabal-rpm build -cd etc +cd examples %{_bindir}/ghc %{!?ghc_without_dynamic:-dynamic} --make xmonadpropwrite.hs cd - @@ -202,14 +159,13 @@ cd - # End cabal-rpm install desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE10} -install --mode=0755 -p etc/xmonadpropwrite %{buildroot}%{_bindir}/xmonadpropwrite +install --mode=0755 -p examples/xmonadpropwrite %{buildroot}%{_bindir}/xmonadpropwrite rm %{buildroot}%{_bindir}/{dump_nl80211,dump_rtnetlink,genlinfo} %check %if %{with tests} -PATH=%{buildroot}%{_bindir}:$PATH %cabal_test %endif @@ -217,12 +173,12 @@ PATH=%{buildroot}%{_bindir}:$PATH %files # Begin cabal-rpm files: %license license -%doc changelog.md readme.org +%doc changelog.md examples readme.org %{_bindir}/%{name} # End cabal-rpm files %{_bindir}/xmonadpropwrite %{_datadir}/applications/xmobar.desktop -%doc etc/xmobar.config +%doc examples/xmobar.config %files -n ghc-%{name} -f ghc-%{name}.files @@ -232,7 +188,7 @@ PATH=%{buildroot}%{_bindir}:$PATH %files -n ghc-%{name}-devel -f ghc-%{name}-devel.files -%doc changelog.md readme.org +%doc changelog.md examples readme.org %if %{with haddock} @@ -247,46 +203,6 @@ 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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