[darcs] build html manual; bump deps for ghc-7.8
Jens Petersen
petersen at fedoraproject.org
Sat May 31 12:24:45 UTC 2014
commit 9b359418ef122ea442c1c0570c278098c41917df
Author: Jens Petersen <petersen at redhat.com>
Date: Sat May 31 21:24:43 2014 +0900
build html manual; bump deps for ghc-7.8
darcs.spec | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 deletions(-)
---
diff --git a/darcs.spec b/darcs.spec
index db2d11b..5a2159e 100644
--- a/darcs.spec
+++ b/darcs.spec
@@ -1,5 +1,7 @@
# https://fedoraproject.org/wiki/Packaging:Haskell
+%bcond_without html
+
# for a darcs-beta test release
#%%define beta 1
@@ -8,7 +10,7 @@
# override pkg_name to allow for darcs-beta
Name: darcs
Version: 2.8.4
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Distributed Advanced Revision Control System
License: GPLv2+
@@ -46,6 +48,9 @@ BuildRequires: ghc-vector-devel
BuildRequires: ghc-zlib-devel
BuildRequires: libcurl-devel%{?_isa}
# End cabal-rpm deps
+%if %{with html}
+BuildRequires: latex2html
+%endif
Obsoletes: darcs-server < 2.2.1-6
%description
@@ -68,10 +73,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}
# Begin cabal-rpm deps:
Requires: libcurl-devel%{?_isa}
# End cabal-rpm deps
@@ -88,11 +94,19 @@ This package provides the Haskell %{name} library development files.
%ifnarch %{ix86} x86_64 ppc
%patch2 -p1 -b .threaded
%endif
+cabal-tweak-dep-ver array '< 0.5' '< 0.6'
+cabal-tweak-dep-ver base '< 4.7' '< 4.8'
+cabal-tweak-dep-ver process '< 1.2.0.0' '< 1.3.0.0'
+cabal-tweak-dep-ver unix '< 2.7' '< 2.8'
%build
%ghc_lib_build
+%if %{with html}
+make html
+%endif
+
%install
%ghc_lib_install
@@ -110,11 +124,16 @@ cp -p contrib/darcs_completion %{buildroot}%{_sysconfdir}/bash_completion.d/darc
%files
-%doc COPYING NEWS contrib/_darcs.zsh
+%doc COPYING
+%doc NEWS
+%doc contrib/_darcs.zsh
%dir %{_sysconfdir}/bash_completion.d
%config(noreplace) %{_sysconfdir}/bash_completion.d/darcs
%{_bindir}/darcs
%attr(0644,-,-) %{_mandir}/man1/darcs.1*
+%if %{with html}
+%doc doc/manual
+%endif
%files -n ghc-%{name} -f ghc-%{name}.files
@@ -122,9 +141,13 @@ cp -p contrib/darcs_completion %{buildroot}%{_sysconfdir}/bash_completion.d/darc
%files -n ghc-%{name}-devel -f ghc-%{name}-devel.files
-
+%doc README
%changelog
+* Sat May 31 2014 Jens Petersen <petersen at redhat.com> - 2.8.4-4
+- bump some upper bounds for ghc-7.8
+- build html manual
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list