diff options
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/bcfg2.spec | 64 |
1 files changed, 33 insertions, 31 deletions
diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index ddd694d51..788ec1cf3 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -35,7 +35,7 @@ Group: Applications/System %endif License: BSD URL: http://bcfg2.org -Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/%{name}-%{version}.tar.gz +Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/%{name}-%{version}%{?_pre_rc}.tar.gz # Used in %%check Source1: http://www.w3.org/2001/XMLSchema.xsd %if %{?rhel}%{!?rhel:10} <= 5 || 0%{?suse_version} @@ -68,7 +68,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 @@ -273,6 +272,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 @@ -281,9 +282,7 @@ Requires: python-django-south >= 0.7 Group: System Tools Requires: Django >= 1.2 Requires: Django-south >= 0.7 -Requires: bcfg2-server %endif -Requires: httpd %if "%{_vendor}" == "redhat" Requires: mod_wsgi %global apache_conf %{_sysconfdir}/httpd @@ -412,14 +411,13 @@ awk ' # Fixup some paths %{__perl} -pi -e 's@/etc/default@%{_sysconfdir}/sysconfig@g' tools/bcfg2-cron - %{__perl} -pi -e 's@/usr/lib/bcfg2@%{_libexecdir}@g' debian/bcfg2.cron.daily %{__perl} -pi -e 's@/usr/lib/bcfg2@%{_libexecdir}@g' debian/bcfg2.cron.hourly # 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 @@ -527,11 +525,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 @@ -543,11 +543,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 @@ -559,13 +561,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 @@ -578,13 +582,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 @@ -599,11 +605,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 @@ -676,8 +684,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} @@ -699,20 +706,15 @@ 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* -%exclude %{python_sitelib}/Bcfg2/Server/CherryPyCore.py +%exclude %{python_sitelib}/Bcfg2/Server/CherrypyCore.py %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 @@ -727,7 +729,7 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ %if 0%{?rhel} == 5 || 0%{?suse_version} %defattr(-,root,root,-) %endif -%{python_sitelib}/Bcfg2/Server/CherryPyCore.py +%{python_sitelib}/Bcfg2/Server/CherrypyCore.py %files web %if 0%{?rhel} == 5 || 0%{?suse_version} |