From 3aa84b4aeb5cc666b78e177dc2d6a941403bc94d Mon Sep 17 00:00:00 2001
From: Sol Jerome <sol.jerome@gmail.com>
Date: Sun, 26 Jan 2014 10:01:19 -0600
Subject: misc/bcfg2.spec: Pull in cherrypy toggle from epel

This allows one to disable building of the bcfg2-server-cherrypy
package.

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
---
 misc/bcfg2.spec | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'misc/bcfg2.spec')

diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec
index 4174bdcb3..e7000eec2 100644
--- a/misc/bcfg2.spec
+++ b/misc/bcfg2.spec
@@ -22,6 +22,12 @@
 #%%global _pre 2
 %global _pre_rc %{?_pre:.pre%{_pre}}%{?_rc:.rc%{_rc}}
 
+# cherrypy 3.3 actually doesn't exist yet, but 3.2 has bugs that
+# prevent it from working:
+# https://bitbucket.org/cherrypy/cherrypy/issue/1154/assertionerror-in-recv-when-ssl-is-enabled
+%global build_cherry_py 0
+
+
 Name:             bcfg2
 Version:          1.3.3
 Release:          1%{?_pre_rc}%{?dist}
@@ -54,7 +60,9 @@ BuildRequires:    python-Genshi
 BuildRequires:    python-gamin
 BuildRequires:    python-pyinotify
 BuildRequires:    python-python-daemon
+%if %{build_cherry_py}
 BuildRequires:    python-CherryPy >= 3
+%endif
 %else # ! suse_version
 BuildRequires:    python-daemon
 BuildRequires:    python-inotify
@@ -83,7 +91,9 @@ BuildRequires:    python-cheetah
 BuildRequires:    pylibacl
 BuildRequires:    libselinux-python
 BuildRequires:    python-pep8
+%if %{build_cherry_py}
 BuildRequires:    python-cherrypy >= 3
+%endif
 BuildRequires:    python-mock
 BuildRequires:    pylint
 %endif # rhel > 5
@@ -231,6 +241,7 @@ deployment strategies.
 
 This package includes the Bcfg2 server software.
 
+%if %{build_cherry_py}
 %package server-cherrypy
 Summary:          Bcfg2 Server - CherryPy backend
 %if 0%{?suse_version}
@@ -273,6 +284,8 @@ Bcfg2 can enable the construction of complex change management and
 deployment strategies.
 
 This package includes the Bcfg2 CherryPy server backend.
+%endif # build_cherry_py
+
 
 %package web
 Summary:          Bcfg2 Web Reporting Interface
@@ -713,7 +726,7 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \
 %{python_sitelib}/Bcfg2/Server
 %{python_sitelib}/Bcfg2/Reporting
 %{python_sitelib}/Bcfg2/manage.py*
-%exclude %{python_sitelib}/Bcfg2/Server/CherryPyCore.py
+%exclude %{python_sitelib}/Bcfg2/Server/CherryPyCore.py*
 
 %dir %{_datadir}/bcfg2
 %{_datadir}/bcfg2/schemas
@@ -729,11 +742,13 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \
 
 %doc tools/*
 
+%if %{build_cherry_py}
 %files server-cherrypy
 %if 0%{?rhel} == 5 || 0%{?suse_version}
 %defattr(-,root,root,-)
 %endif
 %{python_sitelib}/Bcfg2/Server/CherryPyCore.py
+%endif
 
 %files web
 %if 0%{?rhel} == 5 || 0%{?suse_version}
-- 
cgit v1.2.3-1-g7c22