[master] 7d73643 Get ready for 4.0.0-tp1

[Tollef Fog Heen]

commit 7d73643772f628932348fe1cb8ca43e398b4ce41
Author: Tollef Fog Heen <tfheen at varnish-software.com>
Date:   Fri Nov 29 13:55:54 2013 +0100

    Get ready for 4.0.0-tp1

diff --git a/configure.ac b/configure.ac
index 98f7113..51baa8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.59)
 AC_COPYRIGHT([Copyright (c) 2006 Verdens Gang AS
 Copyright (c) 2006-2013 Varnish Software AS])
 AC_REVISION([$Id$])
-AC_INIT([Varnish], [trunk], [varnish-dev at varnish-cache.org])
+AC_INIT([Varnish], [4.0.0-tp1], [varnish-dev at varnish-cache.org])
 AC_CONFIG_SRCDIR(include/miniobj.h)
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/redhat/varnish.spec b/redhat/varnish.spec
index 194340b..362edcd 100644
--- a/redhat/varnish.spec
+++ b/redhat/varnish.spec
@@ -1,17 +1,17 @@
-%define v_rc
+%define v_rc tp1
 %define vd_rc %{?v_rc:-%{?v_rc}}
 %define    _use_internal_dependency_generator 0
 %define __find_provides %{_builddir}/varnish-%{version}%{?v_rc:-%{?v_rc}}/redhat/find-provides
 Summary: High-performance HTTP accelerator
 Name: varnish
 Version: 4.0.0
-Release: 0.20131014%{?v_rc}%{?dist}
+Release: 0.20131129%{?v_rc}%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
 #Source0: http://repo.varnish-cache.org/source/%{name}-%{version}.tar.gz
-#Source0: %{name}-%{version}%{?vd_rc}.tar.gz
-Source0: %{name}-trunk.tar.gz
+Source0: %{name}-%{version}%{?vd_rc}.tar.gz
+#Source0: %{name}-trunk.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # To build from git, start with a make dist, see redhat/README.redhat 
 # You will need at least automake autoconf libtool python-docutils
@@ -83,8 +83,8 @@ Documentation files for %name
 #Varnish Cache is a high-performance HTTP accelerator
 
 %prep
-#%setup -q -n varnish-%{version}%{?vd_rc}
-%setup -q -n varnish-trunk
+%setup -n varnish-%{version}%{?vd_rc}
+#%setup -q -n varnish-trunk
 
 mkdir examples
 cp bin/varnishd/default.vcl etc/zope-plone.vcl examples