template-specs: ghc-package.spec - fix doc packaging

[baggins]

Author: baggins                      Date: Sat Oct 22 09:44:58 2011 GMT
Module: template-specs                Tag: HEAD
---- Log message:
- fix doc packaging

---- Files affected:
template-specs:
   ghc-package.spec (1.19 -> 1.20) 

---- Diffs:

================================================================
Index: template-specs/ghc-package.spec
diff -u template-specs/ghc-package.spec:1.19 template-specs/ghc-package.spec:1.20
--- template-specs/ghc-package.spec:1.19	Tue Sep 27 21:08:41 2011
+++ template-specs/ghc-package.spec	Sat Oct 22 11:44:53 2011
@@ -19,6 +19,9 @@
 # debuginfo is not useful for ghc
 %define		_enable_debug_packages	0
 
+# don't compress haddoc files
+%define		_noautocompressdoc	*.haddock
+
 %description
 
 %package prof
@@ -35,18 +38,6 @@
 Biblioteka profilująca %{pkgname} dla GHC. Powinna być zainstalowana
 kiedy potrzebujemy systemu profilującego z GHC.
 
-%package doc
-Summary:	HTML documentation for %{pkgname}
-Summary(pl.UTF-8):	Dokumentacja w formacie HTML dla %{pkgname}
-Group:		Documentation
-Requires:	%{name} = %{version}-%{release}
-
-%description doc
-HTML documentation for %{pkgname}.
-
-%description doc -l pl.UTF-8
-Dokumentacja w formacie HTML dla %{pkgname}.
-
 %prep
 %setup -q -n %{pkgname}-%{version}
 
@@ -68,7 +59,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/%{pkgname}.conf
@@ -85,6 +76,7 @@
 %files
 %defattr(644,root,root,755)
 %doc NEWS
+%doc %{name}-%{version}-doc/*
 %{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf
 %dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}
 %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/*.o
@@ -99,16 +91,15 @@
 %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/*_p.a
 %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/PACKAGE/*.p_hi
 
-%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.20  2011/10/22 09:44:53  baggins
+- fix doc packaging
+
 Revision 1.19  2011/09/27 19:08:41  baggins
 - added prof subpackage
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/template-specs/ghc-package.spec?r1=1.19&r2=1.20&f=u