From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sat, 22 Oct 2011 09:47:43 +0000 (+0000)
Subject: - rel 2
X-Git-Tag: auto/th/hlint-1_8_15-2
X-Git-Url: https://git.pld-linux.org/?p=packages%2Fhlint.git;a=commitdiff_plain;h=f81814334e78fc9ca60c5811e5df8bd20bb5c7d6

- rel 2
- fix docs packaging

Changed files:
    hlint.spec -> 1.7
---

diff --git a/hlint.spec b/hlint.spec
index 525a0c7..a14a59c 100644
--- a/hlint.spec
+++ b/hlint.spec
@@ -1,7 +1,7 @@
 Summary:	Haskell Source code suggestions
 Name:		hlint
 Version:	1.8.15
-Release:	1
+Release:	2
 License:	GPL
 Group:		Development/Languages
 Source0:	http://hackage.haskell.org/packages/archive/hlint/%{version}/%{name}-%{version}.tar.gz
@@ -16,25 +16,18 @@ BuildRequires:	ghc-uniplate
 BuildRequires:	hscolour
 BuildRequires:	rpmbuild(macros) >= 1.608
 %requires_eq	ghc
+Obsoletes:	hlint-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
 HLint gives suggestions on how to improve your source code.
 
-%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
 %patch0 -p1
@@ -57,7 +50,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
@@ -73,11 +66,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc %{name}-%{version}-doc/*
 %attr(755,root,root) %{_bindir}/hlint
 %{_libdir}/%{ghcdir}/package.conf.d/%{name}.conf
 %{_libdir}/%{ghcdir}/%{name}-%{version}
 %{_datadir}/%{name}-%{version}
-
-%files doc
-%defattr(644,root,root,755)
-%doc %{name}-%{version}-doc/*