diff options
Diffstat (limited to 'misc/bcfg2.spec')
-rw-r--r-- | misc/bcfg2.spec | 64 |
1 files changed, 35 insertions, 29 deletions
diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index 6a4153472..ab1394110 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -20,7 +20,9 @@ # Don't forget to change the Release: tag below to something like 0.1 #%%global _rc 1 #%%global _pre 2 -%global _pre_rc %{?_pre:.pre%{_pre}}%{?_rc:.rc%{_rc}} +%global _nightly 1 +%global _date %(date +%Y%m%d) +%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: @@ -29,8 +31,8 @@ Name: bcfg2 -Version: 1.3.4 -Release: 1%{?_pre_rc}%{?dist} +Version: 1.4.0 +Release: 0.1.%{?_nightly:nightly.%{_date}}%{?_pre_rc}%{?dist} Summary: A configuration management system %if 0%{?suse_version} @@ -76,7 +78,6 @@ BuildRequires: buildsys-macros BuildRequires: python-ssl %else # rhel > 5 # EL5 lacks python-mock, so test suite is disabled -BuildRequires: python-sqlalchemy BuildRequires: python-nose BuildRequires: mock BuildRequires: m2crypto @@ -295,6 +296,8 @@ This package includes the Bcfg2 CherryPy server backend. %package web Summary: Bcfg2 Web Reporting Interface +Requires: bcfg2-server = %{version}-%{release} +Requires: httpd %if 0%{?suse_version} Group: System/Management Requires: python-django >= 1.2 @@ -310,7 +313,6 @@ Requires: Django-south >= 0.7 %endif Requires: bcfg2-server %endif -Requires: httpd %if "%{_vendor}" == "redhat" Requires: mod_wsgi %global apache_conf %{_sysconfdir}/httpd @@ -443,7 +445,7 @@ awk ' # Get rid of extraneous shebangs for f in `find src/lib -name \*.py` do - sed -i -e '/^#!/,1d' $f + %{__sed} -i -e '/^#!/,1d' $f done sed -i "s/apache2/httpd/g" misc/apache/bcfg2.conf @@ -558,11 +560,13 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ # Initial installation %if 0%{?suse_version} %fillup_and_insserv -f bcfg2 - %else %if 0%{?fedora} >= 16 - /bin/systemctl daemon-reload >/dev/null 2>&1 || : %else + %if 0%{?fedora} >= 16 + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + %else /sbin/chkconfig --add bcfg2 - %endif %endif + %endif + %endif fi %endif @@ -574,11 +578,13 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ # Initial installation %if 0%{?suse_version} %fillup_and_insserv -f bcfg2-server - %else %if 0%{?fedora} >= 16 - /bin/systemctl daemon-reload >/dev/null 2>&1 || : %else + %if 0%{?fedora} >= 16 + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + %else /sbin/chkconfig --add bcfg2-server - %endif %endif + %endif + %endif fi %endif @@ -590,13 +596,15 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ # Package removal, not upgrade %if 0%{?suse_version} %stop_on_removal bcfg2 - %else %if 0%{?fedora} >= 16 + %else + %if 0%{?fedora} >= 16 /bin/systemctl --no-reload disable bcfg2.service > /dev/null 2>&1 || : /bin/systemctl stop bcfg2.service > /dev/null 2>&1 || : - %else + %else /sbin/service bcfg2 stop &>/dev/null || : /sbin/chkconfig --del bcfg2 - %endif %endif + %endif + %endif fi %endif @@ -609,13 +617,15 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ %if 0%{?suse_version} %stop_on_removal bcfg2-server %stop_on_removal bcfg2-report-collector - %else %if 0%{?fedora} >= 16 + %else + %if 0%{?fedora} >= 16 /bin/systemctl --no-reload disable bcfg2-server.service > /dev/null 2>&1 || : /bin/systemctl stop bcfg2-server.service > /dev/null 2>&1 || : - %else + %else /sbin/service bcfg2-server stop &>/dev/null || : /sbin/chkconfig --del bcfg2-server - %endif %endif + %endif + %endif fi %endif @@ -630,11 +640,13 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ # Package upgrade, not uninstall %if 0%{?suse_version} %insserv_cleanup - %else %if 0%{?fedora} >= 16 - /bin/systemctl try-restart bcfg2.service >/dev/null 2>&1 || : %else + %if 0%{?fedora} >= 16 + /bin/systemctl try-restart bcfg2.service >/dev/null 2>&1 || : + %else /sbin/service bcfg2 condrestart &>/dev/null || : - %endif %endif + %endif + %endif fi %endif @@ -707,8 +719,7 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ %{python_sitelib}/Bcfg2/Client %{python_sitelib}/Bcfg2/Compat.py* %{python_sitelib}/Bcfg2/Logger.py* -%{python_sitelib}/Bcfg2/Options.py* -%{python_sitelib}/Bcfg2/Proxy.py* +%{python_sitelib}/Bcfg2/Options %{python_sitelib}/Bcfg2/Utils.py* %{python_sitelib}/Bcfg2/version.py* %if 0%{?suse_version} @@ -730,11 +741,7 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ %config(noreplace) %{_sysconfdir}/sysconfig/bcfg2-server %{_sbindir}/bcfg2-* %dir %{_localstatedir}/lib/%{name} -%{python_sitelib}/Bcfg2/Cache.py* -%{python_sitelib}/Bcfg2/Encryption.py* -%{python_sitelib}/Bcfg2/SSLServer.py* -%{python_sitelib}/Bcfg2/Statistics.py* -%{python_sitelib}/Bcfg2/settings.py* +%{python_sitelib}/Bcfg2/DBSettings.py* %{python_sitelib}/Bcfg2/Server %{python_sitelib}/Bcfg2/Reporting %{python_sitelib}/Bcfg2/manage.py* @@ -743,7 +750,6 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ %dir %{_datadir}/bcfg2 %{_datadir}/bcfg2/schemas %{_datadir}/bcfg2/xsl-transforms -%{_datadir}/bcfg2/Hostbase %if 0%{?suse_version} %{_sbindir}/rcbcfg2-server %config(noreplace) /var/adm/fillup-templates/sysconfig.bcfg2-server |