Adjust spec file and distcheck hook for 3.0.0-beta1

Makefile.am

@@ -15,8 +15,11 @@ install-data-local:
 	$(install_sh) -d -m 0755 $(DESTDIR)$(localstatedir)/varnish
 
 distcheck-hook:
-	if ! grep "^Version: @PACKAGE_VERSION@$$" $(top_distdir)/redhat/varnish.spec && \
+	V="@PACKAGE_VERSION@" ; \
+	V="$${V%%-*}" ; \
+	if ! grep "^Version: $$V$$" $(top_distdir)/redhat/varnish.spec && \
 	  [ "@PACKAGE_VERSION@" != "trunk" ]; then \
+	  echo "$$V" ; \
 	  echo "redhat/varnish.spec does not have a version number matching the package" ; \
 	  exit 1 ; \
 	fi

redhat/varnish.spec

 Summary: High-performance HTTP accelerator
 Name: varnish
 Version: 3.0.0
-Release: 0.git20110210%{?dist}
+Release: 0.beta1%{?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}-trunk.tar.gz
+Source0: %{name}-3.0-beta1.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
@@ -72,7 +72,7 @@ Documentation files for %name
 
 %prep
 #%setup -q
-%setup -q -n varnish-trunk
+%setup -q -n varnish-3.0-beta1
 
 mkdir examples
 cp bin/varnishd/default.vcl etc/zope-plone.vcl examples