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

update to 0.29.4 

- now binlib
- samples renamed to examples
- drop xft font patch
This commit is contained in:
Jens Petersen 2019-02-21 15:14:17 +08:00
parent ceeee5b6e4
commit ec8d14aa5c
4 changed files with 68 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

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

2
sources
View File

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

32
xmobar-xft-fonts.patch
View File

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

78
xmobar.spec
View File

@ -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 <petersen@redhat.com> - 0.29.4-4
- update to 0.29.4
- now binlib
- drop xft font patch for now
* Sun Feb 17 2019 Jens Petersen <petersen@redhat.com> - 0.27-3
- refresh to cabal-rpm-0.13