packages: hlint/hlint.spec - rel 2 - fix docs packaging

[baggins]

Author: baggins                      Date: Sat Oct 22 09:47:48 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2
- fix docs packaging

---- Files affected:
packages/hlint:
   hlint.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: packages/hlint/hlint.spec
diff -u packages/hlint/hlint.spec:1.6 packages/hlint/hlint.spec:1.7
--- packages/hlint/hlint.spec:1.6	Tue Sep 27 23:34:50 2011
+++ packages/hlint/hlint.spec	Sat Oct 22 11:47:43 2011
@@ -2,7 +2,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
@@ -17,25 +17,18 @@
 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
@@ -58,7 +51,7 @@
 
 # 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,21 +67,22 @@
 
 %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/*
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2011/10/22 09:47:43  baggins
+- rel 2
+- fix docs packaging
+
 Revision 1.6  2011/09/27 21:34:50  baggins
 - cpphs 1.13.1 is good too
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hlint/hlint.spec?r1=1.6&r2=1.7&f=u