[master] 713b44f Adjust spec file for tarball building

Tollef Fog Heen tfheen at varnish-cache.org
Thu Jan 27 10:36:25 CET 2011


commit 713b44ff73b88ac0e4ab3ffcafe0329a26587f40
Author: Tollef Fog Heen <tfheen at varnish-software.com>
Date:   Thu Jan 27 10:34:34 2011 +0100

    Adjust spec file for tarball building
    
    We support building RPMs from a tarball, not directly from git (RPM
    needs a tarball anyway, so requiring people to run make dist doesn't
    seem onerous).
    
    Remove autogen.sh invocation and remove explicit building of
    documentation.  Both of these are done as part of make dist

diff --git a/redhat/varnish.spec b/redhat/varnish.spec
index 031f0a9..cc4296a 100644
--- a/redhat/varnish.spec
+++ b/redhat/varnish.spec
@@ -75,7 +75,7 @@ Documentation files for %name
 
 # The svn sources needs to generate a suitable configure script
 # Release tarballs would not need this
-./autogen.sh
+#./autogen.sh
 
 # Hack to get 32- and 64-bits tests run concurrently on the same build machine
 case `uname -m` in
@@ -141,12 +141,7 @@ tail -n +11 etc/default.vcl >> redhat/default.vcl
 	redhat/varnish.initrc redhat/varnishlog.initrc redhat/varnishncsa.initrc
 %endif
 
-%if 0%{?rhel} > 4 || 0%{?fedora} > 6
-pushd doc/sphinx
-%{__make} html
-popd
-mv doc/sphinx/\=build/html doc
-%endif
+cp -r doc/sphinx/\=build/html doc
 
 %check
 # rhel5 on ppc64 is just too strange



More information about the varnish-commit mailing list