rpms/varnish/EL-5 varnish.varnishtest_debugflag.patch, NONE, 1.1 varnish.spec, 1.4, 1.5

Ingvar Hagelund ingvar at fedoraproject.org
Mon Nov 17 15:12:25 UTC 2008


Author: ingvar

Update of /cvs/pkgs/rpms/varnish/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6928

Modified Files:
	varnish.spec 
Added Files:
	varnish.varnishtest_debugflag.patch 
Log Message:
New upstream release 2.0.2. A small bugfix release.

varnish.varnishtest_debugflag.patch:

--- NEW FILE varnish.varnishtest_debugflag.patch ---
diff -Naur ../varnish-2.0.2.orig/bin/varnishtest/Makefile.am ./bin/varnishtest/Makefile.am
--- ../varnish-2.0.2.orig/bin/varnishtest/Makefile.am	2008-11-14 13:24:08.000000000 +0100
+++ ./bin/varnishtest/Makefile.am	2008-11-17 13:40:05.964237951 +0100
@@ -1,6 +1,6 @@
 # $Id: Makefile.am 3374 2008-11-10 10:12:28Z tfheen $
 
-TESTS_ENVIRONMENT = ./varnishtest
+TESTS_ENVIRONMENT = ./varnishtest -v
 TESTS = $(srcdir)/tests/*.vtc
 
 DISTCLEANFILES = _.ok
diff -Naur ../varnish-2.0.2.orig/bin/varnishtest/Makefile.in ./bin/varnishtest/Makefile.in
--- ../varnish-2.0.2.orig/bin/varnishtest/Makefile.in	2008-11-14 13:59:33.000000000 +0100
+++ ./bin/varnishtest/Makefile.in	2008-11-17 13:40:51.503384938 +0100
@@ -204,7 +204,7 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 varnishconfdir = @varnishconfdir@
-TESTS_ENVIRONMENT = ./varnishtest
+TESTS_ENVIRONMENT = ./varnishtest -v
 TESTS = $(srcdir)/tests/*.vtc
 DISTCLEANFILES = _.ok
 INCLUDES = -I$(top_srcdir)/include


Index: varnish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/EL-5/varnish.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- varnish.spec	2 Nov 2008 21:31:19 -0000	1.4
+++ varnish.spec	17 Nov 2008 15:11:55 -0000	1.5
@@ -1,11 +1,12 @@
 Summary: Varnish is a high-performance HTTP accelerator
 Name: varnish
-Version: 2.0.1
-Release: 2%{?dist}
+Version: 2.0.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.varnishtest_debugflag.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
@@ -63,6 +64,8 @@
 %setup -q
 #%setup -q -n varnish-cache
 
+%patch0
+
 # The svn sources needs to generate a suitable configure script
 # Release tarballs would not need this
 #./autogen.sh
@@ -122,6 +125,13 @@
 %endif
 
 %check
+# rhel5 on ppc64 is just too strange
+%ifarch ppc64
+	%if 0%{?rhel} > 4
+		cp bin/varnishd/.libs/varnishd bin/varnishd/lt-varnishd
+	%endif
+%endif
+
 LD_LIBRARY_PATH="lib/libvarnish/.libs:lib/libvarnishcompat/.libs:lib/libvarnishapi/.libs:lib/libvcl/.libs" bin/varnishd/varnishd -b 127.0.0.1:80 -C -n /tmp/foo
 %{__make} check LD_LIBRARY_PATH="../../lib/libvarnish/.libs:../../lib/libvarnishcompat/.libs:../../lib/libvarnishapi/.libs:../../lib/libvcl/.libs"
 
@@ -220,6 +230,9 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Mon Nov 10 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0.2-1
+  New upstream release 2.0.2. A bugfix release
+
 * Sun Nov 02 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0.1-2
 - Removed the requirement for kernel => 2.6.0. All supported
   platforms meets this, and it generates strange errors in EPEL
@@ -228,10 +241,14 @@
 - 2.0.1 released, a bugfix release. New upstream sources
 - Package now also available in EPEL
 
+* Thu Oct 16 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0-2
+- Readded the debugflag patch. It's so practical
+- Added a strange workaround for make check on ppc64
+
 * Wed Oct 15 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0-1
 - 2.0 released. New upstream sources
 - Disabled jemalloc on ppc and ppc64. Added a note in README.redhat
-- Synced to upstream again. No more patches needed.
+- Synced to upstream again. No more patches needed
 
 * Wed Oct 08 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0-0.11.rc1
 - 2.0-rc1 released. New upstream sources




More information about the scm-commits mailing list