Skip to content

V
varnish-cache
Commit 172b7c82 authored by Tollef Fog Heen's avatar Tollef Fog Heen
Browse files
Options

Merge r5128: makes trunk build again, including new docs 


git-svn-id: http://www.varnish-cache.org/svn/branches/2.1@5338 d4fa192b-c00b-0410-8231-f00ffab90ce4
parent 8c2f704c
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 10 deletions
redhat/varnish.spec
View file @ 172b7c82
...@@ -10,7 +10,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ...@@ -10,7 +10,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# The svn sources needs autoconf, automake and libtool to generate a suitable # The svn sources needs autoconf, automake and libtool to generate a suitable
# configure script. Release tarballs would not need this # configure script. Release tarballs would not need this
#BuildRequires: automake autoconf libtool #BuildRequires: automake autoconf libtool
BuildRequires: ncurses-devel libxslt groff pcre-devel pkgconfig BuildRequires: ncurses-devel libxslt groff pcre-devel pkgconfig tex(latex)
BuildRequires: python-docutils >= 0.6
BuildRequires: python-sphinx >= 0.6
Requires: varnish-libs = %{version}-%{release} Requires: varnish-libs = %{version}-%{release}
Requires: logrotate Requires: logrotate
Requires: ncurses Requires: ncurses
...@@ -103,12 +105,9 @@ cp bin/varnishd/default.vcl etc/zope-plone.vcl examples ...@@ -103,12 +105,9 @@ cp bin/varnishd/default.vcl etc/zope-plone.vcl examples
%endif %endif
# Remove "--disable static" if you want to build static libraries # Remove "--disable static" if you want to build static libraries
# jemalloc is not compatible with Red Hat's ppc* RHEL5 kernel koji server :-( # jemalloc is not compatible with Red Hat's ppc64 RHEL kernel :-(
%ifarch ppc64 ppc %ifarch ppc64 ppc
if [[ `uname -r` =~ "2.6.18-.*" ]] %configure --disable-static --localstatedir=/var/lib --disable-jemalloc
then %configure --disable-static --localstatedir=/var/lib --disable-jemalloc
else %configure --disable-static --localstatedir=/var/lib
fi
%else %else
%configure --disable-static --localstatedir=/var/lib %configure --disable-static --localstatedir=/var/lib
%endif %endif
...@@ -169,8 +168,8 @@ rm -rvf doc/sphinx/\=build/* ...@@ -169,8 +168,8 @@ rm -rvf doc/sphinx/\=build/*
%endif %endif
%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 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" %{__make} check LD_LIBRARY_PATH="../../lib/libvarnish/.libs:../../lib/libvarnishcompat/.libs:../../lib/libvarnishapi/.libs:../../lib/libvcl/.libs"
%install %install
rm -rf %{buildroot} rm -rf %{buildroot}
...@@ -270,9 +269,9 @@ fi ...@@ -270,9 +269,9 @@ fi
%postun libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig
%changelog %changelog
* Thu Jul 29 2010 Ingvar Hagelund <ingvar@redpill-linpro.com> - 2.1.4-0.svn20100730 * Thu Jul 29 2010 Ingvar Hagelund <ingvar@redpill-linpro.com> - 2.1.4-0.svn20100824r5117
- Replaced specific include files with a wildcard glob - Replaced specific include files with a wildcard glob
- Needs python-sphinx to build sphinx documentation - Needs python-sphinx and deps to build sphinx documentation
- Builds html and latex documentation. Put that in a subpackage varnish-docs - Builds html and latex documentation. Put that in a subpackage varnish-docs
* Thu Jul 29 2010 Ingvar Hagelund <ingvar@redpill-linpro.com> - 2.1.3-1 * Thu Jul 29 2010 Ingvar Hagelund <ingvar@redpill-linpro.com> - 2.1.3-1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment