- rel 2

- fix docs packaging

Changed files:
    cpphs.spec -> 1.8

diff --git a/cpphs.spec b/cpphs.spec
index cb27f45a4b360d01d75b6936cb41b3eec8b05754..1d8d1804cfc3498dd3bad907506b6486166ac71b 100644 (file)
--- a/cpphs.spec
+++ b/cpphs.spec
@@ -2,7 +2,7 @@
 Summary:       A liberalised re-implementation of cpp, the C pre-processor
 Name:          cpphs
 Version:       1.13.1
-Release:       1
+Release:       2
 License:       LGPL
 Group:         Development/Languages
 Source0:       http://hackage.haskell.org/packages/archive/cpphs/%{version}/%{name}-%{version}.tar.gz
@@ -11,11 +11,15 @@ URL:                http://haskell.org/cpphs/
 BuildRequires: ghc >= 6.12.3
 BuildRequires: rpmbuild(macros) >= 1.608
 %requires_eq   ghc
+Obsoletes:     cpphs-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
 Cpphs is a re-implementation of the C pre-processor that is both more
 compatible with Haskell, and itself written in Haskell so that it can
@@ -26,17 +30,6 @@ and compatible with traditional (K&R) pre-processors. Additional
 features include: a plain-text mode; an option to unlit literate code
 files; and an option to turn off macro-expansion.
 
-%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
 
@@ -58,7 +51,7 @@ runhaskell Setup.hs copy --destdir=$RPM_BUILD_ROOT
 
 # 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
@@ -74,10 +67,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc %{name}-%{version}-doc/*
 %attr(755,root,root) %{_bindir}/cpphs
 %{_libdir}/%{ghcdir}/package.conf.d/%{name}.conf
 %{_libdir}/%{ghcdir}/%{name}-%{version}
-
-%files doc
-%defattr(644,root,root,755)
-%doc %{name}-%{version}-doc/*