[packages/xmonad] up to 0.12
atler
atler at pld-linux.org
Tue Jan 26 00:08:22 CET 2016
commit 109d9bb2a61572cf59c4deb84a66c03f0b87158f
Author: Jan Palus <atler at pld-linux.org>
Date: Tue Jan 26 00:06:52 2016 +0100
up to 0.12
- border patch no longer needed
- new "doc" bcond disabled by default due to "internal error when
calculating transative package dependencies"
xmonad-border.patch | 13 -------------
xmonad.spec | 18 +++++++++++++-----
2 files changed, 13 insertions(+), 18 deletions(-)
---
diff --git a/xmonad.spec b/xmonad.spec
index d3bfe12..a86939b 100644
--- a/xmonad.spec
+++ b/xmonad.spec
@@ -1,19 +1,22 @@
+#
+# Conditional build:
+%bcond_with doc # build with docs (broken)
+#
Summary: Tiling window manager
Name: xmonad
-Version: 0.11.1
+Version: 0.12
Release: 1
License: BSD
Group: X11/Window Managers
Source0: http://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 20792f4e428db24e6c0dbecbd77f69e0
+# Source0-md5: 6fd5f268d38e940e090af0726795f513
Source1: %{name}.desktop
-Patch0: %{name}-border.patch
URL: http://www.xmonad.org
BuildRequires: ghc >= 6.12.3
BuildRequires: ghc-X11 >= 1.6
BuildRequires: ghc-extensible-exceptions
BuildRequires: ghc-mtl
-BuildRequires: ghc-utf8-string
+BuildRequires: ghc-utf8-string >= 0.3
BuildRequires: rpmbuild(macros) >= 1.608
%requires_eq ghc
%requires_releq ghc-extensible-exceptions
@@ -50,7 +53,6 @@ Dokumentacja w formacie HTML dla %{name}.
%prep
%setup -q
-%patch0 -p1
%build
runhaskell Setup.lhs configure -v2 \
@@ -60,7 +62,9 @@ runhaskell Setup.lhs configure -v2 \
--docdir=%{_docdir}/%{name}-%{version}
runhaskell Setup.lhs build
+%if %{with doc}
runhaskell Setup.lhs haddock --executables
+%endif
%install
rm -rf $RPM_BUILD_ROOT
@@ -73,7 +77,9 @@ cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_xdeskdir}/%{name}.desktop
# work around automatic haddock docs installation
rm -rf %{name}-%{version}-doc
+%if %{with doc}
cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html %{name}-%{version}-doc
+%endif
%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/man
@@ -102,6 +108,8 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/xmonad.1*
%{_xdeskdir}/%{name}.desktop
+%if %{with doc}
%files doc
%defattr(644,root,root,755)
%doc %{name}-%{version}-doc/*
+%endif
diff --git a/xmonad-border.patch b/xmonad-border.patch
deleted file mode 100644
index 0d672c8..0000000
--- a/xmonad-border.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/XMonad/Operations.hs b/XMonad/Operations.hs
-index 6bca311..bc69962 100644
---- a/XMonad/Operations.hs
-+++ b/XMonad/Operations.hs
-@@ -450,7 +450,7 @@ floatLocation :: Window -> X (ScreenId, W.RationalRect)
- floatLocation w = withDisplay $ \d -> do
- ws <- gets windowset
- wa <- io $ getWindowAttributes d w
-- bw <- fi <$> asks (borderWidth . config)
-+ let bw = (fromIntegral . wa_border_width) wa
- sc <- fromMaybe (W.current ws) <$> pointScreen (fi $ wa_x wa) (fi $ wa_y wa)
-
- let sr = screenRect . W.screenDetail $ sc
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xmonad.git/commitdiff/109d9bb2a61572cf59c4deb84a66c03f0b87158f
More information about the pld-cvs-commit
mailing list