Author: baggins                      Date: Sat Oct 22 09:35:53 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4
- revert doc package removal
- fix docs packaging

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

---- Diffs:

================================================================
Index: packages/ghc-random/ghc-random.spec
diff -u packages/ghc-random/ghc-random.spec:1.3 
packages/ghc-random/ghc-random.spec:1.4
--- packages/ghc-random/ghc-random.spec:1.3     Sat Oct 22 11:24:56 2011
+++ packages/ghc-random/ghc-random.spec Sat Oct 22 11:35:48 2011
@@ -3,7 +3,7 @@
 Summary:       This package provides a random number library
 Name:          ghc-%{pkgname}
 Version:       1.0.1.0
-Release:       3
+Release:       4
 License:       BSD
 Group:         Development/Languages
 Source0:       
http://hackage.haskell.org/packages/archive/%{pkgname}/%{version}/%{pkgname}-%{version}.tar.gz
@@ -12,14 +12,13 @@
 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
 %define                _enable_debug_packages  0
 
-# docs contai html files and haskell package definitions that should not be 
compressed
-%define                no_install_post_compress_docs   1
+# don't compress haddoc files
+%define                _noautocompressdoc      *.haddock
 
 %description
 This package provides a random number library.
@@ -38,6 +37,18 @@
 Biblioteka profilująca %{pkgname} dla GHC.  Powinna być zainstalowana
 kiedy potrzebujemy systemu profilującego z GHC.
 
+%package doc
+Summary:       HTML documentation for %{pkgname}
+Summary(pl.UTF-8):     Dokumentacja w formacie HTML dla %{pkgname}
+Group:         Documentation
+Requires:      %{name} = %{version}-%{release}
+
+%description doc
+HTML documentation for %{pkgname}.
+
+%description doc -l pl.UTF-8
+Dokumentacja w formacie HTML dla %{pkgname}.
+
 %prep
 %setup -q -n %{pkgname}-%{version}
 
@@ -75,7 +86,6 @@
 
 %files
 %defattr(644,root,root,755)
-%doc %{name}-%{version}-doc/html
 %{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf
 %dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}
 %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/*.o
@@ -89,12 +99,21 @@
 %{_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 <[email protected]>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2011/10/22 09:35:48  baggins
+- rel 4
+- revert doc package removal
+- fix docs packaging
+
 Revision 1.3  2011/10/22 09:24:56  baggins
 - rel 3
 - merge doc package into main
================================================================

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

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to