packages: hscolour/hscolour.spec - %requires_eq dep on ghc, doc package, mo...

[glen]

Author: glen                         Date: Mon Feb 28 09:26:23 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- %requires_eq dep on ghc, doc package, more macros

---- Files affected:
packages/hscolour:
   hscolour.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/hscolour/hscolour.spec
diff -u packages/hscolour/hscolour.spec:1.3 packages/hscolour/hscolour.spec:1.4
--- packages/hscolour/hscolour.spec:1.3	Wed Dec 15 14:51:08 2010
+++ packages/hscolour/hscolour.spec	Mon Feb 28 10:26:18 2011
@@ -2,23 +2,36 @@
 Summary:	Colourise Haskell code
 Name:		hscolour
 Version:	1.17
-Release:	2
+Release:	3
 License:	GPL
 Group:		Development/Languages
-Source0:	http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
+Source0:	http://hackage.haskell.org/packages/archive/hscolour/%{version}/%{name}-%{version}.tar.gz
 # Source0-md5:	7f8f1673e3ba289d44474d444d75d7ff
 URL:		http://www.cs.york.ac.uk/fp/darcs/hscolour/
 BuildRequires:	ghc >= 6.12.3
-%requires_releq	ghc
+BuildRequires:	rpmbuild(macros) >= 1.608
+%requires_eq	ghc
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		ghcdir		ghc-%(/usr/bin/ghc --numeric-version)
+# debuginfo is not useful for ghc
+%define		_enable_debug_packages	0
 
 %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. 
+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
@@ -41,7 +54,7 @@
 
 # work around automatic haddock docs installation
 rm -rf %{name}-%{version}-doc
-cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} %{name}-%{version}-doc
+cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html %{name}-%{version}-doc
 
 runhaskell Setup.hs register \
 	--gen-pkg-config=$RPM_BUILD_ROOT/%{_libdir}/%{ghcdir}/package.conf.d/%{name}.conf
@@ -50,25 +63,31 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/usr/bin/ghc-pkg recache
+%ghc_pkg_recache
 
 %postun
-/usr/bin/ghc-pkg recache
+%ghc_pkg_recache
 
 %files
 %defattr(644,root,root,755)
-%doc %{name}-%{version}-doc/html
 %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 <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2011/02/28 09:26:18  glen
+- %requires_eq dep on ghc, doc package, more macros
+
 Revision 1.3  2010/12/15 13:51:08  baggins
 - rel 2
 - fixed attrs for executable
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hscolour/hscolour.spec?r1=1.3&r2=1.4&f=u