diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-02-20 10:38:38 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-02-20 10:38:38 -0500 |
| commit | 69ebf49d54aac70a42142d0d04e562496bce58ea (patch) | |
| tree | ad0f346ff95a14ad49440128ff76d7e2b3f0816a /redhat | |
| parent | 602ba6af6bd1c9b3910940dee766660ab8e81a19 (diff) | |
| parent | e17e41dcff096ead7e129a0db063f75de44aaa2b (diff) | |
| download | bcfg2-69ebf49d54aac70a42142d0d04e562496bce58ea.tar.gz bcfg2-69ebf49d54aac70a42142d0d04e562496bce58ea.tar.bz2 bcfg2-69ebf49d54aac70a42142d0d04e562496bce58ea.zip | |
Merge branch 'master' into 1.4.x
Conflicts:
doc/appendix/contributors.txt
schemas/bundle.xsd
src/lib/Bcfg2/Client/Tools/__init__.py
src/lib/Bcfg2/Server/Encryption.py
src/lib/Bcfg2/Server/Lint/Genshi.py
src/lib/Bcfg2/Server/Plugins/Bundler.py
src/lib/Bcfg2/Server/Plugins/Decisions.py
src/lib/Bcfg2/Server/Plugins/TemplateHelper.py
src/sbin/bcfg2-test
testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/Test__init.py
testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIXUsers.py
testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py
testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProperties.py
tools/bcfg2-profile-templates.py
Diffstat (limited to 'redhat')
| -rw-r--r-- | redhat/RELEASE | 2 | ||||
| -rw-r--r-- | redhat/bcfg2.spec.in | 19 |
2 files changed, 18 insertions, 3 deletions
diff --git a/redhat/RELEASE b/redhat/RELEASE index 888c3a4b3..c39908ef3 100644 --- a/redhat/RELEASE +++ b/redhat/RELEASE @@ -1 +1 @@ -0.0rc1 +0.0rc2 diff --git a/redhat/bcfg2.spec.in b/redhat/bcfg2.spec.in index 57c6221e6..871f3e86a 100644 --- a/redhat/bcfg2.spec.in +++ b/redhat/bcfg2.spec.in @@ -189,7 +189,7 @@ fi %files %defattr(-,root,root,-) -%doc AUTHORS examples COPYRIGHT README +%doc examples LICENSE COPYRIGHT README %ghost %attr(600,root,root) %config(noreplace) %{_sysconfdir}/bcfg2.conf @@ -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 %{_sbindir}/bcfg2 @@ -219,6 +224,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 @@ -244,6 +256,9 @@ fi %doc %{_defaultdocdir}/bcfg2-doc-%{version} %changelog +* Tue Jan 29 2013 Sol Jerome <sol.jerome@gmail.com> 1.3.0-0.0rc2 +- New upstream release + * Wed Jan 09 2013 Sol Jerome <sol.jerome@gmail.com> 1.3.0-0.0rc1 - New upstream release |