Author: baggins Date: Sat Oct 22 09:48:42 2011 GMT Module: packages Tag: HEAD ---- Log message: - rel 2 - fix docs packaging
---- Files affected: packages/cpphs: cpphs.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: packages/cpphs/cpphs.spec diff -u packages/cpphs/cpphs.spec:1.7 packages/cpphs/cpphs.spec:1.8 --- packages/cpphs/cpphs.spec:1.7 Tue Sep 27 23:20:31 2011 +++ packages/cpphs/cpphs.spec Sat Oct 22 11:48:37 2011 @@ -3,7 +3,7 @@ Summary: A liberalised re-implementation of cpp, the C pre-processor Name: cpphs Version: 1.13.1 -Release: 1 +Release: 2 License: LGPL Group: Development/Languages Source0: http://hackage.haskell.org/packages/archive/cpphs/%{version}/%{name}-%{version}.tar.gz @@ -12,11 +12,15 @@ BuildRequires: ghc >= 6.12.3 BuildRequires: rpmbuild(macros) >= 1.608 %requires_eq ghc +Obsoletes: cpphs-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 Cpphs is a re-implementation of the C pre-processor that is both more compatible with Haskell, and itself written in Haskell so that it can @@ -27,17 +31,6 @@ features include: a plain-text mode; an option to unlit literate code files; and an option to turn off macro-expansion. -%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 @@ -59,7 +52,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 @@ -75,20 +68,21 @@ %files %defattr(644,root,root,755) +%doc %{name}-%{version}-doc/* %attr(755,root,root) %{_bindir}/cpphs %{_libdir}/%{ghcdir}/package.conf.d/%{name}.conf %{_libdir}/%{ghcdir}/%{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 <[email protected]> All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.8 2011/10/22 09:48:37 baggins +- rel 2 +- fix docs packaging + Revision 1.7 2011/09/27 21:20:31 baggins - 1.13.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cpphs/cpphs.spec?r1=1.7&r2=1.8&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
