rpms/varnish
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Added a test that enables jemalloc on ppc if the kernel is not a rhel5

Browse Source 
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
This commit is contained in:
Ingvar Hagelund 2009-12-23 17:31:24 +00:00
parent de5fe61b60
commit b7f5ea97ad
1 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
varnish.spec
View File

@ -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 accelerator
# 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-plone.vcl examples
# 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/default.vcl
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/default.vcl
%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@linpro.no> - 2.0.6-1
* Wed Dec 23 2009 Ingvar Hagelund <ingvar@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@linpro.no> - 2.0.6-1
- New upstream release
- Removed patches for libjemalloc, as they are added upstream