diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2015-09-24 22:34:08 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2015-09-24 22:34:08 -0500 |
| commit | e0da9e328593198de6f9b02df79db0c66c42a2c0 (patch) | |
| tree | 0ca4beba9f73ffb773ff3b83efde59a300fb81a7 | |
| parent | ba0996d232146b0e4aff89c2ac29d5d53e8633f9 (diff) | |
| parent | 815259a57104f23d98f705b7c82c7581adc2ff7e (diff) | |
| download | bcfg2-e0da9e328593198de6f9b02df79db0c66c42a2c0.tar.gz bcfg2-e0da9e328593198de6f9b02df79db0c66c42a2c0.tar.bz2 bcfg2-e0da9e328593198de6f9b02df79db0c66c42a2c0.zip | |
Merge branch 'master' of https://github.com/gordonmessmer/bcfg2
| -rw-r--r-- | misc/bcfg2.spec | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index 357afed4e..4b6da2441 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -18,11 +18,11 @@ # characters from the appropriate line below. # # Don't forget to change the Release: tag below to something like 0.1 -#%%global _rc 1 -%global _pre pre1 +#%%global _rc rc1 +#%%global _pre pre1 %global _nightly 1 %global _date %(date +%Y%m%d) -%global _pre_rc %{?_pre:pre%{_pre}}%{?_rc:rc%{_rc}} +%global _pre_rc %{?_pre:%{_pre}}%{?_rc:%{_rc}} # cherrypy 3.3 actually doesn't exist yet, but 3.2 has bugs that # prevent it from working: @@ -56,6 +56,8 @@ BuildRequires: python BuildRequires: python-devel BuildRequires: python-lxml BuildRequires: python-boto +BuildRequires: python-argparse +BuildRequires: python-jinja2 %if 0%{?suse_version} BuildRequires: python-M2Crypto BuildRequires: python-Genshi @@ -137,6 +139,8 @@ BuildRequires: systemd-units Requires: python-ssl %endif Requires: libselinux-python +Requires: pylibacl +Requires: python-argparse %if 0%{?fedora} >= 16 Requires(post): systemd-units @@ -192,6 +196,7 @@ Group: System Environment/Daemons %endif Requires: bcfg2 = %{version}-%{release} Requires: python-lxml >= 1.2.1 +Requires: python-genshi %if 0%{?suse_version} Requires: python-pyinotify Requires: python-python-daemon @@ -714,7 +719,9 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ %{python_sitelib}/Bcfg2/Server %{python_sitelib}/Bcfg2/Reporting %{python_sitelib}/Bcfg2/manage.py* +%if %{build_cherry_py} %exclude %{python_sitelib}/Bcfg2/Server/CherryPyCore.py* +%endif %dir %{_datadir}/bcfg2 %{_datadir}/bcfg2/schemas |