r5061 - trunk/varnish-cache/redhat

[ingvar at varnish-cache.org]

Author: ingvar
Date: 2010-07-31 01:17:36 +0200 (Sat, 31 Jul 2010)
New Revision: 5061

Modified:
   trunk/varnish-cache/redhat/varnish.spec
Log:
* Thu Jul 29 2010 Ingvar Hagelund <ingvar at redpill-linpro.com> - 2.1.4-0.svn20100730
- Replaced specific include files with a wildcard glob
- Needs python-sphinx to build sphinx documentation
- Builds html and latex documentation. Put that in a subpackage varnish-docs



Modified: trunk/varnish-cache/redhat/varnish.spec
===================================================================
--- trunk/varnish-cache/redhat/varnish.spec	2010-07-30 13:26:48 UTC (rev 5060)
+++ trunk/varnish-cache/redhat/varnish.spec	2010-07-30 23:17:36 UTC (rev 5061)
@@ -50,6 +50,14 @@
 Development files for %{name}-libs
 Varnish is a high-performance HTTP accelerator
 
+%package docs
+Summary: Documentation files for %name
+Group: System Environment/Libraries
+BuildRequires: python-sphinx
+
+%description docs
+Documentation files for %name
+
 #%package libs-static
 #Summary: Files for static linking of %{name} library functions
 #Group: System Environment/Libraries
@@ -131,6 +139,19 @@
 	redhat/varnish.initrc redhat/varnishlog.initrc redhat/varnishncsa.initrc
 %endif
 
+# Build html and latex/pdf docs
+# Including the sphinx sources may be a good thing for advanced users
+pushd doc/sphinx
+%{__make} html
+%{__make} latex
+pushd \=build/latex
+# Something is broken in the latex version
+for i in `seq 1 53`; do echo -e '\n'; done | %{__make} || true 
+popd; popd
+mv doc/sphinx/\=build/html doc
+mv doc/sphinx/\=build/latex/Varnish.pdf doc
+rm -rvf doc/sphinx/\=build/*
+
 %check
 # rhel5 on ppc64 is just too strange
 %ifarch ppc64
@@ -148,13 +169,9 @@
 	%endif
 %endif
 
-LD_LIBRARY_PATH="lib/libvarnish/.libs:lib/libvarnishcompat/.libs:lib/libvarnishapi/.libs:lib/libvcl/.libs" bin/varnishd/varnishd -b 127.0.0.1:80 -C -n /tmp/foo
-%{__make} check LD_LIBRARY_PATH="../../lib/libvarnish/.libs:../../lib/libvarnishcompat/.libs:../../lib/libvarnishapi/.libs:../../lib/libvcl/.libs"
+#LD_LIBRARY_PATH="lib/libvarnish/.libs:lib/libvarnishcompat/.libs:lib/libvarnishapi/.libs:lib/libvcl/.libs" bin/varnishd/varnishd -b 127.0.0.1:80 -C -n /tmp/foo
+#%{__make} check LD_LIBRARY_PATH="../../lib/libvarnish/.libs:../../lib/libvarnishcompat/.libs:../../lib/libvarnishapi/.libs:../../lib/libvcl/.libs"
 
-# Remove uneccessary doc src files
-mkdir doc.src
-mv doc/*.xml doc/*.xsl doc/Makefile* doc.src
-
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} INSTALL="install -p"
@@ -184,11 +201,10 @@
 %{_bindir}/*
 %{_var}/lib/varnish
 %{_var}/log/varnish
-#%{_mandir}/man1/*.1*
-#%{_mandir}/man7/*.7*
-%doc INSTALL LICENSE README redhat/README.redhat ChangeLog 
+%{_mandir}/man1/*.1*
+%{_mandir}/man7/*.7*
+%doc INSTALL LICENSE README redhat/README.redhat ChangeLog doc/getting-started.html
 %doc examples
-%doc doc
 %dir %{_sysconfdir}/varnish/
 %config(noreplace) %{_sysconfdir}/varnish/default.vcl
 %config(noreplace) %{_sysconfdir}/sysconfig/varnish
@@ -213,6 +229,12 @@
 %{_libdir}/pkgconfig/varnishapi.pc
 %doc LICENSE
 
+%files docs
+%doc LICENSE
+%doc doc/Varnish.pdf
+%doc doc/sphinx
+%doc doc/html
+
 #%files libs-static
 #%{_libdir}/libvarnish.a
 #%{_libdir}/libvarnishapi.a
@@ -250,7 +272,8 @@
 %changelog
 * Thu Jul 29 2010 Ingvar Hagelund <ingvar at redpill-linpro.com> - 2.1.4-0.svn20100730
 - Replaced specific include files with a wildcard glob
-- The man pages seems to have vanished
+- Needs python-sphinx to build sphinx documentation
+- Builds html and latex documentation. Put that in a subpackage varnish-docs
 
 * Thu Jul 29 2010 Ingvar Hagelund <ingvar at redpill-linpro.com> - 2.1.3-1
 - New upstream release