From 23900ab63e53fe3dfa95f19a612913dd8457f977 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 23 Jan 2023 02:08:03 +0800 Subject: [PATCH] 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