- update packaging, %requires_eq dep on ghc

Changed files:
    ghc-zlib.spec -> 1.8

diff --git a/ghc-zlib.spec b/ghc-zlib.spec
index 2f5a5f41c72d447df77da0756ccb3cca73578f1d..bbe6a686ec1334ede729294e1305728448ad1a8f 100644 (file)
--- a/ghc-zlib.spec
+++ b/ghc-zlib.spec
@@ -2,7 +2,7 @@
 Summary:       Compression and decompression in the gzip and zlib formats
 Name:          ghc-%{pkgname}
 Version:       0.5.2.0
-Release:       3
+Release:       4
 License:       BSD
 Group:         Development/Languages
 Source0:       http://hackage.haskell.org/packages/archive/%{pkgname}/%{version}/%{pkgname}-%{version}.tar.gz
@@ -10,9 +10,12 @@ Source0:     http://hackage.haskell.org/packages/archive/%{pkgname}/%{version}/%{pkg
 URL:           http://hackage.haskell.org/package/zlib/
 BuildRequires: ghc >= 6.12.3
 BuildRequires: rpmbuild(macros) >= 1.608
-%requires_releq        ghc
+%requires_eq   ghc
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# debuginfo is not useful for ghc
+%define                _enable_debug_packages  0
+
 %description
 This package provides a pure interface for compressing and
 decompressing streams of data represented as lazy
@@ -24,6 +27,17 @@ It provides a convenient high level API suitable for most
 tasks and for the few cases where more control is needed it
 provides access to the full zlib feature set.
 
+%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}
 
@@ -45,7 +59,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} %{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/%{pkgname}.conf
@@ -61,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc %{name}-%{version}-doc/html
 %{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf
 %{_libdir}/%{ghcdir}/%{pkgname}-%{version}
+
+%files doc
+%defattr(644,root,root,755)
+%doc %{name}-%{version}-doc/*