- rel 3

- finally got docs straight, they must be in main package due to dir names

Changed files:
    ghc-haskell-src-exts.spec -> 1.8

diff --git a/ghc-haskell-src-exts.spec b/ghc-haskell-src-exts.spec
index b3a12aa2b81b36e68e1c169b303a8ab8d7a9e165..0320b75ed3b16834b52e2563783c51832e6459eb 100644 (file)
--- a/ghc-haskell-src-exts.spec
+++ b/ghc-haskell-src-exts.spec
@@ -2,7 +2,7 @@
 Summary:       Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer
 Name:          ghc-%{pkgname}
 Version:       1.11.1
-Release:       2
+Release:       3
 License:       BSD
 Group:         Development/Languages
 Source0:       http://hackage.haskell.org/packages/archive/%{pkgname}/%{version}/%{pkgname}-%{version}.tar.gz
@@ -13,6 +13,7 @@ BuildRequires:        ghc >= 6.12.3
 BuildRequires: rpmbuild(macros) >= 1.608
 Requires:      cpphs
 %requires_eq   ghc
+Obsoletes:     ghc-haskell-src-exts-doc
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # debuginfo is not useful for ghc
@@ -35,17 +36,6 @@ and a few more. All extensions implemented in GHC are supported.
 Apart from these standard extensions, it also handles regular patterns
 as per the HaRP extension as well as HSX-style embedded XML syntax.
 
-%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 -n %{pkgname}-%{version}
 
@@ -67,7 +57,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/%{pkgname}.conf
@@ -84,9 +74,6 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc CHANGELOG
+%doc %{name}-%{version}-doc/*
 %{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf
 %{_libdir}/%{ghcdir}/%{pkgname}-%{version}
-
-%files doc
-%defattr(644,root,root,755)
-%doc %{name}-%{version}-doc/html