From 51e6930af7319a71571237fa2642cee76c736057 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Wed, 30 Jan 2013 10:47:35 -0500 Subject: divided up Bcfg2/*.py files appropriately amongst bcfg2/bcfg2-server RPMs --- misc/bcfg2.spec | 19 +++++++++++++++---- redhat/bcfg2.spec.in | 14 +++++++++++++- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index 18791eccf..35435001f 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -318,7 +318,8 @@ cp -r build/sphinx/html/* %{buildroot}%{_defaultdocdir}/bcfg2-doc-%{version} # mandriva and RHEL 5 cannot handle %ghost without the file existing, # so let's touch a bunch of empty config files -touch %{buildroot}%{_sysconfdir}/bcfg2.conf %{buildroot}%{_sysconfdir}/bcfg2-web.conf +touch %{buildroot}%{_sysconfdir}/bcfg2.conf \ + %{buildroot}%{_sysconfdir}/bcfg2-web.conf %clean [ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot} || exit 2 @@ -327,9 +328,13 @@ touch %{buildroot}%{_sysconfdir}/bcfg2.conf %{buildroot}%{_sysconfdir}/bcfg2-web %defattr(-,root,root,-) %{_sbindir}/bcfg2 %dir %{python_sitelib}/Bcfg2 -%{python_sitelib}/Bcfg2/*.py* -%dir %{python_sitelib}/Bcfg2/Client -%{python_sitelib}/Bcfg2/Client/* +%{python_sitelib}/Bcfg2/Compat.py* +%{python_sitelib}/Bcfg2/__init__.py* +%{python_sitelib}/Bcfg2/Logger.py* +%{python_sitelib}/Bcfg2/Options.py* +%{python_sitelib}/Bcfg2/Proxy.py* +%{python_sitelib}/Bcfg2/version.py* +%{python_sitelib}/Bcfg2/Client %{_mandir}/man1/bcfg2.1* %{_mandir}/man5/bcfg2.conf.5* %{_initrddir}/bcfg2 @@ -350,6 +355,12 @@ touch %{buildroot}%{_sysconfdir}/bcfg2.conf %{buildroot}%{_sysconfdir}/bcfg2-web %{_initrddir}/bcfg2-server %{_initrddir}/bcfg2-report-collector %dir %{python_sitelib}/Bcfg2 +%{python_sitelib}/Bcfg2/Cache.py* +%{python_sitelib}/Bcfg2/Encryption.py* +%{python_sitelib}/Bcfg2/SSLServer.py* +%{python_sitelib}/Bcfg2/Statistics.py* +%{python_sitelib}/Bcfg2/manage.py* +%{python_sitelib}/Bcfg2/settings.py* %{python_sitelib}/Bcfg2/Server %{python_sitelib}/Bcfg2/Reporting %exclude %{python_sitelib}/Bcfg2/Server/CherryPyCore.py diff --git a/redhat/bcfg2.spec.in b/redhat/bcfg2.spec.in index 02e86d2e7..4a100e0c7 100644 --- a/redhat/bcfg2.spec.in +++ b/redhat/bcfg2.spec.in @@ -201,7 +201,12 @@ fi %{python_sitelib}/Bcfg2*.egg-info %dir %{python_sitelib}/Bcfg2 -%{python_sitelib}/Bcfg2/*.py* +%{python_sitelib}/Bcfg2/Compat.py* +%{python_sitelib}/Bcfg2/__init__.py* +%{python_sitelib}/Bcfg2/Logger.py* +%{python_sitelib}/Bcfg2/Options.py* +%{python_sitelib}/Bcfg2/Proxy.py* +%{python_sitelib}/Bcfg2/version.py* %{python_sitelib}/Bcfg2/Client %{python_sitelib}/Bcfg2/Component.* %{python_sitelib}/Bcfg2/Logger.* @@ -225,6 +230,13 @@ fi %{_initrddir}/bcfg2-server +%dir %{python_sitelib}/Bcfg2 +%{python_sitelib}/Bcfg2/Cache.py* +%{python_sitelib}/Bcfg2/Encryption.py* +%{python_sitelib}/Bcfg2/SSLServer.py* +%{python_sitelib}/Bcfg2/Statistics.py* +%{python_sitelib}/Bcfg2/manage.py* +%{python_sitelib}/Bcfg2/settings.py* %{python_sitelib}/Bcfg2/Server %{_datadir}/bcfg2 -- cgit v1.2.3-1-g7c22