- update packaging, %requires_eq dep on ghc

Changed files:
    cpphs.spec -> 1.4

diff --git a/cpphs.spec b/cpphs.spec
index b280e6216f7438bf736f660bfd810ceb4fc621ef..6372a77f59e9964b1c0cca83ee2c923dc1ea9b5d 100644 (file)
--- a/cpphs.spec
+++ b/cpphs.spec
@@ -1,28 +1,40 @@
 Summary:       A liberalised re-implementation of cpp, the C pre-processor
 Name:          cpphs
 Version:       1.11
-Release:       2
+Release:       3
 License:       LGPL
 Group:         Development/Languages
-Source0:       http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
+Source0:       http://hackage.haskell.org/packages/archive/cpphs/%{version}/%{name}-%{version}.tar.gz
 # Source0-md5: ece7f9a5335a8fd569f0b8c7153ecfaa
 URL:           http://haskell.org/cpphs/
 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
-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 be distributed with compilers.
+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
+be distributed with compilers.
 
-This version of the C pre-processor is pretty-much
-feature-complete 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.
+This version of the C pre-processor is pretty-much feature-complete
+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
@@ -45,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} %{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
@@ -54,15 +66,18 @@ runhaskell Setup.hs register \
 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 CHANGELOG README docs/design docs/index.html
-%doc %{name}-%{version}-doc/html
 %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/*