Author: baggins Date: Sat Oct 22 09:46:46 2011 GMT Module: packages Tag: HEAD ---- Log message: - rel 3 - fix docs packaging
---- Files affected: packages/hscolour: hscolour.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: packages/hscolour/hscolour.spec diff -u packages/hscolour/hscolour.spec:1.8 packages/hscolour/hscolour.spec:1.9 --- packages/hscolour/hscolour.spec:1.8 Sun Oct 2 12:56:53 2011 +++ packages/hscolour/hscolour.spec Sat Oct 22 11:46:41 2011 @@ -3,7 +3,7 @@ Summary: Colourise Haskell code Name: hscolour Version: 1.19 -Release: 2 +Release: 3 License: GPL Group: Development/Languages Source0: http://hackage.haskell.org/packages/archive/hscolour/%{version}/%{name}-%{version}.tar.gz @@ -12,28 +12,21 @@ BuildRequires: ghc >= 6.12.3 BuildRequires: rpmbuild(macros) >= 1.608 %requires_eq ghc +Obsoletes: hscolour-doc BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # debuginfo is not useful for ghc %define _enable_debug_packages 0 +# don't compress haddoc files +%define _noautocompressdoc *.haddock + %description hscolour is a small Haskell script to colourise Haskell code. It currently has six output formats: ANSI terminal codes, HTML 3.2 with font tags, HTML 4.01 with CSS, XHTML 1.0 with inline CSS styling, LaTeX, and mIRC chat codes. -%package doc -Summary: HTML documentation for %{pkgname} -Summary(pl.UTF-8): Dokumentacja w formacie HTML dla %{pkgname} -Group: Documentation - -%description doc -HTML documentation for %{pkgname}. - -%description doc -l pl.UTF-8 -Dokumentacja w formacie HTML dla %{pkgname}. - %prep %setup -q @@ -55,7 +48,7 @@ # work around automatic haddock docs installation rm -rf %{name}-%{version}-doc -cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html %{name}-%{version}-doc +cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} %{name}-%{version}-doc runhaskell Setup.hs register \ --gen-pkg-config=$RPM_BUILD_ROOT/%{_libdir}/%{ghcdir}/package.conf.d/%{name}.conf @@ -71,21 +64,22 @@ %files %defattr(644,root,root,755) +%doc %{name}-%{version}-doc/* %attr(755,root,root) %{_bindir}/HsColour %{_libdir}/%{ghcdir}/package.conf.d/%{name}.conf %{_libdir}/%{ghcdir}/%{name}-%{version} %{_datadir}/%{name}-%{version} -%files doc -%defattr(644,root,root,755) -%doc %{name}-%{version}-doc/* - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team <[email protected]> All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.9 2011/10/22 09:46:41 baggins +- rel 3 +- fix docs packaging + Revision 1.8 2011/10/02 10:56:53 arekm - release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hscolour/hscolour.spec?r1=1.8&r2=1.9&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
