packages: ghc-haskell-src-exts/ghc-haskell-src-exts.spec - rel 3 - finally ...

[baggins]

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

---- Files affected:
packages/ghc-haskell-src-exts:
   ghc-haskell-src-exts.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: packages/ghc-haskell-src-exts/ghc-haskell-src-exts.spec
diff -u packages/ghc-haskell-src-exts/ghc-haskell-src-exts.spec:1.7 packages/ghc-haskell-src-exts/ghc-haskell-src-exts.spec:1.8
--- packages/ghc-haskell-src-exts/ghc-haskell-src-exts.spec:1.7	Sat Oct 22 11:33:15 2011
+++ packages/ghc-haskell-src-exts/ghc-haskell-src-exts.spec	Sat Oct 22 11:44:27 2011
@@ -3,7 +3,7 @@
 Summary:	Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer
 Name:		ghc-%{pkgname}
 Version:	1.11.1
-Release:	2
+Release:	3
 License:	BSD
 Group:		Development/Languages
 Source0:	http://hackage.haskell.org/packages/archive/%{pkgname}/%{version}/%{pkgname}-%{version}.tar.gz
@@ -14,6 +14,7 @@
 BuildRequires:	rpmbuild(macros) >= 1.608
 Requires:	cpphs
 %requires_eq	ghc
+Obsoletes:	ghc-haskell-src-exts-doc
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # debuginfo is not useful for ghc
@@ -36,17 +37,6 @@
 Apart from these standard extensions, it also handles regular patterns
 as per the HaRP extension as well as HSX-style embedded XML syntax.
 
-%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}
 
@@ -68,7 +58,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
@@ -85,19 +75,20 @@
 %files
 %defattr(644,root,root,755)
 %doc CHANGELOG
+%doc %{name}-%{version}-doc/*
 %{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf
 %{_libdir}/%{ghcdir}/%{pkgname}-%{version}
 
-%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.8  2011/10/22 09:44:27  baggins
+- rel 3
+- finally got docs straight, they must be in main package due to dir names
+
 Revision 1.7  2011/10/22 09:33:15  baggins
 - rel 2
 - fix docs packaging
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ghc-haskell-src-exts/ghc-haskell-src-exts.spec?r1=1.7&r2=1.8&f=u