diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-06-03 10:54:54 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-06-03 10:54:54 -0400 |
| commit | dae8f399151052fd2a0ce43ac61a56f399a28252 (patch) | |
| tree | 0cbf0d8c0eea192de5a315f7cca65836ad83bf29 /misc | |
| parent | 01e785422bdf3fd1457045dcd2e9d8c4aa7304a1 (diff) | |
| download | bcfg2-dae8f399151052fd2a0ce43ac61a56f399a28252.tar.gz bcfg2-dae8f399151052fd2a0ce43ac61a56f399a28252.tar.bz2 bcfg2-dae8f399151052fd2a0ce43ac61a56f399a28252.zip | |
bcfg2-admin: set appropriate return values on error
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/bcfg2.spec | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index f7289f1dd..10d913d7c 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -99,8 +99,6 @@ 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 @@ -151,7 +149,7 @@ Group: System Tools Requires: bcfg2 = %{version} Requires: bcfg2-server = %{version} -# cherrypy 3.2.3 actually doesn't exist yet, but 3.2.2 has bugs that +# 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 Requires: python-cherrypy > 3.3 @@ -297,6 +295,8 @@ 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,7 +333,6 @@ 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} |