summaryrefslogtreecommitdiffstats
path: root/misc/bcfg2.spec
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2013-06-03 10:56:26 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-06-03 10:56:26 -0400
commit06dae2a73ae03ea72feed4e7d6e56d25cfa24195 (patch)
tree7e9464187639d8d32ba13958d22f7cc853e76e4b /misc/bcfg2.spec
parentdae8f399151052fd2a0ce43ac61a56f399a28252 (diff)
downloadbcfg2-06dae2a73ae03ea72feed4e7d6e56d25cfa24195.tar.gz
bcfg2-06dae2a73ae03ea72feed4e7d6e56d25cfa24195.tar.bz2
bcfg2-06dae2a73ae03ea72feed4e7d6e56d25cfa24195.zip
Revert "bcfg2-admin: set appropriate return values on error"
This reverts commit dae8f399151052fd2a0ce43ac61a56f399a28252. Splitting this into two commits.
Diffstat (limited to 'misc/bcfg2.spec')
-rw-r--r--misc/bcfg2.spec7
1 files changed, 4 insertions, 3 deletions
diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec
index 10d913d7c..f7289f1dd 100644
--- a/misc/bcfg2.spec
+++ b/misc/bcfg2.spec
@@ -99,6 +99,8 @@ Requires: bcfg2 = %{version}
Requires: python-ssl
%endif
Requires: python-lxml >= 1.2.1
+%if "%{_vendor}" == "redhat"
+%endif
%if 0%{?suse_version}
Requires: python-pyinotify
Requires: python-python-daemon
@@ -149,7 +151,7 @@ Group: System Tools
Requires: bcfg2 = %{version}
Requires: bcfg2-server = %{version}
-# cherrypy 3.3 actually doesn't exist yet, but 3.2 has bugs that
+# cherrypy 3.2.3 actually doesn't exist yet, but 3.2.2 has bugs that
# prevent it from working:
# https://bitbucket.org/cherrypy/cherrypy/issue/1154/assertionerror-in-recv-when-ssl-is-enabled
Requires: python-cherrypy > 3.3
@@ -295,8 +297,6 @@ This package includes the Bcfg2 reports web frontend.
%{?pythonpath: export PYTHONPATH="%{pythonpath}"}
%{__python}%{pythonversion} setup.py build_sphinx
-sed -i "s/apache2/httpd/g" misc/apache/bcfg2.conf
-
%install
rm -rf %{buildroot}
%{__python}%{pythonversion} setup.py install --root=%{buildroot} --record=INSTALLED_FILES --prefix=/usr
@@ -333,6 +333,7 @@ cp -r tools/* %{buildroot}%{_defaultdocdir}/bcfg2-server-%{version}
cp -r build/sphinx/html/* %{buildroot}%{_defaultdocdir}/bcfg2-doc-%{version}
%{__install} -d %{buildroot}%{apache_conf}/conf.d
+sed -i "s/apache2/httpd/g" misc/apache/bcfg2.conf
%{__install} -m 644 misc/apache/bcfg2.conf %{buildroot}%{apache_conf}/conf.d/wsgi_bcfg2.conf
%{__mkdir_p} %{buildroot}%{_localstatedir}/cache/%{name}