rpms/varnish/EL-5 varnish.changes-2.0.6.patch, NONE, 1.1 varnish.spec, 1.11, 1.12
Ingvar Hagelund
ingvar at fedoraproject.org
Wed Dec 23 18:29:36 UTC 2009
- Previous message (by thread): rpms/NetworkManager/F-11 .cvsignore, 1.110, 1.111 NetworkManager.spec, 1.284, 1.285 nm-applet-internal-buildfixes.patch, 1.12, 1.13 sources, 1.151, 1.152
- Next message (by thread): rpms/varnish/EL-4 varnish.changes-2.0.6.patch, NONE, 1.1 varnish.spec, 1.21, 1.22
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ingvar
Update of /cvs/pkgs/rpms/varnish/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32171
Modified Files:
varnish.spec
Added Files:
varnish.changes-2.0.6.patch
Log Message:
- Added a test that enables jemalloc on ppc if the kernel is
not a rhel5 kernel (as on redhat builders)
- Removed tests c00031.vtc and r00387on rhel4/ppc as they fail
on the Red Hat ppc builders (but works on my rhel4 ppc instance)
- Added a patch that fixes broken changes-2.0.6.html in doc
varnish.changes-2.0.6.patch:
changes-2.0.5-2.0.6.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE varnish.changes-2.0.6.patch ---
--- doc/changes-2.0.5-2.0.6.xml.orig 2009-12-23 11:42:58.168643121 +0100
+++ doc/changes-2.0.5-2.0.6.xml 2009-12-23 11:43:05.827643574 +0100
@@ -49,5 +49,5 @@
<para>Document the <code>-C</code> option
to <code>varnishd</code>.</para>
</change>
- <subsystem>
+ </subsystem>
</group>
Index: varnish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/EL-5/varnish.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- varnish.spec 21 Dec 2009 22:12:06 -0000 1.11
+++ varnish.spec 23 Dec 2009 18:29:36 -0000 1.12
@@ -1,12 +1,13 @@
Summary: High-performance HTTP accelerator
Name: varnish
Version: 2.0.6
-Release: 1%{?dist}
+Release: 2%{?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
+Patch1: varnish.changes-2.0.6.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
@@ -68,7 +69,8 @@ Varnish is a high-performance HTTP accel
# Release tarballs would not need this
#./autogen.sh
-%patch0 -p0
+%patch0
+%patch1
# Hack to get 32- and 64-bits tests run concurrently on the same build machine
case `uname -m` in
@@ -93,9 +95,12 @@ cp bin/varnishd/default.vcl etc/zope-plo
# 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
-%configure --disable-static --localstatedir=/var/lib --disable-jemalloc
+ if [[ `uname -r` =~ "2.6.18-.*" ]]
+ then %configure --disable-static --localstatedir=/var/lib --disable-jemalloc
+ else %configure --disable-static --localstatedir=/var/lib
+ fi
%else
-%configure --disable-static --localstatedir=/var/lib
+ %configure --disable-static --localstatedir=/var/lib
%endif
# We have to remove rpath - not allowed in Fedora
@@ -124,6 +129,11 @@ tail -n +11 etc/default.vcl >> redhat/de
redhat/varnish.initrc redhat/varnishlog.initrc redhat/varnishncsa.initrc
%endif
+# Fix for broken changes-2.0.6.html
+pushd doc
+%{__make} clean; %{__make}
+popd
+
%check
# rhel5 on ppc64 is just too strange
%ifarch ppc64
@@ -132,6 +142,15 @@ tail -n +11 etc/default.vcl >> redhat/de
%endif
%endif
+# The redhat ppc builders seem to have some ulimit problems?
+# These tests work on a rhel4 ppc/ppc64 instance outside the builders
+%ifarch ppc64 ppc
+ %if 0%{?rhel} == 4
+ rm bin/varnishtest/tests/c00031.vtc
+ rm bin/varnishtest/tests/r00387.vtc
+ %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"
@@ -235,7 +254,14 @@ fi
%postun libs -p /sbin/ldconfig
%changelog
-* Thu Dec 17 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.6-1
+* Wed Dec 23 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.6-2
+- Added a test that enables jemalloc on ppc if the kernel is
+ not a rhel5 kernel (as on redhat builders)
+- Removed tests c00031.vtc and r00387on rhel4/ppc as they fail
+ on the Red Hat ppc builders (but works on my rhel4 ppc instance)
+- Added a patch that fixes broken changes-2.0.6.html in doc
+
+* Mon Dec 14 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.6-1
- New upstream release
- Removed patches for libjemalloc, as they are added upstream
- Previous message (by thread): rpms/NetworkManager/F-11 .cvsignore, 1.110, 1.111 NetworkManager.spec, 1.284, 1.285 nm-applet-internal-buildfixes.patch, 1.12, 1.13 sources, 1.151, 1.152
- Next message (by thread): rpms/varnish/EL-4 varnish.changes-2.0.6.patch, NONE, 1.1 varnish.spec, 1.21, 1.22
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list