Our default.vcl has a minor change: It uses localhost:80 (thus not

default anymore, but whatever, it will work with apache httpd out of
the box, and that's better for easy testing) as the backend. sysconfig
file changed to reflect this.

Minor cosmetic changes in the specfile

Ingvar



git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@1449 d4fa192b-c00b-0410-8231-f00ffab90ce4

redhat/varnish.spec

 Summary: Varnish is a high-performance HTTP accelerator
 Name: varnish
 Version: 1.0.svn
-Release: 20070516%{?dist}
+Release: 20070517%{?dist}
 License: BSD-like
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
@@ -47,13 +47,15 @@ Varnish is a high-performance HTTP accelerator.
 %prep
 %setup -q
 
+# The svn sources needs to generate a suitable configure script
+# Release tarballs would not need this
 ./autogen.sh
 
 %build
 
 # Remove "--disable static" if you want to build static libraries 
 # (ie for the devel package)
-%configure --sbindir=/usr/sbin --disable-static
+%configure --disable-static
 
 # We have to remove rpath - not allowed in Fedora
 # (This problem only visible on 64 bit arches)
@@ -137,7 +139,7 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
-* Wed May 16 2007 Ingvar Hagelund <ingvar@linpro.no> - 1.0.svn-20070516
+* Wed May 16 2007 Ingvar Hagelund <ingvar@linpro.no> - 1.0.svn-20070517
 - Wrapping up for 1.0.4
 - Changes in sysconfig and init scripts. Syncing with files in
   trunk/debian

redhat/varnish.sysconfig

@@ -14,10 +14,10 @@ NFILES=131072
 # Listen on port 6081, administration on localhost:6082, and forward to
 # content server on localhost:8080.  Use a fixed-size cache file.
 #
-DAEMON_OPTS="-a :6081 \
-             -T localhost:6082 \
-	     -b localhost:8080 \
-	     -s file,/var/lib/varnish/varnish_storage.bin,1G"
+#DAEMON_OPTS="-a :6081 \
+#             -T localhost:6082 \
+#             -b localhost:8080 \
+#             -s file,/var/lib/varnish/varnish_storage.bin,1G"
 
 
 ## Alternative 2, Configuration with VCL
@@ -26,10 +26,10 @@ DAEMON_OPTS="-a :6081 \
 # one content server selected by the vcl file, based on the request.  Use a
 # fixed-size cache file.
 #
-# DAEMON_OPTS="-a :6081 \
-#              -T localhost:6082 \
-#              -f /etc/varnish/default.vcl \
-#              -s file,/var/lib/varnish/varnish_storage.bin,1G"
+DAEMON_OPTS="-a :6081 \
+             -T localhost:6082 \
+             -f /etc/varnish/default.vcl \
+             -s file,/var/lib/varnish/varnish_storage.bin,1G"
 
 
 ## Alternative 3, Advanced configuration