[varnish/el5/master] ppc fixes

Ingvar Hagelund ingvar at fedoraproject.org
Tue Oct 26 18:27:45 UTC 2010


commit 0aa511210c4bb0593bf3622329a4f74395467635
Author: Ingvar Hagelund <ingvar at redpill-linpro.com>
Date:   Tue Oct 26 20:24:10 2010 +0200

    ppc fixes

 varnish.spec |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/varnish.spec b/varnish.spec
index 811341c..cee5fd2 100644
--- a/varnish.spec
+++ b/varnish.spec
@@ -1,7 +1,7 @@
 Summary: High-performance HTTP accelerator
 Name: varnish
 Version: 2.0.6
-Release: 2.2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
@@ -95,12 +95,7 @@ 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
-	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 --disable-jemalloc
 %endif
 
 # We have to remove rpath - not allowed in Fedora
@@ -254,6 +249,9 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Tue Oct 26 2010 Ingvar Hagelund <ingvar at linpro.no> - 2.0.6-3
+- Build fixes for ppc
+
 * Wed Dec 23 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.6-2.2
 - Added a test that enables jemalloc on ppc if the kernel is
   not a rhel5 kernel (as on redhat builders)


More information about the scm-commits mailing list