Commit 51d03069 authored by Tollef Fog Heen's avatar Tollef Fog Heen

Update for new world order wrt docs

git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@5444 d4fa192b-c00b-0410-8231-f00ffab90ce4
parent e9c343e7
...@@ -10,9 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ...@@ -10,9 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# The svn sources needs autoconf, automake and libtool to generate a suitable # The svn sources needs autoconf, automake and libtool to generate a suitable
# configure script. Release tarballs would not need this # configure script. Release tarballs would not need this
BuildRequires: automake autoconf libtool BuildRequires: automake autoconf libtool
BuildRequires: ncurses-devel libxslt groff pcre-devel pkgconfig tex(latex) BuildRequires: ncurses-devel libxslt groff pcre-devel pkgconfig
BuildRequires: python-docutils >= 0.6
BuildRequires: python-sphinx >= 0.6
Requires: varnish-libs = %{version}-%{release} Requires: varnish-libs = %{version}-%{release}
Requires: logrotate Requires: logrotate
Requires: ncurses Requires: ncurses
...@@ -138,18 +136,7 @@ tail -n +11 etc/default.vcl >> redhat/default.vcl ...@@ -138,18 +136,7 @@ tail -n +11 etc/default.vcl >> redhat/default.vcl
redhat/varnish.initrc redhat/varnishlog.initrc redhat/varnishncsa.initrc redhat/varnish.initrc redhat/varnishlog.initrc redhat/varnishncsa.initrc
%endif %endif
# Build html and latex/pdf docs cp -r doc/sphinx/\=build/html doc
# 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 %check
# rhel5 on ppc64 is just too strange # rhel5 on ppc64 is just too strange
...@@ -202,7 +189,7 @@ rm -rf %{buildroot} ...@@ -202,7 +189,7 @@ rm -rf %{buildroot}
%{_var}/log/varnish %{_var}/log/varnish
%{_mandir}/man1/*.1* %{_mandir}/man1/*.1*
%{_mandir}/man7/*.7* %{_mandir}/man7/*.7*
%doc INSTALL LICENSE README redhat/README.redhat ChangeLog doc/getting-started.html %doc INSTALL LICENSE README redhat/README.redhat ChangeLog
%doc examples %doc examples
%dir %{_sysconfdir}/varnish/ %dir %{_sysconfdir}/varnish/
%config(noreplace) %{_sysconfdir}/varnish/default.vcl %config(noreplace) %{_sysconfdir}/varnish/default.vcl
...@@ -230,7 +217,6 @@ rm -rf %{buildroot} ...@@ -230,7 +217,6 @@ rm -rf %{buildroot}
%files docs %files docs
%doc LICENSE %doc LICENSE
%doc doc/Varnish.pdf
%doc doc/sphinx %doc doc/sphinx
%doc doc/html %doc doc/html
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment