[master] 2bb6d93 Package builtin.vcl and example.vcl correctly.

[Lasse Karstensen]

commit 2bb6d93a2e00a4677683f0b52fa99390b97a0a63
Author: Lasse Karstensen <lkarsten at varnish-software.com>
Date:   Tue Jan 28 14:22:58 2014 +0100

    Package builtin.vcl and example.vcl correctly.
    
    New world order says that builtin.vcl and example.vcl are
    documentation example, and that example.vcl should be the file
    that the init script try to use when starting varnishd.

diff --git a/redhat/varnish.spec b/redhat/varnish.spec
index edb6f02..0b53613 100644
--- a/redhat/varnish.spec
+++ b/redhat/varnish.spec
@@ -87,7 +87,7 @@ Documentation files for %name
 #%setup -q -n varnish-trunk
 
 mkdir examples
-cp bin/varnishd/default.vcl examples
+cp etc/builtin.vcl etc/example.vcl examples
 
 %build
 # No pkgconfig/libpcre.pc in rhel4
@@ -113,17 +113,6 @@ export CFLAGS="$CFLAGS -Wp,-D_FORTIFY_SOURCE=0"
 
 make %{?_smp_mflags} V=1
 
-head -6 etc/default.vcl > redhat/default.vcl
-
-cat << EOF >> redhat/default.vcl
-backend default {
-  .host = "127.0.0.1";
-  .port = "80";
-}
-EOF
-
-tail -n +11 etc/default.vcl >> redhat/default.vcl
-
 %if 0%{?fedora}%{?rhel} != 0 && 0%{?rhel} <= 4 && 0%{?fedora} <= 8
 	# Old style daemon function
 	sed -i 's,--pidfile \$pidfile,,g;
@@ -169,7 +158,7 @@ mkdir -p %{buildroot}/var/lib/varnish
 mkdir -p %{buildroot}/var/log/varnish
 mkdir -p %{buildroot}/var/run/varnish
 mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d/
-install -D -m 0644 redhat/default.vcl %{buildroot}%{_sysconfdir}/varnish/default.vcl
+install -D -m 0644 etc/example.vcl %{buildroot}%{_sysconfdir}/varnish/default.vcl
 install -D -m 0644 redhat/varnish.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/varnish
 
 # systemd support