From ed357aa99a76956ea3f33dcebd9aa60051880696 Mon Sep 17 00:00:00 2001
From: Ingvar Hagelund <ingvar@fedoraproject.org>
Date: May 31 2010 12:03:13 +0000
Subject: New upstream release. A bugfix relase.


---

diff --git a/.cvsignore b/.cvsignore
index e795082..d7726fd 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-varnish-2.1.tar.gz
+varnish-2.1.2.tar.gz
diff --git a/sources b/sources
index 5c0e157..4b7a161 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-91d92ea69f7dce470e55ef4721ef9b7d  varnish-2.1.tar.gz
+8b0d80e47acf4946671c381af55518b9  varnish-2.1.2.tar.gz
diff --git a/varnish.spec b/varnish.spec
index 3f82967..4932107 100644
--- a/varnish.spec
+++ b/varnish.spec
@@ -1,20 +1,16 @@
 Summary: High-performance HTTP accelerator
 Name: varnish
-Version: 2.1.0
-Release: 2%{?dist}
+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
-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
+Source0: http://downloads.sourceforge.net/varnish/varnish-%{version}.tar.gz
 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 pcre
+#BuildRequires: automake autoconf libtool
+BuildRequires: ncurses-devel libxslt groff pcre-devel pkgconfig
 Requires: varnish-libs = %{version}-%{release}
 Requires: logrotate
 Requires: ncurses
@@ -65,21 +61,13 @@ Varnish is a high-performance HTTP accelerator
 #Varnish is a high-performance HTTP accelerator
 
 %prep
-#%setup -q
-%setup -q -n varnish-2.1
+%setup -q
 #%setup -q -n varnish-cache
 
 # The svn sources needs to generate a suitable configure script
 # Release tarballs would not need this
 #./autogen.sh
 
-%patch0
-%patch1
-%patch2
-
-# Makefile.am was patched. Needs to rerun autoconf
-./autogen.sh
-
 # Hack to get 32- and 64-bits tests run concurrently on the same build machine
 case `uname -m` in
 	ppc64 | s390x | x86_64 | sparc64 )
@@ -100,10 +88,16 @@ cp bin/varnishd/default.vcl etc/zope-plone.vcl examples
 
 %build
 
+# No pkgconfig/libpcre.pc in rhel4
+%if 0%{?rhel} == 4
+	export PCRE_CFLAGS=`pcre-config --cflags`
+	export PCRE_LIBS=`pcre-config --libs` 
+%endif
+
 # Remove "--disable static" if you want to build static libraries 
 # jemalloc is not compatible with Red Hat's ppc* RHEL5 kernel koji server :-(
 %ifarch ppc64 ppc
-	if [[ `uname -r` =~ "2.6.18-.*" ]]
+	if [[ `uname -r` =~ '.el5' ]]
 		then %configure --disable-static --localstatedir=/var/lib --disable-jemalloc
 		else %configure --disable-static --localstatedir=/var/lib
 	fi
@@ -111,11 +105,6 @@ 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;
@@ -263,12 +252,22 @@ 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
+- Added a patch from trunk making the rpm buildable on lowspec
+  build hosts (like Red Hat's ppc build farm nodes)
+- Removed patches that are merged upstream
+
 * 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
+- Added a patch from svn that fixes 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 
-  doc/changes-2.1.0.html
+- New upstream release; note: Configuration changes, see the README
 - 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