From 624f00e20823020772cea305e05548ac9d2705a0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 12:36:02 +0000 Subject: [PATCH 01/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_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 9446409..76e99eb 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -9,7 +9,7 @@ Name: xmobar Version: 0.27 # can only be reset when all subpkgs bumped -Release: 1%{?dist} +Release: 2%{?dist} Summary: A minimalistic text-based status bar License: BSD @@ -106,6 +106,9 @@ install --mode=0755 -p samples/xmonadpropwrite %{buildroot}%{_bindir}/xmonadprop %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 0.27-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sun Jul 22 2018 Jens Petersen - 0.27-1 - update to 0.27 - subpackage new iwlib dep From ceeee5b6e413274c116a980717a59e53d8068801 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 17 Feb 2019 22:48:08 +0800 Subject: [PATCH 02/52] refresh to cabal-rpm-0.13 --- xmobar.spec | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/xmobar.spec b/xmobar.spec index 76e99eb..98db3a5 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.12.5 +# generated by cabal-rpm-0.13 # https://fedoraproject.org/wiki/Packaging:Haskell %global iwlib iwlib-0.1.0 @@ -9,21 +9,23 @@ Name: xmobar Version: 0.27 # can only be reset when all subpkgs bumped -Release: 2%{?dist} +Release: 3%{?dist} Summary: A minimalistic text-based status bar License: BSD Url: https://hackage.haskell.org/package/%{name} +# Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz Source1: https://hackage.haskell.org/package/%{iwlib}/%{iwlib}.tar.gz +# End cabal-rpm sources Source10: xmobar.desktop Patch0: xmobar-0.23.1-flags.patch Patch1: xmobar-xft-fonts.patch +# Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros-extra -# Begin cabal-rpm deps: BuildRequires: ghc-HTTP-devel BuildRequires: ghc-X11-devel BuildRequires: ghc-X11-xft-devel @@ -72,15 +74,19 @@ color management, output templates, and extensibility through plugins. %prep +# Begin cabal-rpm setup: %setup -q -a1 +# End cabal-rpm setup %patch0 -p1 -b .orig %patch1 -p1 -b .fonts %build +# Begin cabal-rpm build: %ghc_libs_build %{subpkgs} %ghc_bin_build +# End cabal-rpm build cd samples %{_bindir}/ghc %{!?ghc_without_dynamic:-dynamic} --make xmonadpropwrite.hs @@ -88,24 +94,34 @@ cd - %install +# Begin cabal-rpm install %ghc_libs_install %{subpkgs} %ghc_bin_install +# End cabal-rpm install desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE10} install --mode=0755 -p samples/xmonadpropwrite %{buildroot}%{_bindir}/xmonadpropwrite +%check +%cabal_test + + %files +# Begin cabal-rpm files: %license license %doc changelog.md readme.md %{_bindir}/%{name} - +# End cabal-rpm files %{_bindir}/xmonadpropwrite %{_datadir}/applications/xmobar.desktop %doc samples/xmobar.config %changelog +* Sun Feb 17 2019 Jens Petersen - 0.27-3 +- refresh to cabal-rpm-0.13 + * Sun Feb 03 2019 Fedora Release Engineering - 0.27-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From ec8d14aa5c614e9a34d94c9b2369707eb9617a0b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 21 Feb 2019 15:14:17 +0800 Subject: [PATCH 03/52] update to 0.29.4 - now binlib - samples renamed to examples - drop xft font patch --- .gitignore | 1 + sources | 2 +- xmobar-xft-fonts.patch | 32 ----------------- xmobar.spec | 78 +++++++++++++++++++++++++++++++++++------- 4 files changed, 68 insertions(+), 45 deletions(-) delete mode 100644 xmobar-xft-fonts.patch diff --git a/.gitignore b/.gitignore index 804d4ef..c298aa3 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /xmobar-0.24.5.tar.gz /xmobar-0.27.tar.gz /iwlib-0.1.0.tar.gz +/xmobar-0.29.4.tar.gz diff --git a/sources b/sources index 4f9349f..eb8cf5c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (iwlib-0.1.0.tar.gz) = a6e6a6f7612d61911540938aa526216ef2b5121008b9ec97de4f1d82fd1655a31bd73cc161ed0b16a4445bd5e256e1cd1206b6a8fb7bc39bf8683ac1c2565f93 -SHA512 (xmobar-0.27.tar.gz) = 30c75c83778368ace1816ec4616014ccf28ba08e9161daf137819b2625bbb9b35e834311db776d51524866136196c3c217c7a723416f05b5b199f9f49aa06700 +SHA512 (xmobar-0.29.4.tar.gz) = d3bae9aa41ae1ef88c825d14b237d92c6a5baa521b5b1e94449bd0e1c7d6440a16de91c962df4fd184163e7f034a3fb43a71d08ec92936b419fd6e5436e38312 diff --git a/xmobar-xft-fonts.patch b/xmobar-xft-fonts.patch deleted file mode 100644 index 3a82b83..0000000 --- a/xmobar-xft-fonts.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- xmobar-0.27/samples/xmobar.config.fonts 2018-07-12 09:16:27.000000000 +0900 -+++ xmobar-0.27/samples/xmobar.config 2018-07-23 00:20:59.630748923 +0900 -@@ -1,4 +1,4 @@ --Config { font = "-misc-fixed-*-*-*-*-10-*-*-*-*-*-*-*" -+Config { font = "xft:mono-12" - , additionalFonts = [] - , borderColor = "black" - , border = TopB -diff -up xmobar-0.27/src/Config.hs.fonts xmobar-0.27/src/Config.hs ---- xmobar-0.27/src/Config.hs.fonts 2018-07-23 00:20:59.630748923 +0900 -+++ xmobar-0.27/src/Config.hs 2018-07-23 00:23:47.885897344 +0900 -@@ -113,7 +113,7 @@ data Border = NoBorder - -- | The default configuration values - defaultConfig :: Config - defaultConfig = -- Config { font = "-misc-fixed-*-*-*-*-10-*-*-*-*-*-*-*" -+ Config { font = "xft:mono-12" - , additionalFonts = [] - , wmClass = "xmobar" - , wmName = "xmobar" -diff -up xmobar-0.27/src/XUtil.hsc.fonts xmobar-0.27/src/XUtil.hsc ---- xmobar-0.27/src/XUtil.hsc.fonts 2018-07-12 09:16:27.000000000 +0900 -+++ xmobar-0.27/src/XUtil.hsc 2018-07-23 00:20:59.631748929 +0900 -@@ -98,7 +98,7 @@ initFont 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. diff --git a/xmobar.spec b/xmobar.spec index 98db3a5..9aee886 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -1,27 +1,29 @@ # generated by cabal-rpm-0.13 # https://fedoraproject.org/wiki/Packaging:Haskell +%global pkg_name xmobar +%global pkgver %{pkg_name}-%{version} + %global iwlib iwlib-0.1.0 %global subpkgs %{iwlib} %bcond_without tests -Name: xmobar -Version: 0.27 +Name: %{pkg_name} +Version: 0.29.4 # can only be reset when all subpkgs bumped -Release: 3%{?dist} +Release: 4%{?dist} Summary: A minimalistic text-based status bar License: BSD Url: https://hackage.haskell.org/package/%{name} # Begin cabal-rpm sources: -Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz +Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz Source1: https://hackage.haskell.org/package/%{iwlib}/%{iwlib}.tar.gz # End cabal-rpm sources Source10: xmobar.desktop Patch0: xmobar-0.23.1-flags.patch -Patch1: xmobar-xft-fonts.patch # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel @@ -29,9 +31,11 @@ BuildRequires: ghc-rpm-macros-extra BuildRequires: ghc-HTTP-devel BuildRequires: ghc-X11-devel BuildRequires: ghc-X11-xft-devel +BuildRequires: ghc-async-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-directory-devel +BuildRequires: ghc-extensible-exceptions-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-hinotify-devel #BuildRequires: ghc-iwlib-devel @@ -52,6 +56,7 @@ BuildRequires: libXrender-devel BuildRequires: wireless-tools-devel %if %{with tests} BuildRequires: ghc-hspec-devel +BuildRequires: ghc-temporary-devel %endif # End cabal-rpm deps BuildRequires: desktop-file-utils @@ -64,6 +69,33 @@ 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}-doc = %{version}-%{release} +%if %{defined ghc_version} +Requires: ghc-compiler = %{ghc_version} +Requires(post): ghc-compiler = %{ghc_version} +Requires(postun): ghc-compiler = %{ghc_version} +%endif +Requires: ghc-%{name}%{?_isa} = %{version}-%{release} +# Begin cabal-rpm deps: +Requires: libXrandr-devel%{?_isa} +Requires: libXrender-devel%{?_isa} +Requires: wireless-tools-devel%{?_isa} +# End cabal-rpm deps + +%description -n ghc-%{name}-devel +This package provides the Haskell %{name} library development files. + + %global main_version %{version} %if %{defined ghclibdir} @@ -79,16 +111,15 @@ color management, output templates, and extensibility through plugins. # End cabal-rpm setup %patch0 -p1 -b .orig -%patch1 -p1 -b .fonts %build # Begin cabal-rpm build: %ghc_libs_build %{subpkgs} -%ghc_bin_build +%ghc_lib_build # End cabal-rpm build -cd samples +cd examples %{_bindir}/ghc %{!?ghc_without_dynamic:-dynamic} --make xmonadpropwrite.hs cd - @@ -96,29 +127,52 @@ cd - %install # Begin cabal-rpm install %ghc_libs_install %{subpkgs} -%ghc_bin_install +%ghc_lib_install # End cabal-rpm install desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE10} -install --mode=0755 -p samples/xmonadpropwrite %{buildroot}%{_bindir}/xmonadpropwrite +install --mode=0755 -p examples/xmonadpropwrite %{buildroot}%{_bindir}/xmonadpropwrite %check %cabal_test +%post -n ghc-%{name}-devel +%ghc_pkg_recache + + +%postun -n ghc-%{name}-devel +%ghc_pkg_recache + + %files # Begin cabal-rpm files: %license license -%doc changelog.md readme.md +%doc changelog.md examples readme.md %{_bindir}/%{name} # End cabal-rpm files %{_bindir}/xmonadpropwrite %{_datadir}/applications/xmobar.desktop -%doc samples/xmobar.config +%doc examples/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 examples readme.md %changelog +* Sat Feb 23 2019 Jens Petersen - 0.29.4-4 +- update to 0.29.4 +- now binlib +- drop xft font patch for now + * Sun Feb 17 2019 Jens Petersen - 0.27-3 - refresh to cabal-rpm-0.13 From 2e92d5a57d1ae2b4d746984660a5870dee404dff Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 25 Feb 2019 15:42:16 +0800 Subject: [PATCH 04/52] testsuite pulls in alsa-mixer --- xmobar.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xmobar.spec b/xmobar.spec index 9aee886..c284119 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -7,7 +7,7 @@ %global iwlib iwlib-0.1.0 %global subpkgs %{iwlib} -%bcond_without tests +%bcond_with tests Name: %{pkg_name} Version: 0.29.4 @@ -109,7 +109,6 @@ This package provides the Haskell %{name} library development files. # Begin cabal-rpm setup: %setup -q -a1 # End cabal-rpm setup - %patch0 -p1 -b .orig From 32c895cd5bb94d79340a224442d4eacef576e191 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 4 Mar 2019 11:32:31 +0800 Subject: [PATCH 05/52] f30 libiw isn't linked to libm.so --- iwlib-0.1.0-libm.patch | 10 ++++++++++ xmobar.spec | 2 ++ 2 files changed, 12 insertions(+) create mode 100644 iwlib-0.1.0-libm.patch diff --git a/iwlib-0.1.0-libm.patch b/iwlib-0.1.0-libm.patch new file mode 100644 index 0000000..ba88a1e --- /dev/null +++ b/iwlib-0.1.0-libm.patch @@ -0,0 +1,10 @@ +--- iwlib-0.1.0/iwlib.cabal~ 2018-01-31 07:00:13.000000000 +0800 ++++ iwlib-0.1.0/iwlib.cabal 2019-03-04 11:24:19.033283194 +0800 +@@ -24,5 +24,5 @@ + includes: iwlib.h + default-language: Haskell2010 + exposed-modules: Network.IWlib +- extra-libraries: iw ++ extra-libraries: iw, m + ghc-options: -Wall +\ No newline at end of file diff --git a/xmobar.spec b/xmobar.spec index c284119..0569bd8 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -24,6 +24,7 @@ Source1: https://hackage.haskell.org/package/%{iwlib}/%{iwlib}.tar.gz Source10: xmobar.desktop Patch0: xmobar-0.23.1-flags.patch +Patch1: iwlib-0.1.0-libm.patch # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel @@ -110,6 +111,7 @@ This package provides the Haskell %{name} library development files. %setup -q -a1 # End cabal-rpm setup %patch0 -p1 -b .orig +%patch1 -p0 -b .orig %build From cd76d9d8e6cfa7fcb24833e2bf62bfe14fed52ef Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 4 Mar 2019 11:53:52 +0800 Subject: [PATCH 06/52] xmobar also needs libm (due to libiw) :( --- iwlib-0.1.0-libm.patch | 17 ++++++++++++++--- xmobar.spec | 2 +- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/iwlib-0.1.0-libm.patch b/iwlib-0.1.0-libm.patch index ba88a1e..12fab30 100644 --- a/iwlib-0.1.0-libm.patch +++ b/iwlib-0.1.0-libm.patch @@ -1,10 +1,21 @@ ---- iwlib-0.1.0/iwlib.cabal~ 2018-01-31 07:00:13.000000000 +0800 -+++ iwlib-0.1.0/iwlib.cabal 2019-03-04 11:24:19.033283194 +0800 +--- xmobar-0.29.4/iwlib-0.1.0/iwlib.cabal~ 2018-01-31 07:00:13.000000000 +0800 ++++ xmobar-0.29.4/iwlib-0.1.0/iwlib.cabal 2019-03-04 11:24:19.033283194 +0800 @@ -24,5 +24,5 @@ includes: iwlib.h default-language: Haskell2010 exposed-modules: Network.IWlib - extra-libraries: iw -+ extra-libraries: iw, m ++ extra-libraries: iw m ghc-options: -Wall \ No newline at end of file +--- xmobar-0.29.4/xmobar.cabal~ 2019-03-04 11:32:13.826170026 +0800 ++++ xmobar-0.29.4/xmobar.cabal 2019-03-04 11:48:38.178168287 +0800 +@@ -157,7 +157,7 @@ + Xmobar.Plugins.Monitors.Bright, + Xmobar.Plugins.Monitors.CatInt + +- extra-libraries: Xrandr Xrender ++ extra-libraries: Xrandr Xrender m + + ghc-options: -funbox-strict-fields -Wall -fno-warn-unused-do-bind + diff --git a/xmobar.spec b/xmobar.spec index 0569bd8..819d8dd 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -111,7 +111,7 @@ This package provides the Haskell %{name} library development files. %setup -q -a1 # End cabal-rpm setup %patch0 -p1 -b .orig -%patch1 -p0 -b .orig +%patch1 -p1 -b .orig %build From df84748ec5cf2a28bbb167205611b5704086d178 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 4 Mar 2019 13:46:32 +0800 Subject: [PATCH 07/52] -O0 for unregisterized ghc bug https://ghc.haskell.org/trac/ghc/ticket/15853 --- xmobar.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xmobar.spec b/xmobar.spec index 819d8dd..f5df262 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -115,6 +115,10 @@ This package provides the Haskell %{name} library development files. %build +# https://ghc.haskell.org/trac/ghc/ticket/15853 +%ifarch s390x +cabal_configure_extra_options="--ghc-option=-O0" +%endif # Begin cabal-rpm build: %ghc_libs_build %{subpkgs} %ghc_lib_build From 6d7944fd22db4276f4367295361acaa88592ae31 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 4 Mar 2019 21:49:29 +0800 Subject: [PATCH 08/52] rebuild without -O0 for s390x --- xmobar.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/xmobar.spec b/xmobar.spec index f5df262..0bb79e5 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -12,7 +12,7 @@ Name: %{pkg_name} Version: 0.29.4 # can only be reset when all subpkgs bumped -Release: 4%{?dist} +Release: 5%{?dist} Summary: A minimalistic text-based status bar License: BSD @@ -115,10 +115,6 @@ This package provides the Haskell %{name} library development files. %build -# https://ghc.haskell.org/trac/ghc/ticket/15853 -%ifarch s390x -cabal_configure_extra_options="--ghc-option=-O0" -%endif # Begin cabal-rpm build: %ghc_libs_build %{subpkgs} %ghc_lib_build @@ -173,6 +169,9 @@ install --mode=0755 -p examples/xmonadpropwrite %{buildroot}%{_bindir}/xmonadpro %changelog +* Mon Mar 4 2019 Jens Petersen - 0.29.4-5 +- rebuild without -O0 for s390x + * Sat Feb 23 2019 Jens Petersen - 0.29.4-4 - update to 0.29.4 - now binlib From 4e634951c0eb5ba2a73c7010fa6e478f8831516f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 04:23:44 +0000 Subject: [PATCH 09/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_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 0bb79e5..8f5e130 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -12,7 +12,7 @@ Name: %{pkg_name} Version: 0.29.4 # can only be reset when all subpkgs bumped -Release: 5%{?dist} +Release: 6%{?dist} Summary: A minimalistic text-based status bar License: BSD @@ -169,6 +169,9 @@ install --mode=0755 -p examples/xmonadpropwrite %{buildroot}%{_bindir}/xmonadpro %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 0.29.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Mon Mar 4 2019 Jens Petersen - 0.29.4-5 - rebuild without -O0 for s390x From ef09d4decd9a957ebfc12742ac18178ba44b0422 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Jul 2019 04:27:31 +0000 Subject: [PATCH 10/52] refresh to cabal-rpm-1.0.0: lib doc/prof subpkgs and bin static BRs --- xmobar.spec | 50 ++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 38 insertions(+), 12 deletions(-) diff --git a/xmobar.spec b/xmobar.spec index 8f5e130..f1602fe 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.13 +# generated by cabal-rpm-1.0.0 --subpackage # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name xmobar @@ -28,7 +28,14 @@ Patch1: iwlib-0.1.0-libm.patch # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel +%if %{with haddock} +BuildRequires: ghc-doc +%endif +%if %{with ghc_prof} +BuildRequires: ghc-prof +%endif BuildRequires: ghc-rpm-macros-extra +BuildRequires: chrpath BuildRequires: ghc-HTTP-devel BuildRequires: ghc-X11-devel BuildRequires: ghc-X11-xft-devel @@ -80,11 +87,8 @@ 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}-doc = %{version}-%{release} %if %{defined ghc_version} Requires: ghc-compiler = %{ghc_version} -Requires(post): ghc-compiler = %{ghc_version} -Requires(postun): ghc-compiler = %{ghc_version} %endif Requires: ghc-%{name}%{?_isa} = %{version}-%{release} # Begin cabal-rpm deps: @@ -97,6 +101,25 @@ Requires: wireless-tools-devel%{?_isa} This package provides the Haskell %{name} library development files. +%if %{with haddock} +%package -n ghc-%{name}-doc +Summary: Haskell %{name} library documentation + +%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} + +%description -n ghc-%{name}-prof +This package provides the Haskell %{name} profiling library. +%endif + + %global main_version %{version} %if %{defined ghclibdir} @@ -129,6 +152,7 @@ cd - # Begin cabal-rpm install %ghc_libs_install %{subpkgs} %ghc_lib_install +%ghc_fix_rpath %{pkgver} # End cabal-rpm install desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE10} @@ -139,14 +163,6 @@ install --mode=0755 -p examples/xmonadpropwrite %{buildroot}%{_bindir}/xmonadpro %cabal_test -%post -n ghc-%{name}-devel -%ghc_pkg_recache - - -%postun -n ghc-%{name}-devel -%ghc_pkg_recache - - %files # Begin cabal-rpm files: %license license @@ -168,6 +184,16 @@ install --mode=0755 -p examples/xmonadpropwrite %{buildroot}%{_bindir}/xmonadpro %doc changelog.md examples readme.md +%if %{with haddock} +%files -n ghc-%{name}-doc -f ghc-%{name}-doc.files +%endif + + +%if %{with ghc_prof} +%files -n ghc-%{name}-prof -f ghc-%{name}-prof.files +%endif + + %changelog * Sat Jul 27 2019 Fedora Release Engineering - 0.29.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 1b9b359fe67e0441a6f5630c6837e6e358f58807 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 27 Jul 2019 04:50:32 +0000 Subject: [PATCH 11/52] update to 0.29.5 --- .gitignore | 1 + sources | 2 +- xmobar.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c298aa3..1ef7e2e 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /xmobar-0.27.tar.gz /iwlib-0.1.0.tar.gz /xmobar-0.29.4.tar.gz +/xmobar-0.29.5.tar.gz diff --git a/sources b/sources index eb8cf5c..ed8c615 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (iwlib-0.1.0.tar.gz) = a6e6a6f7612d61911540938aa526216ef2b5121008b9ec97de4f1d82fd1655a31bd73cc161ed0b16a4445bd5e256e1cd1206b6a8fb7bc39bf8683ac1c2565f93 -SHA512 (xmobar-0.29.4.tar.gz) = d3bae9aa41ae1ef88c825d14b237d92c6a5baa521b5b1e94449bd0e1c7d6440a16de91c962df4fd184163e7f034a3fb43a71d08ec92936b419fd6e5436e38312 +SHA512 (xmobar-0.29.5.tar.gz) = a2decc9cc1c401303aee3657a0f049c6a5c912a780bf440fc164314a55b77c3bd1c40692e419c2e61528d3114682b2f7c0dc8a102d5169b55dbabfb3cef9c5b1 diff --git a/xmobar.spec b/xmobar.spec index f1602fe..3f021fe 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -10,9 +10,9 @@ %bcond_with tests Name: %{pkg_name} -Version: 0.29.4 +Version: 0.29.5 # can only be reset when all subpkgs bumped -Release: 6%{?dist} +Release: 7%{?dist} Summary: A minimalistic text-based status bar License: BSD @@ -195,6 +195,9 @@ install --mode=0755 -p examples/xmonadpropwrite %{buildroot}%{_bindir}/xmonadpro %changelog +* Sat Jul 27 2019 Jens Petersen - 0.29.5-7 +- update to 0.29.5 + * Sat Jul 27 2019 Fedora Release Engineering - 0.29.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 3e082563165352b72a68ecb51a5ed03901071b32 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 5 Aug 2019 18:33:30 +0800 Subject: [PATCH 12/52] BR prof for lib and static for executable --- xmobar.spec | 58 +++++++++++++++++++++++++---------------------------- 1 file changed, 27 insertions(+), 31 deletions(-) diff --git a/xmobar.spec b/xmobar.spec index 3f021fe..dc3896e 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-1.0.0 --subpackage +# generated by cabal-rpm-1.0.1 --subpackage # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name xmobar @@ -28,37 +28,32 @@ Patch1: iwlib-0.1.0-libm.patch # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel -%if %{with haddock} -BuildRequires: ghc-doc -%endif -%if %{with ghc_prof} -BuildRequires: ghc-prof -%endif BuildRequires: ghc-rpm-macros-extra -BuildRequires: chrpath -BuildRequires: ghc-HTTP-devel -BuildRequires: ghc-X11-devel -BuildRequires: ghc-X11-xft-devel -BuildRequires: ghc-async-devel -BuildRequires: ghc-bytestring-devel -BuildRequires: ghc-containers-devel -BuildRequires: ghc-directory-devel -BuildRequires: ghc-extensible-exceptions-devel -BuildRequires: ghc-filepath-devel -BuildRequires: ghc-hinotify-devel -#BuildRequires: ghc-iwlib-devel -BuildRequires: ghc-libmpd-devel -BuildRequires: ghc-mtl-devel -BuildRequires: ghc-old-locale-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 +BuildRequires: ghc-X11-prof +BuildRequires: ghc-X11-xft-prof +BuildRequires: ghc-async-prof +BuildRequires: ghc-base-prof +BuildRequires: ghc-bytestring-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-conduit-prof +BuildRequires: ghc-http-types-prof +#BuildRequires: ghc-iwlib-prof +BuildRequires: ghc-libmpd-prof +BuildRequires: ghc-mtl-prof +BuildRequires: ghc-old-locale-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 BuildRequires: libXrandr-devel BuildRequires: libXrender-devel BuildRequires: wireless-tools-devel @@ -87,6 +82,7 @@ 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 From f66465d1b5aa24d4fc3191bc66995d06547b003e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 13 Sep 2019 18:31:06 +0800 Subject: [PATCH 13/52] revert to 0.29.4 which builds okay 0.29.5 failed with libiw(?) linking error --- .gitignore | 1 - sources | 2 +- xmobar.spec | 10 +++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 1ef7e2e..c298aa3 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,3 @@ /xmobar-0.27.tar.gz /iwlib-0.1.0.tar.gz /xmobar-0.29.4.tar.gz -/xmobar-0.29.5.tar.gz diff --git a/sources b/sources index ed8c615..eb8cf5c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (iwlib-0.1.0.tar.gz) = a6e6a6f7612d61911540938aa526216ef2b5121008b9ec97de4f1d82fd1655a31bd73cc161ed0b16a4445bd5e256e1cd1206b6a8fb7bc39bf8683ac1c2565f93 -SHA512 (xmobar-0.29.5.tar.gz) = a2decc9cc1c401303aee3657a0f049c6a5c912a780bf440fc164314a55b77c3bd1c40692e419c2e61528d3114682b2f7c0dc8a102d5169b55dbabfb3cef9c5b1 +SHA512 (xmobar-0.29.4.tar.gz) = d3bae9aa41ae1ef88c825d14b237d92c6a5baa521b5b1e94449bd0e1c7d6440a16de91c962df4fd184163e7f034a3fb43a71d08ec92936b419fd6e5436e38312 diff --git a/xmobar.spec b/xmobar.spec index dc3896e..cca3d5a 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -7,10 +7,11 @@ %global iwlib iwlib-0.1.0 %global subpkgs %{iwlib} +# needs alsa-mixer package %bcond_with tests Name: %{pkg_name} -Version: 0.29.5 +Version: 0.29.4 # can only be reset when all subpkgs bumped Release: 7%{?dist} Summary: A minimalistic text-based status bar @@ -29,6 +30,7 @@ Patch1: iwlib-0.1.0-libm.patch # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros-extra +BuildRequires: ghc-HTTP-prof BuildRequires: ghc-X11-prof BuildRequires: ghc-X11-xft-prof BuildRequires: ghc-async-prof @@ -39,8 +41,6 @@ BuildRequires: ghc-directory-prof BuildRequires: ghc-extensible-exceptions-prof BuildRequires: ghc-filepath-prof BuildRequires: ghc-hinotify-prof -BuildRequires: ghc-http-conduit-prof -BuildRequires: ghc-http-types-prof #BuildRequires: ghc-iwlib-prof BuildRequires: ghc-libmpd-prof BuildRequires: ghc-mtl-prof @@ -191,8 +191,8 @@ install --mode=0755 -p examples/xmonadpropwrite %{buildroot}%{_bindir}/xmonadpro %changelog -* Sat Jul 27 2019 Jens Petersen - 0.29.5-7 -- update to 0.29.5 +* Fri Sep 13 2019 Jens Petersen - 0.29.4-7 +- add doc and prof subpackages (cabal-rpm-1.0) * Sat Jul 27 2019 Fedora Release Engineering - 0.29.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From b26b896bf03ad5769d7530eae5d10ad7f531f300 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 04:38:42 +0000 Subject: [PATCH 14/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_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 cca3d5a..46dbba9 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -13,7 +13,7 @@ Name: %{pkg_name} Version: 0.29.4 # can only be reset when all subpkgs bumped -Release: 7%{?dist} +Release: 8%{?dist} Summary: A minimalistic text-based status bar License: BSD @@ -191,6 +191,9 @@ install --mode=0755 -p examples/xmonadpropwrite %{buildroot}%{_bindir}/xmonadpro %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 0.29.4-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Sep 13 2019 Jens Petersen - 0.29.4-7 - add doc and prof subpackages (cabal-rpm-1.0) From ec6f2b9de417987e0d310750b8c1f756479aecc4 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 8 Feb 2020 22:53:13 +0800 Subject: [PATCH 15/52] refresh to cabal-rpm-2.0.2 --- xmobar.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/xmobar.spec b/xmobar.spec index 46dbba9..af0057c 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-1.0.1 --subpackage +# generated by cabal-rpm-2.0.2 --subpackage # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name xmobar @@ -100,6 +100,7 @@ This package provides the Haskell %{name} library development files. %if %{with haddock} %package -n ghc-%{name}-doc Summary: Haskell %{name} library documentation +BuildArch: noarch %description -n ghc-%{name}-doc This package provides the Haskell %{name} library documentation. @@ -110,6 +111,7 @@ This package provides the Haskell %{name} library documentation. %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. @@ -159,6 +161,16 @@ install --mode=0755 -p examples/xmonadpropwrite %{buildroot}%{_bindir}/xmonadpro %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 + + %files # Begin cabal-rpm files: %license license @@ -182,6 +194,7 @@ install --mode=0755 -p examples/xmonadpropwrite %{buildroot}%{_bindir}/xmonadpro %if %{with haddock} %files -n ghc-%{name}-doc -f ghc-%{name}-doc.files +%license license %endif From f93bfa70d1965a5eee583355a97d9d69707973be Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 14 Feb 2020 15:02:14 +0800 Subject: [PATCH 16/52] update to 0.32 --- .gitignore | 1 + sources | 2 +- xmobar.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c298aa3..f8b546b 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /xmobar-0.27.tar.gz /iwlib-0.1.0.tar.gz /xmobar-0.29.4.tar.gz +/xmobar-0.32.tar.gz diff --git a/sources b/sources index eb8cf5c..56ca568 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (iwlib-0.1.0.tar.gz) = a6e6a6f7612d61911540938aa526216ef2b5121008b9ec97de4f1d82fd1655a31bd73cc161ed0b16a4445bd5e256e1cd1206b6a8fb7bc39bf8683ac1c2565f93 -SHA512 (xmobar-0.29.4.tar.gz) = d3bae9aa41ae1ef88c825d14b237d92c6a5baa521b5b1e94449bd0e1c7d6440a16de91c962df4fd184163e7f034a3fb43a71d08ec92936b419fd6e5436e38312 +SHA512 (xmobar-0.32.tar.gz) = 6a4ffd51c4af8b5e1e3236d2c96929d08d06692a0ce4bd38d9620c31f45296aa87676aa97513eaadf0d497b3d9c23d1c83f716f39883e82c6e787b7eaca91fd2 diff --git a/xmobar.spec b/xmobar.spec index af0057c..6fd5cdb 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -11,7 +11,7 @@ %bcond_with tests Name: %{pkg_name} -Version: 0.29.4 +Version: 0.32 # can only be reset when all subpkgs bumped Release: 8%{?dist} Summary: A minimalistic text-based status bar @@ -30,7 +30,6 @@ Patch1: iwlib-0.1.0-libm.patch # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros-extra -BuildRequires: ghc-HTTP-prof BuildRequires: ghc-X11-prof BuildRequires: ghc-X11-xft-prof BuildRequires: ghc-async-prof @@ -41,6 +40,8 @@ BuildRequires: ghc-directory-prof BuildRequires: ghc-extensible-exceptions-prof BuildRequires: ghc-filepath-prof BuildRequires: ghc-hinotify-prof +BuildRequires: ghc-http-conduit-prof +BuildRequires: ghc-http-types-prof #BuildRequires: ghc-iwlib-prof BuildRequires: ghc-libmpd-prof BuildRequires: ghc-mtl-prof @@ -204,6 +205,9 @@ install --mode=0755 -p examples/xmonadpropwrite %{buildroot}%{_bindir}/xmonadpro %changelog +* Fri Feb 14 2020 Jens Petersen - 0.32-8 +- update to 0.32 + * Fri Jan 31 2020 Fedora Release Engineering - 0.29.4-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 78314f2643be86f1d6694c9f0ee32efc02c4b760 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 23 Feb 2020 20:26:14 +0800 Subject: [PATCH 17/52] bump release --- xmobar.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xmobar.spec b/xmobar.spec index 6fd5cdb..c5d1875 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -13,7 +13,7 @@ Name: %{pkg_name} Version: 0.32 # can only be reset when all subpkgs bumped -Release: 8%{?dist} +Release: 9%{?dist} Summary: A minimalistic text-based status bar License: BSD @@ -205,7 +205,7 @@ install --mode=0755 -p examples/xmonadpropwrite %{buildroot}%{_bindir}/xmonadpro %changelog -* Fri Feb 14 2020 Jens Petersen - 0.32-8 +* Sun Feb 23 2020 Jens Petersen - 0.32-9 - update to 0.32 * Fri Jan 31 2020 Fedora Release Engineering - 0.29.4-8 From 1c328f3454d248e1790ac7fc4825bcbd7154854b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 24 Feb 2020 20:43:32 +0800 Subject: [PATCH 18/52] drop the libm patch since wireless-tools fixed --- iwlib-0.1.0-libm.patch | 21 --------------------- xmobar.spec | 7 ++++--- 2 files changed, 4 insertions(+), 24 deletions(-) delete mode 100644 iwlib-0.1.0-libm.patch diff --git a/iwlib-0.1.0-libm.patch b/iwlib-0.1.0-libm.patch deleted file mode 100644 index 12fab30..0000000 --- a/iwlib-0.1.0-libm.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- xmobar-0.29.4/iwlib-0.1.0/iwlib.cabal~ 2018-01-31 07:00:13.000000000 +0800 -+++ xmobar-0.29.4/iwlib-0.1.0/iwlib.cabal 2019-03-04 11:24:19.033283194 +0800 -@@ -24,5 +24,5 @@ - includes: iwlib.h - default-language: Haskell2010 - exposed-modules: Network.IWlib -- extra-libraries: iw -+ extra-libraries: iw m - ghc-options: -Wall -\ No newline at end of file ---- xmobar-0.29.4/xmobar.cabal~ 2019-03-04 11:32:13.826170026 +0800 -+++ xmobar-0.29.4/xmobar.cabal 2019-03-04 11:48:38.178168287 +0800 -@@ -157,7 +157,7 @@ - Xmobar.Plugins.Monitors.Bright, - Xmobar.Plugins.Monitors.CatInt - -- extra-libraries: Xrandr Xrender -+ extra-libraries: Xrandr Xrender m - - ghc-options: -funbox-strict-fields -Wall -fno-warn-unused-do-bind - diff --git a/xmobar.spec b/xmobar.spec index c5d1875..978c183 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -13,7 +13,7 @@ Name: %{pkg_name} Version: 0.32 # can only be reset when all subpkgs bumped -Release: 9%{?dist} +Release: 10%{?dist} Summary: A minimalistic text-based status bar License: BSD @@ -25,7 +25,6 @@ Source1: https://hackage.haskell.org/package/%{iwlib}/%{iwlib}.tar.gz Source10: xmobar.desktop Patch0: xmobar-0.23.1-flags.patch -Patch1: iwlib-0.1.0-libm.patch # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel @@ -133,7 +132,6 @@ This package provides the Haskell %{name} profiling library. %setup -q -a1 # End cabal-rpm setup %patch0 -p1 -b .orig -%patch1 -p1 -b .orig %build @@ -205,6 +203,9 @@ install --mode=0755 -p examples/xmonadpropwrite %{buildroot}%{_bindir}/xmonadpro %changelog +* Mon Feb 24 2020 Jens Petersen - 0.32-10 +- drop the libm patch + * Sun Feb 23 2020 Jens Petersen - 0.32-9 - update to 0.32 From 953fd1ba2ff3451eeb1ac3204fcb174682d66dff Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 4 Jun 2020 19:29:29 +0800 Subject: [PATCH 19/52] refresh to cabal-rpm-2.0.5 --- xmobar.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xmobar.spec b/xmobar.spec index 978c183..727d84a 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -1,5 +1,5 @@ -# generated by cabal-rpm-2.0.2 --subpackage -# https://fedoraproject.org/wiki/Packaging:Haskell +# generated by cabal-rpm-2.0.5 --subpackage +# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name xmobar %global pkgver %{pkg_name}-%{version} From d8105456e3adbef1fcf5be08e23143a291e75609 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 10 Jun 2020 14:44:09 +0800 Subject: [PATCH 20/52] update to 0.33 --- .gitignore | 1 + sources | 2 +- ...3.1-flags.patch => xmobar-0.33-flags.patch | 21 ++++++++++--------- xmobar.spec | 9 +++++--- 4 files changed, 19 insertions(+), 14 deletions(-) rename xmobar-0.23.1-flags.patch => xmobar-0.33-flags.patch (52%) diff --git a/.gitignore b/.gitignore index f8b546b..05801c2 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /iwlib-0.1.0.tar.gz /xmobar-0.29.4.tar.gz /xmobar-0.32.tar.gz +/xmobar-0.33.tar.gz diff --git a/sources b/sources index 56ca568..212ffe7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (iwlib-0.1.0.tar.gz) = a6e6a6f7612d61911540938aa526216ef2b5121008b9ec97de4f1d82fd1655a31bd73cc161ed0b16a4445bd5e256e1cd1206b6a8fb7bc39bf8683ac1c2565f93 -SHA512 (xmobar-0.32.tar.gz) = 6a4ffd51c4af8b5e1e3236d2c96929d08d06692a0ce4bd38d9620c31f45296aa87676aa97513eaadf0d497b3d9c23d1c83f716f39883e82c6e787b7eaca91fd2 +SHA512 (xmobar-0.33.tar.gz) = 354fddd59927c784f52f0056e050963fcf135c0f0242be2914ad0dd3a6c1d6b0682e1713c1f6d3c64f9d22b9666033d65c8a9a5a3017dc0dd3f528441dc1ff69 diff --git a/xmobar-0.23.1-flags.patch b/xmobar-0.33-flags.patch similarity index 52% rename from xmobar-0.23.1-flags.patch rename to xmobar-0.33-flags.patch index 96c8c51..0f1d6d2 100644 --- a/xmobar-0.23.1-flags.patch +++ b/xmobar-0.33-flags.patch @@ -1,9 +1,6 @@ -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 +--- xmobar-0.33/xmobar.cabal~ 2020-02-27 04:51:21.000000000 +0800 ++++ xmobar-0.33/xmobar.cabal 2020-06-17 16:44:54.516116286 +0800 +@@ -29,7 +29,7 @@ flag with_xft description: Use Xft to render text. UTF-8 support included. @@ -12,7 +9,7 @@ diff -u -r -U5 --no-dereference xmobar-0.23.1/xmobar.cabal xmobar-0.23.1.flags/x flag with_utf8 description: With UTF-8 support. - default: True +@@ -37,7 +37,7 @@ flag with_inotify description: inotify support (modern Linux only). Required for the Mail and MBox plugins. @@ -20,7 +17,11 @@ diff -u -r -U5 --no-dereference xmobar-0.23.1/xmobar.cabal xmobar-0.23.1.flags/x + default: True flag with_iwlib - description: Wireless info support. Required for the Wireless plugin, needs iwlib installed. + 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 @@ -31,5 +32,5 @@ diff -u -r -U5 --no-dereference xmobar-0.23.1/xmobar.cabal xmobar-0.23.1.flags/x flag all_extensions description: Includes all optional extensions. - default: False - + +Diff finished. Wed Jun 17 16:45:04 2020 diff --git a/xmobar.spec b/xmobar.spec index 727d84a..56cb900 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -11,9 +11,9 @@ %bcond_with tests Name: %{pkg_name} -Version: 0.32 +Version: 0.33 # can only be reset when all subpkgs bumped -Release: 10%{?dist} +Release: 11%{?dist} Summary: A minimalistic text-based status bar License: BSD @@ -24,7 +24,7 @@ Source1: https://hackage.haskell.org/package/%{iwlib}/%{iwlib}.tar.gz # End cabal-rpm sources Source10: xmobar.desktop -Patch0: xmobar-0.23.1-flags.patch +Patch0: xmobar-0.33-flags.patch # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel @@ -203,6 +203,9 @@ install --mode=0755 -p examples/xmonadpropwrite %{buildroot}%{_bindir}/xmonadpro %changelog +* Wed Jun 10 2020 Jens Petersen - 0.33-11 +- update to 0.33 + * Mon Feb 24 2020 Jens Petersen - 0.32-10 - drop the libm patch From 9d2da718e15af7ffe3eff57e243861893aa698e6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 19 Jun 2020 16:58:07 +0800 Subject: [PATCH 21/52] refresh to cabal-rpm-2.0.6 --- xmobar.spec | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/xmobar.spec b/xmobar.spec index 56cb900..1e7f0e3 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.0.5 --subpackage +# generated by cabal-rpm-2.0.6 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name xmobar @@ -130,6 +130,7 @@ This package provides the Haskell %{name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -a1 +chmod a-x changelog.md readme.md # End cabal-rpm setup %patch0 -p1 -b .orig @@ -160,16 +161,6 @@ install --mode=0755 -p examples/xmonadpropwrite %{buildroot}%{_bindir}/xmonadpro %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 - - %files # Begin cabal-rpm files: %license license From 69feb9d65f841af834a4d493a52da3bc6e395687 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 20 Jun 2020 00:53:44 +0800 Subject: [PATCH 22/52] update to 0.34 drop netlink since it pulls in 2 more deps --- .gitignore | 1 + sources | 2 +- xmobar-0.33-flags.patch | 14 ++++++-------- xmobar.spec | 9 +++++++-- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 05801c2..868dbe3 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /xmobar-0.29.4.tar.gz /xmobar-0.32.tar.gz /xmobar-0.33.tar.gz +/xmobar-0.34.tar.gz diff --git a/sources b/sources index 212ffe7..b51a842 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (iwlib-0.1.0.tar.gz) = a6e6a6f7612d61911540938aa526216ef2b5121008b9ec97de4f1d82fd1655a31bd73cc161ed0b16a4445bd5e256e1cd1206b6a8fb7bc39bf8683ac1c2565f93 -SHA512 (xmobar-0.33.tar.gz) = 354fddd59927c784f52f0056e050963fcf135c0f0242be2914ad0dd3a6c1d6b0682e1713c1f6d3c64f9d22b9666033d65c8a9a5a3017dc0dd3f528441dc1ff69 +SHA512 (xmobar-0.34.tar.gz) = a5c87199eea7ee20190fc707876b522235131ea3bd0340154ba505a9cfaf9d040efcc2df21503a15a3b1adb402ef71777cebf8fe49f1fe91c094ba7d8bc95c6e diff --git a/xmobar-0.33-flags.patch b/xmobar-0.33-flags.patch index 0f1d6d2..d66e845 100644 --- a/xmobar-0.33-flags.patch +++ b/xmobar-0.33-flags.patch @@ -1,5 +1,5 @@ ---- xmobar-0.33/xmobar.cabal~ 2020-02-27 04:51:21.000000000 +0800 -+++ xmobar-0.33/xmobar.cabal 2020-06-17 16:44:54.516116286 +0800 +--- xmobar-0.34/xmobar.cabal.orig 2001-09-09 09:46:40.000000000 +0800 ++++ xmobar-0.34/xmobar.cabal 2020-06-20 11:53:14.070561543 +0800 @@ -29,7 +29,7 @@ flag with_xft @@ -9,7 +9,7 @@ flag with_utf8 description: With UTF-8 support. -@@ -37,7 +37,7 @@ +@@ -37,11 +37,11 @@ flag with_inotify description: inotify support (modern Linux only). Required for the Mail and MBox plugins. @@ -18,12 +18,12 @@ flag with_iwlib description: Wireless info support via Wext ioctls (deprecated). Required for the Wireless plugin, needs iwlib installed. -@@ -45,11 +45,11 @@ +- default: False ++ default: True flag with_nl80211 description: Wireless info support via nl80211. Required for the Wireless plugin on systems running Linux, the kernel. -- default: False -+ default: True +@@ -49,7 +49,7 @@ flag with_mpd description: MPD support. Needs libmpd installed. @@ -32,5 +32,3 @@ flag all_extensions description: Includes all optional extensions. - -Diff finished. Wed Jun 17 16:45:04 2020 diff --git a/xmobar.spec b/xmobar.spec index 1e7f0e3..9fca6f8 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -11,9 +11,9 @@ %bcond_with tests Name: %{pkg_name} -Version: 0.33 +Version: 0.34 # can only be reset when all subpkgs bumped -Release: 11%{?dist} +Release: 12%{?dist} Summary: A minimalistic text-based status bar License: BSD @@ -39,6 +39,7 @@ 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-iwlib-prof @@ -151,6 +152,7 @@ cd - %ghc_libs_install %{subpkgs} %ghc_lib_install %ghc_fix_rpath %{pkgver} +chmod a-x changelog.md readme.md # End cabal-rpm install desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE10} @@ -194,6 +196,9 @@ install --mode=0755 -p examples/xmonadpropwrite %{buildroot}%{_bindir}/xmonadpro %changelog +* Fri Jun 19 2020 Jens Petersen - 0.34-12 +- update to 0.34 + * Wed Jun 10 2020 Jens Petersen - 0.33-11 - update to 0.33 From bc20533e3bf71fbb606679bfbcadae34478a2459 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 16 Jul 2020 20:26:38 +0800 Subject: [PATCH 23/52] update to 0.35.1 --- .gitignore | 1 + sources | 2 +- xmobar.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 868dbe3..90bcba9 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /xmobar-0.32.tar.gz /xmobar-0.33.tar.gz /xmobar-0.34.tar.gz +/xmobar-0.35.1.tar.gz diff --git a/sources b/sources index b51a842..bcbd08f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (iwlib-0.1.0.tar.gz) = a6e6a6f7612d61911540938aa526216ef2b5121008b9ec97de4f1d82fd1655a31bd73cc161ed0b16a4445bd5e256e1cd1206b6a8fb7bc39bf8683ac1c2565f93 -SHA512 (xmobar-0.34.tar.gz) = a5c87199eea7ee20190fc707876b522235131ea3bd0340154ba505a9cfaf9d040efcc2df21503a15a3b1adb402ef71777cebf8fe49f1fe91c094ba7d8bc95c6e +SHA512 (xmobar-0.35.1.tar.gz) = fd7bb8710f3c877835aa0b20e0fca227f6f620c0be31acd46e6a464b4ba3f6c7da8df31cd3f345e606b03a54328dd9a298e46e8fc2935e74ebd8c5712cedbf76 diff --git a/xmobar.spec b/xmobar.spec index 9fca6f8..434c8f7 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -11,9 +11,9 @@ %bcond_with tests Name: %{pkg_name} -Version: 0.34 +Version: 0.35.1 # can only be reset when all subpkgs bumped -Release: 12%{?dist} +Release: 13%{?dist} Summary: A minimalistic text-based status bar License: BSD @@ -196,6 +196,9 @@ install --mode=0755 -p examples/xmonadpropwrite %{buildroot}%{_bindir}/xmonadpro %changelog +* Thu Jul 16 2020 Jens Petersen - 0.35.1-13 +- update to 0.35.1 + * Fri Jun 19 2020 Jens Petersen - 0.34-12 - update to 0.34 From 88161a545c62228b08db57a5656500755756accf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:52:32 +0000 Subject: [PATCH 24/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_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 434c8f7..09b2dc8 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -13,7 +13,7 @@ Name: %{pkg_name} Version: 0.35.1 # can only be reset when all subpkgs bumped -Release: 13%{?dist} +Release: 14%{?dist} Summary: A minimalistic text-based status bar License: BSD @@ -196,6 +196,9 @@ install --mode=0755 -p examples/xmonadpropwrite %{buildroot}%{_bindir}/xmonadpro %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 0.35.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Jul 16 2020 Jens Petersen - 0.35.1-13 - update to 0.35.1 From 5c8621d69cca6a757a4f5f1aafce372009e9952d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 09:46:13 +0000 Subject: [PATCH 25/52] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmobar.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xmobar.spec b/xmobar.spec index 09b2dc8..1647596 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -13,7 +13,7 @@ Name: %{pkg_name} Version: 0.35.1 # can only be reset when all subpkgs bumped -Release: 14%{?dist} +Release: 15%{?dist} Summary: A minimalistic text-based status bar License: BSD @@ -196,6 +196,10 @@ install --mode=0755 -p examples/xmonadpropwrite %{buildroot}%{_bindir}/xmonadpro %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 0.35.1-15 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 0.35.1-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From edcb22744e31dbe9610b5c48f5fcb3936809653d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 19 Aug 2020 21:53:35 +0800 Subject: [PATCH 26/52] switch from iwlib to netlink (#1860943) --- .gitignore | 2 ++ sources | 3 +- xmobar-0.33-flags.patch => xmobar-flags.patch | 12 ++++---- xmobar.spec | 30 ++++++++++++------- 4 files changed, 30 insertions(+), 17 deletions(-) rename xmobar-0.33-flags.patch => xmobar-flags.patch (82%) diff --git a/.gitignore b/.gitignore index 90bcba9..504f70e 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,5 @@ /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 diff --git a/sources b/sources index bcbd08f..98ce82b 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ -SHA512 (iwlib-0.1.0.tar.gz) = a6e6a6f7612d61911540938aa526216ef2b5121008b9ec97de4f1d82fd1655a31bd73cc161ed0b16a4445bd5e256e1cd1206b6a8fb7bc39bf8683ac1c2565f93 +SHA512 (netlink-1.1.1.0.tar.gz) = 2bb3d3c1a86e2de61e18a50366d9ecfa863df4959533db5ab3b127b4e02853cf4295ce7519a8ba7bbee9af0534c510aae99c567a5b23e8587e8e56113f530da3 +SHA512 (pretty-hex-1.1.tar.gz) = e61223ea492d179e21dd0b26626e6dd32cc24e9e895e27ecedcdc20f70e7ca1db8ef69754a4273a4776d0574570c1d85de6e240f9d3ca0af003bd45416df7c3c SHA512 (xmobar-0.35.1.tar.gz) = fd7bb8710f3c877835aa0b20e0fca227f6f620c0be31acd46e6a464b4ba3f6c7da8df31cd3f345e606b03a54328dd9a298e46e8fc2935e74ebd8c5712cedbf76 diff --git a/xmobar-0.33-flags.patch b/xmobar-flags.patch similarity index 82% rename from xmobar-0.33-flags.patch rename to xmobar-flags.patch index d66e845..f2f9eba 100644 --- a/xmobar-0.33-flags.patch +++ b/xmobar-flags.patch @@ -1,5 +1,5 @@ ---- xmobar-0.34/xmobar.cabal.orig 2001-09-09 09:46:40.000000000 +0800 -+++ xmobar-0.34/xmobar.cabal 2020-06-20 11:53:14.070561543 +0800 +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 @@ -9,7 +9,7 @@ flag with_utf8 description: With UTF-8 support. -@@ -37,11 +37,11 @@ +@@ -37,7 +37,7 @@ flag with_inotify description: inotify support (modern Linux only). Required for the Mail and MBox plugins. @@ -18,12 +18,12 @@ flag with_iwlib description: Wireless info support via Wext ioctls (deprecated). Required for the Wireless plugin, needs iwlib installed. -- default: False -+ default: True +@@ -45,11 +45,11 @@ flag with_nl80211 description: Wireless info support via nl80211. Required for the Wireless plugin on systems running Linux, the kernel. -@@ -49,7 +49,7 @@ +- default: False ++ default: True flag with_mpd description: MPD support. Needs libmpd installed. diff --git a/xmobar.spec b/xmobar.spec index 1647596..7de3423 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -4,8 +4,9 @@ %global pkg_name xmobar %global pkgver %{pkg_name}-%{version} -%global iwlib iwlib-0.1.0 -%global subpkgs %{iwlib} +%global netlink netlink-1.1.1.0 +%global prettyhex pretty-hex-1.1 +%global subpkgs %{prettyhex} %{netlink} # needs alsa-mixer package %bcond_with tests @@ -13,18 +14,19 @@ Name: %{pkg_name} Version: 0.35.1 # can only be reset when all subpkgs bumped -Release: 15%{?dist} +Release: 16%{?dist} Summary: A minimalistic text-based status bar 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/%{iwlib}/%{iwlib}.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 Source10: xmobar.desktop -Patch0: xmobar-0.33-flags.patch +Patch0: xmobar-flags.patch # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel @@ -34,6 +36,7 @@ BuildRequires: ghc-X11-xft-prof BuildRequires: ghc-async-prof BuildRequires: ghc-base-prof BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-cereal-prof BuildRequires: ghc-containers-prof BuildRequires: ghc-directory-prof BuildRequires: ghc-extensible-exceptions-prof @@ -42,9 +45,9 @@ BuildRequires: ghc-hinotify-prof BuildRequires: ghc-http-client-tls-prof BuildRequires: ghc-http-conduit-prof BuildRequires: ghc-http-types-prof -#BuildRequires: ghc-iwlib-prof BuildRequires: ghc-libmpd-prof BuildRequires: ghc-mtl-prof +#BuildRequires: ghc-netlink-prof BuildRequires: ghc-old-locale-prof BuildRequires: ghc-parsec-prof BuildRequires: ghc-parsec-numbers-prof @@ -57,11 +60,13 @@ BuildRequires: ghc-unix-prof BuildRequires: ghc-utf8-string-prof BuildRequires: libXrandr-devel BuildRequires: libXrender-devel -BuildRequires: wireless-tools-devel %if %{with tests} BuildRequires: ghc-hspec-devel BuildRequires: ghc-temporary-devel %endif +# for missing dep 'netlink': +BuildRequires: ghc-monad-loops-prof +#BuildRequires: ghc-pretty-hex-prof # End cabal-rpm deps BuildRequires: desktop-file-utils BuildRequires: libXpm-devel @@ -91,7 +96,6 @@ Requires: ghc-%{name}%{?_isa} = %{version}-%{release} # Begin cabal-rpm deps: Requires: libXrandr-devel%{?_isa} Requires: libXrender-devel%{?_isa} -Requires: wireless-tools-devel%{?_isa} # End cabal-rpm deps %description -n ghc-%{name}-devel @@ -122,7 +126,8 @@ This package provides the Haskell %{name} profiling library. %global main_version %{version} %if %{defined ghclibdir} -%ghc_lib_subpackage %{iwlib} +%ghc_lib_subpackage %{netlink} +%ghc_lib_subpackage %{prettyhex} %endif %global version %{main_version} @@ -130,7 +135,7 @@ This package provides the Haskell %{name} profiling library. %prep # Begin cabal-rpm setup: -%setup -q -a1 +%setup -q -a1 -a2 chmod a-x changelog.md readme.md # End cabal-rpm setup %patch0 -p1 -b .orig @@ -158,6 +163,8 @@ chmod a-x changelog.md readme.md desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE10} install --mode=0755 -p examples/xmonadpropwrite %{buildroot}%{_bindir}/xmonadpropwrite +rm %{buildroot}%{_bindir}/{dump_nl80211,dump_rtnetlink,genlinfo} + %check %cabal_test @@ -196,6 +203,9 @@ install --mode=0755 -p examples/xmonadpropwrite %{buildroot}%{_bindir}/xmonadpro %changelog +* Wed Aug 19 2020 Jens Petersen - 0.35.1-16 +- switch from iwlib to netlink (#1860943) + * Sat Aug 01 2020 Fedora Release Engineering - 0.35.1-15 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From b7d22ed49a187ada3e9e6dee20c5396a4e01f242 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 31 Aug 2020 18:00:38 +0800 Subject: [PATCH 27/52] update to 0.36 --- .gitignore | 1 + sources | 2 +- xmobar.spec | 10 ++++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 504f70e..43f4b2e 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /xmobar-0.35.1.tar.gz /netlink-1.1.1.0.tar.gz /pretty-hex-1.1.tar.gz +/xmobar-0.36.tar.gz diff --git a/sources b/sources index 98ce82b..32a5f21 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.35.1.tar.gz) = fd7bb8710f3c877835aa0b20e0fca227f6f620c0be31acd46e6a464b4ba3f6c7da8df31cd3f345e606b03a54328dd9a298e46e8fc2935e74ebd8c5712cedbf76 +SHA512 (xmobar-0.36.tar.gz) = abb7f9cf367fa5c03f5928006fc5f7c38434743350d5f524307b99448cb30436fb44e0c856bd274032a6803f05b64e6d4ac553f51f4bd817efd2861408007c02 diff --git a/xmobar.spec b/xmobar.spec index 7de3423..59cd800 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -12,9 +12,9 @@ %bcond_with tests Name: %{pkg_name} -Version: 0.35.1 +Version: 0.36 # can only be reset when all subpkgs bumped -Release: 16%{?dist} +Release: 17%{?dist} Summary: A minimalistic text-based status bar License: BSD @@ -66,7 +66,6 @@ BuildRequires: ghc-temporary-devel %endif # for missing dep 'netlink': BuildRequires: ghc-monad-loops-prof -#BuildRequires: ghc-pretty-hex-prof # End cabal-rpm deps BuildRequires: desktop-file-utils BuildRequires: libXpm-devel @@ -157,7 +156,6 @@ cd - %ghc_libs_install %{subpkgs} %ghc_lib_install %ghc_fix_rpath %{pkgver} -chmod a-x changelog.md readme.md # End cabal-rpm install desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE10} @@ -203,6 +201,10 @@ rm %{buildroot}%{_bindir}/{dump_nl80211,dump_rtnetlink,genlinfo} %changelog +* Mon Aug 31 18:00:21 +08 2020 Jens Petersen - 0.36-17 +- update to 0.36 + https://hackage.haskell.org/package/xmobar-0.36/changelog + * Wed Aug 19 2020 Jens Petersen - 0.35.1-16 - switch from iwlib to netlink (#1860943) From bb03623f86c78485515ec482225be8c421dc3024 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:11:52 +0000 Subject: [PATCH 28/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_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 59cd800..fec462e 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -14,7 +14,7 @@ Name: %{pkg_name} Version: 0.36 # can only be reset when all subpkgs bumped -Release: 17%{?dist} +Release: 18%{?dist} Summary: A minimalistic text-based status bar License: BSD @@ -201,6 +201,9 @@ rm %{buildroot}%{_bindir}/{dump_nl80211,dump_rtnetlink,genlinfo} %changelog +* Thu Jan 28 2021 Fedora Release Engineering - 0.36-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Aug 31 18:00:21 +08 2020 Jens Petersen - 0.36-17 - update to 0.36 https://hackage.haskell.org/package/xmobar-0.36/changelog From 0e4640ea8510258a2d42af0fc4ed28c11958ba05 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:44:58 +0000 Subject: [PATCH 29/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_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 fec462e..96e6c67 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -14,7 +14,7 @@ Name: %{pkg_name} Version: 0.36 # can only be reset when all subpkgs bumped -Release: 18%{?dist} +Release: 19%{?dist} Summary: A minimalistic text-based status bar License: BSD @@ -201,6 +201,9 @@ rm %{buildroot}%{_bindir}/{dump_nl80211,dump_rtnetlink,genlinfo} %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 0.36-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jan 28 2021 Fedora Release Engineering - 0.36-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 9da4e467edf34b6ba0646c70722bca7044c2c25a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 5 Aug 2021 13:14:42 +0800 Subject: [PATCH 30/52] update to 0.37 --- .gitignore | 1 + sources | 2 +- xmobar.spec | 13 ++++++------- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 43f4b2e..f32df53 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /netlink-1.1.1.0.tar.gz /pretty-hex-1.1.tar.gz /xmobar-0.36.tar.gz +/xmobar-0.37.tar.gz diff --git a/sources b/sources index 32a5f21..04b46f3 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.36.tar.gz) = abb7f9cf367fa5c03f5928006fc5f7c38434743350d5f524307b99448cb30436fb44e0c856bd274032a6803f05b64e6d4ac553f51f4bd817efd2861408007c02 +SHA512 (xmobar-0.37.tar.gz) = a2904f3658ea32654ba343cd2c815928900e29e819dbc5ddff931601f42bae244365d2636ffce8b52c4dc57f88f3abebeffc62924fd3b39e197698d7b0da7d5d diff --git a/xmobar.spec b/xmobar.spec index 96e6c67..cd728db 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -12,9 +12,9 @@ %bcond_with tests Name: %{pkg_name} -Version: 0.36 +Version: 0.37 # can only be reset when all subpkgs bumped -Release: 19%{?dist} +Release: 20%{?dist} Summary: A minimalistic text-based status bar License: BSD @@ -32,22 +32,17 @@ Patch0: xmobar-flags.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros-extra BuildRequires: ghc-X11-prof -BuildRequires: ghc-X11-xft-prof BuildRequires: ghc-async-prof BuildRequires: ghc-base-prof BuildRequires: ghc-bytestring-prof -BuildRequires: ghc-cereal-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-parsec-prof BuildRequires: ghc-parsec-numbers-prof @@ -65,6 +60,7 @@ BuildRequires: ghc-hspec-devel BuildRequires: ghc-temporary-devel %endif # for missing dep 'netlink': +BuildRequires: ghc-cereal-prof BuildRequires: ghc-monad-loops-prof # End cabal-rpm deps BuildRequires: desktop-file-utils @@ -201,6 +197,9 @@ rm %{buildroot}%{_bindir}/{dump_nl80211,dump_rtnetlink,genlinfo} %changelog +* Thu Aug 5 2021 Jens Petersen - 0.37-20 +- update to 0.37 + * Fri Jul 23 2021 Fedora Release Engineering - 0.36-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 84ce518e62da61ae6f4083d575e1433db0ca6735 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 8 Jul 2021 00:30:14 +0800 Subject: [PATCH 31/52] refresh to cabal-rpm-2.0.9 --- xmobar.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xmobar.spec b/xmobar.spec index cd728db..c0b9947 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.0.6 --subpackage +# generated by cabal-rpm-2.0.9 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name xmobar @@ -101,6 +101,7 @@ This package provides the Haskell %{name} library development files. %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. @@ -131,7 +132,6 @@ This package provides the Haskell %{name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -a1 -a2 -chmod a-x changelog.md readme.md # End cabal-rpm setup %patch0 -p1 -b .orig @@ -161,7 +161,9 @@ rm %{buildroot}%{_bindir}/{dump_nl80211,dump_rtnetlink,genlinfo} %check +%if %{with tests} %cabal_test +%endif %files From 580e5a59856afd83d5f731c90e6c380905cfaef6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 5 Aug 2021 13:15:10 +0800 Subject: [PATCH 32/52] update to 0.38 --- .gitignore | 1 + sources | 2 +- xmobar.spec | 20 +++++++++++++------- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index f32df53..3b1023b 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /pretty-hex-1.1.tar.gz /xmobar-0.36.tar.gz /xmobar-0.37.tar.gz +/xmobar-0.38.tar.gz diff --git a/sources b/sources index 04b46f3..48bdce5 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.37.tar.gz) = a2904f3658ea32654ba343cd2c815928900e29e819dbc5ddff931601f42bae244365d2636ffce8b52c4dc57f88f3abebeffc62924fd3b39e197698d7b0da7d5d +SHA512 (xmobar-0.38.tar.gz) = 1dc644f3b876b5ba6295176f2662bb890f5f898c020a4b44118dff70c584344ca4c7bb3abd8f4f8da8bc7b4745cb370fa77f08d1b64b9e7f97f19c6c8ed4b478 diff --git a/xmobar.spec b/xmobar.spec index c0b9947..a13a7d7 100644 --- a/xmobar.spec +++ b/xmobar.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.0.9 --subpackage +# generated by cabal-rpm-2.0.10 --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.37 +Version: 0.38 # can only be reset when all subpkgs bumped -Release: 20%{?dist} +Release: 21%{?dist} Summary: A minimalistic text-based status bar License: BSD @@ -32,17 +32,22 @@ Patch0: xmobar-flags.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros-extra BuildRequires: ghc-X11-prof +BuildRequires: ghc-X11-xft-prof BuildRequires: ghc-async-prof BuildRequires: ghc-base-prof BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-cereal-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-parsec-prof BuildRequires: ghc-parsec-numbers-prof @@ -60,7 +65,6 @@ BuildRequires: ghc-hspec-devel BuildRequires: ghc-temporary-devel %endif # for missing dep 'netlink': -BuildRequires: ghc-cereal-prof BuildRequires: ghc-monad-loops-prof # End cabal-rpm deps BuildRequires: desktop-file-utils @@ -151,7 +155,6 @@ cd - # Begin cabal-rpm install %ghc_libs_install %{subpkgs} %ghc_lib_install -%ghc_fix_rpath %{pkgver} # End cabal-rpm install desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE10} @@ -169,7 +172,7 @@ rm %{buildroot}%{_bindir}/{dump_nl80211,dump_rtnetlink,genlinfo} %files # Begin cabal-rpm files: %license license -%doc changelog.md examples readme.md +%doc changelog.md examples readme.org %{_bindir}/%{name} # End cabal-rpm files %{_bindir}/xmonadpropwrite @@ -184,7 +187,7 @@ rm %{buildroot}%{_bindir}/{dump_nl80211,dump_rtnetlink,genlinfo} %files -n ghc-%{name}-devel -f ghc-%{name}-devel.files -%doc changelog.md examples readme.md +%doc changelog.md examples readme.org %if %{with haddock} @@ -199,6 +202,9 @@ rm %{buildroot}%{_bindir}/{dump_nl80211,dump_rtnetlink,genlinfo} %changelog +* Thu Aug 5 2021 Jens Petersen - 0.38-21 +- update to 0.38 + * Thu Aug 5 2021 Jens Petersen - 0.37-20 - update to 0.37 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 33/52] 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 34/52] - 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 35/52] 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 36/52] 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 37/52] 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 38/52] 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 39/52] 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 40/52] 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 41/52] 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 42/52] 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 43/52] 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 44/52] 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 45/52] 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 46/52] 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 47/52] 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 48/52] 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 49/52] 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 50/52] 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 51/52] 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 52/52] 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