From 964195a5e6de616aec923d5d3eb3a7b13b9f38aa Mon Sep 17 00:00:00 2001
From: Ingvar Hagelund <ingvar@fedoraproject.org>
Date: Wed, 14 Apr 2010 20:34:34 +0000
Subject: [PATCH] Added a patch from svn that fixes doc/changes-2.0.6-2.1.0.xml

---
 varnish.changes-2.1.0.patch | 53 +++++++++++++++++++++++++++++++++++++
 varnish.spec                | 17 +++++++++---
 2 files changed, 67 insertions(+), 3 deletions(-)
 create mode 100644 varnish.changes-2.1.0.patch

diff --git a/varnish.changes-2.1.0.patch b/varnish.changes-2.1.0.patch
new file mode 100644
index 0000000..460bd5f
--- /dev/null
+++ b/varnish.changes-2.1.0.patch
@@ -0,0 +1,53 @@
+--- doc/changes-2.0.6-2.1.0.xml.orig	2010-04-14 15:16:12.308484148 +0200
++++ doc/changes-2.0.6-2.1.0.xml	2010-04-14 15:16:28.844484368 +0200
+@@ -2,7 +2,7 @@
+ <!DOCTYPE group [
+ <!ENTITY mdash "&#8212;">
+ ]>
+-<!-- $Id: changes-2.0.6-2.1.0.xml 4641 2010-03-24 10:36:56Z tfheen $ -->
++<!-- $Id: changes-2.0.6-2.1.0.xml 4643 2010-03-24 12:41:53Z tfheen $ -->
+ <group from="2.0.6" to="2.1.0">
+   <subsystem>
+     <name>varnishd</name>
+@@ -48,7 +48,7 @@
+       <para>When closing connections, we experimented with sending RST
+       to free up load balancers and free up threads more quickly.
+       This caused some problems with NAT routers and so has been
+-      reverted for now.
++      reverted for now.</para>
+     </change>
+ 
+     <change type="enh">
+@@ -176,7 +176,7 @@
+ 
+     <change type="enh">
+       <para><code>purge.hash</code> is now deprecated and no longer
+-      shown in help listings.</code>.</para>
++      shown in help listings.</para>
+     </change>
+ 
+     <change type="enh" ref="607">
+@@ -298,11 +298,19 @@
+       <para>Exit at the end of the file when started
+ 	with <code>-d</code>.</para>
+     </change>
++  </subsystem>
+ 
++  <subsystem>
++    <name>varnishadm</name>
+ 
+-varnishadm:
+- - timeout support
+- - secret support
+- - handle cli banner
++    <change type="enh">
++      <para><code>varnishadm</code> can now have a timeout when trying
++      to connect to the running <code>varnishd</code>.</para>
++    </change>
+ 
++    <change type="enh">
++      <para><code>varnishadm</code> now knows how to respond to the
++      secret from a secured <code>varnishd</code></para>
++    </change>
++  </subsystem>
+ </group>
diff --git a/varnish.spec b/varnish.spec
index 7fef031..3f82967 100644
--- a/varnish.spec
+++ b/varnish.spec
@@ -1,7 +1,7 @@
 Summary: High-performance HTTP accelerator
 Name: varnish
 Version: 2.1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
@@ -9,11 +9,12 @@ URL: http://www.varnish-cache.org/
 Source0: http://downloads.sourceforge.net/varnish/varnish-2.1.tar.gz
 patch0: varnish.S-option.patch
 patch1: varnish.floor.patch
+patch2: varnish.changes-2.1.0.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # The svn sources needs autoconf, automake and libtool to generate a suitable
 # configure script. Release tarballs would not need this
 BuildRequires: automake autoconf libtool
-BuildRequires: ncurses-devel libxslt groff pcre-devel pkgconfig
+BuildRequires: ncurses-devel libxslt groff pcre-devel pkgconfig pcre
 Requires: varnish-libs = %{version}-%{release}
 Requires: logrotate
 Requires: ncurses
@@ -74,6 +75,7 @@ Varnish is a high-performance HTTP accelerator
 
 %patch0
 %patch1
+%patch2
 
 # Makefile.am was patched. Needs to rerun autoconf
 ./autogen.sh
@@ -109,6 +111,11 @@ cp bin/varnishd/default.vcl etc/zope-plone.vcl examples
 	%configure --disable-static --localstatedir=/var/lib
 %endif
 
+# Have to regenerate the docs because of patched doc/changes-2.0.6-2.1.0.xml
+pushd doc/
+make clean
+popd
+
 # We have to remove rpath - not allowed in Fedora
 # (This problem only visible on 64 bit arches)
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g;
@@ -256,8 +263,12 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Wed Apr 14 2010 Ingvar Hagelund <ingvar@linpro.no> - 2.1.0-2
+- Added a patch from svn that fixes doc/changes-2.0.6-2.1.0.xml
+
 * Tue Apr 06 2010 Ingvar Hagelund <ingvar@linpro.no> - 2.1.0-1
-- New upstream release; note: Configuration changes, see the README
+- New upstream release; note: Configuration changes, see 
+  doc/changes-2.1.0.html
 - Removed unneeded patches 
 - CVE-2009-2936: Added a patch from Debian that adds the -S option 
   to the varnisdh(1) manpage and to the sysconfig defaults, thus