[cpp-sp COMMIT] /branches/REL_2/shibboleth.spec.in

[noreply at shibboleth.net]

Author: scantor
Date: Fri Feb 10 23:28:19 2012
New Revision: 3578

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3578&view=rev
Log:
Bypass RH6 memcache for now

Modified:
    branches/REL_2/shibboleth.spec.in

Modified: branches/REL_2/shibboleth.spec.in
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibboleth.spec.in?rev=3578&r1=3577&r2=3578&view=diff
==============================================================================
--- branches/REL_2/shibboleth.spec.in (original)
+++ branches/REL_2/shibboleth.spec.in Fri Feb 10 23:28:19 2012
@@ -23,12 +23,15 @@
 %{!?_with_log4cpp:BuildRequires: liblog4shib-devel}
 %if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600
 Requires:		libcurl-openssl >= 7.21.7
-BuildRequires:	chrpath, libmemcached-devel
+BuildRequires:	chrpath
 %endif
 BuildRequires:  gcc-c++, zlib-devel, boost-devel >= 1.32.0
 %{!?_without_doxygen:BuildRequires: doxygen}
 %{!?_without_odbc:BuildRequires:unixODBC-devel}
 %{?_with_fastcgi:BuildRequires: fcgi-devel}
+%if 0%{?centos_version} >= 600
+BuildRequires:	libmemcached-devel
+%endif
 %{?_with_memcached:BuildRequires: libmemcached-devel}
 %if "%{_vendor}" == "redhat"
 %{!?_without_builtinapache:BuildRequires: httpd-devel}
@@ -83,7 +86,7 @@
 %setup -q
 
 %build
-%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600
+%if 0%{?centos_version} >= 600
 	%configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_memcached:--with-memcached} %{?shib_options}
 %else
 	%configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{?_with_memcached} %{?shib_options}