From 81efd110f06186badcd72c01d3332dbead85a3f4 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sat, 23 Apr 2016 12:54:58 -0400 Subject: [PATCH] update to 0.12 - sync with cabal-rpm-0.9.10 --- .gitignore | 1 + sources | 2 +- xmonad.spec | 48 ++++++++++++++++++++++++++++++++++-------------- 3 files changed, 36 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index c8f1b9f..829efff 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ xmonad-0.9.1.tar.gz /xmonad-0.10.tar.gz /xmonad-0.11.tar.gz /xmonad-0.11.1.tar.gz +/xmonad-0.12.tar.gz diff --git a/sources b/sources index 22b19ba..681d2d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -20792f4e428db24e6c0dbecbd77f69e0 xmonad-0.11.1.tar.gz +6fd5f268d38e940e090af0726795f513 xmonad-0.12.tar.gz diff --git a/xmonad.spec b/xmonad.spec index 6db8e81..34bfedd 100644 --- a/xmonad.spec +++ b/xmonad.spec @@ -2,9 +2,11 @@ %global pkg_name xmonad +%bcond_with tests + Name: %{pkg_name} -Version: 0.11.1 -Release: 4%{?dist} +Version: 0.12 +Release: 1%{?dist} Summary: A tiling window manager License: BSD @@ -20,30 +22,35 @@ Source7: xmonad.hs BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: +BuildRequires: chrpath BuildRequires: ghc-X11-devel BuildRequires: ghc-containers-devel +BuildRequires: ghc-data-default-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-extensible-exceptions-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-mtl-devel BuildRequires: ghc-process-devel +BuildRequires: ghc-setlocale-devel BuildRequires: ghc-unix-devel BuildRequires: ghc-utf8-string-devel +%if %{with tests} +BuildRequires: ghc-QuickCheck-devel +%endif # End cabal-rpm deps BuildRequires: desktop-file-utils Requires: xmonad-basic = %{version}-%{release} Requires: xmonad-config = %{version}-%{release} %description -xmonad is a tiling window manager for X. Windows are arranged -automatically to tile the screen without gaps or overlap, maximising -screen use. All features of the window manager are accessible from -the keyboard: a mouse is strictly optional. xmonad is written and -extensible in Haskell. Custom layout algorithms, and other -extensions, may be written by the user in config files. Layouts are -applied dynamically, and different layouts may be used on each -workspace. Xinerama is fully supported, allowing windows to be tiled -on several screens. +Xmonad is a tiling window manager for X. Windows are arranged automatically to +tile the screen without gaps or overlap, maximising screen use. All features of +the window manager are accessible from the keyboard: a mouse is strictly +optional. xmonad is written and extensible in Haskell. Custom layout +algorithms, and other extensions, may be written by the user in config files. +Layouts are applied dynamically, and different layouts may be used on each +workspace. Xinerama is fully supported, allowing windows to be tiled on several +screens. This is a meta-package that installs xmonad-basic and ghc-xmonad-contrib-devel, allowing xmonad to be customized with "~/.xmonad/xmonad.hs". @@ -60,10 +67,11 @@ 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} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} Requires(postun): ghc-compiler = %{ghc_version} -Requires: ghc-%{name} = %{version}-%{release} +Requires: ghc-%{name}%{?_isa} = %{version}-%{release} %description -n ghc-%{name}-devel This package provides the Haskell %{name} library development files. @@ -153,6 +161,8 @@ cabal-tweak-dep-ver utf8-string '< 0.4' '< 1.1' %install %ghc_lib_install +%ghc_fix_dynamic_rpath %{pkg_name} + install -p -m 0644 -D man/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 install -p -m 0644 -D %SOURCE1 %{buildroot}%{_datadir}/xsessions/%{name}.desktop install -p -m 0755 -D %SOURCE2 %{buildroot}%{_bindir}/%{name}-start @@ -162,7 +172,13 @@ install -p -m 0644 -D %SOURCE7 %{buildroot}%{_datadir}/xmonad/xmonad.hs rm %{buildroot}%{_datadir}/%{name}-%{version}/man/xmonad.{hs,1,1.html} # ship LICENSE in xmonad-core -rm %{buildroot}%{_docdir}/%{name}*/LICENSE +rm %{buildroot}%{ghc_pkgdocdir}/LICENSE + + +%check +%if %{with tests} +%cabal test +%endif %post -n ghc-%{name}-devel @@ -186,7 +202,7 @@ rm %{buildroot}%{_docdir}/%{name}*/LICENSE %files core %license LICENSE -%doc CONFIG README README.fedora +%doc README.fedora README.md TODO %doc man/xmonad.{hs,1{.html,.markdown}} %attr(755,root,root) %{_bindir}/%{name} %attr(755,root,root) %{_bindir}/%{name}-start @@ -207,6 +223,10 @@ rm %{buildroot}%{_docdir}/%{name}*/LICENSE %changelog +* Sat Apr 23 2016 Ben Boeckel - 0.12-1 +- update to 0.12 +- sync with cabal-rpm-0.9.10 + * Fri Feb 05 2016 Fedora Release Engineering - 0.11.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild