Author: baggins Date: Thu Apr 8 21:53:20 2010 GMT Module: template-specs Tag: HEAD ---- Log message: - require ghc with haddock - work around automatic docs installation to docdir
---- Files affected: template-specs: ghc-package.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: template-specs/ghc-package.spec diff -u template-specs/ghc-package.spec:1.7 template-specs/ghc-package.spec:1.8 --- template-specs/ghc-package.spec:1.7 Thu Apr 8 23:37:19 2010 +++ template-specs/ghc-package.spec Thu Apr 8 23:53:15 2010 @@ -9,7 +9,7 @@ Source0: http://hackage.haskell.org/packages/archive/%{pkgname}/%{version}/%{pkgname}-%{version}.tar.gz # Source0-md5: - URL: http://hackage.haskell.org/package/%{pkgname}/ -BuildRequires: ghc +BuildRequires: ghc >= 6.10 #BuildRequires: ghc-OTHERMODULE %requires_eq ghc BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -36,6 +36,11 @@ rm -rf $RPM_BUILD_ROOT runhaskell Setup.hs copy --destdir=$RPM_BUILD_ROOT +# work around automatic haddock docs installation +rm -rf %{name}-%{version}/html +mkdir %{name}-%{version} +cp -a $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}/html %{name}-%{version}/ + runhaskell Setup.hs register \ --gen-pkg-config=$RPM_BUILD_ROOT/%{_libdir}/%{libsubdir}/%{pkgname}.conf @@ -53,7 +58,7 @@ %files %defattr(644,root,root,755) %doc NEWS -%doc %{_defaultdocdir}/%{name}-%{version}/html +%doc %{name}-%{version}/html %{_libdir}/%{libsubdir} %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -62,6 +67,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.8 2010/04/08 21:53:15 baggins +- require ghc with haddock +- work around automatic docs installation to docdir + Revision 1.7 2010/04/08 21:37:19 baggins - exclusivearch is not needed, ghc has this dependency ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/template-specs/ghc-package.spec?r1=1.7&r2=1.8&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
