From f83931bd1e922faff8cd049c912be59fc5113e3e Mon Sep 17 00:00:00 2001
From: Ingvar Hagelund <ingvar@fedoraproject.org>
Date: Wed, 5 May 2010 12:59:32 +0000
Subject: [PATCH] - New upstream release - Remove patches merged upstream

---
 .cvsignore   |  2 +-
 sources      |  2 +-
 varnish.spec | 11 +++++------
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 4522888..d7726fd 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-varnish-2.1.1.tar.gz
+varnish-2.1.2.tar.gz
diff --git a/sources b/sources
index 004152b..4b7a161 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2dec86e24915aa8d427584f671d25f40  varnish-2.1.1.tar.gz
+8b0d80e47acf4946671c381af55518b9  varnish-2.1.2.tar.gz
diff --git a/varnish.spec b/varnish.spec
index 4b922f5..4899481 100644
--- a/varnish.spec
+++ b/varnish.spec
@@ -1,13 +1,11 @@
 Summary: High-performance HTTP accelerator
 Name: varnish
-Version: 2.1.1
+Version: 2.1.2
 Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
 Source0: http://downloads.sourceforge.net/varnish/varnish-%{version}.tar.gz
-Patch0: varnish.v00002fix.patch
-Patch1: varnish.from_r4750_fixes_lowspec_buildhost.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
@@ -66,9 +64,6 @@ Varnish is a high-performance HTTP accelerator
 %setup -q
 #%setup -q -n varnish-cache
 
-%patch0
-%patch1
-
 # The svn sources needs to generate a suitable configure script
 # Release tarballs would not need this
 #./autogen.sh
@@ -257,6 +252,10 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Wed May 05 2010 Ingvar Hagelund <ingvar@redpill-linpro.com> - 2.1.2-1
+- New upstream release
+- Remove patches merged upstream
+
 * Tue Apr 27 2010 Ingvar Hagelund <ingvar@linpro.no> - 2.1.1-1
 - New upstream release
 - Added a fix for missing pkgconfig/libpcre.pc on rhel4