rpms
/
xmobar
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switch from iwlib to netlink (#1860943)

This commit is contained in:
Jens Petersen 2020-08-19 21:53:35 +08:00
parent 5c8621d69c
commit edcb22744e
4 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -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

3
sources
View File

@ -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

12
xmobar-0.33-flags.patch → xmobar-flags.patch
View File

@ -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.

30
xmobar.spec
View File

@ -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 <petersen@redhat.com> - 0.35.1-16
- switch from iwlib to netlink (#1860943)
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.35.1-15
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild