packages: ghc-random/ghc-random.spec - rel 5 - finally got docs straight, t...

[baggins]

Author: baggins                      Date: Sat Oct 22 09:43:20 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 5
- finally got docs straight, they must be in main package due to dir names

---- Files affected:
packages/ghc-random:
   ghc-random.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/ghc-random/ghc-random.spec
diff -u packages/ghc-random/ghc-random.spec:1.4 packages/ghc-random/ghc-random.spec:1.5
--- packages/ghc-random/ghc-random.spec:1.4	Sat Oct 22 11:35:48 2011
+++ packages/ghc-random/ghc-random.spec	Sat Oct 22 11:43:15 2011
@@ -3,7 +3,7 @@
 Summary:	This package provides a random number library
 Name:		ghc-%{pkgname}
 Version:	1.0.1.0
-Release:	4
+Release:	5
 License:	BSD
 Group:		Development/Languages
 Source0:	http://hackage.haskell.org/packages/archive/%{pkgname}/%{version}/%{pkgname}-%{version}.tar.gz
@@ -12,6 +12,7 @@
 BuildRequires:	ghc >= 6.12.3
 BuildRequires:	rpmbuild(macros) >= 1.608
 %requires_releq	ghc
+Obsoletes:	ghc-random-doc
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # debuginfo is not useful for ghc
@@ -70,7 +71,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/%{pkgname}.conf
@@ -86,6 +87,7 @@
 
 %files
 %defattr(644,root,root,755)
+%doc %{name}-%{version}-doc/*
 %{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf
 %dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}
 %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/*.o
@@ -99,16 +101,16 @@
 %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/*_p.a
 %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/System/*.p_hi
 
-%files doc
-%defattr(644,root,root,755)
-%doc %{name}-%{version}-doc/html
-
 %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.5  2011/10/22 09:43:15  baggins
+- rel 5
+- finally got docs straight, they must be in main package due to dir names
+
 Revision 1.4  2011/10/22 09:35:48  baggins
 - rel 4
 - revert doc package removal
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ghc-random/ghc-random.spec?r1=1.4&r2=1.5&f=u