From ceeee5b6e413274c116a980717a59e53d8068801 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 17 Feb 2019 22:48:08 +0800 Subject: [PATCH] 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