diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2013-06-02 14:20:37 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2013-06-02 14:20:37 -0500 |
| commit | 9de1086c937c5f8919cb279e7f601d7de064f901 (patch) | |
| tree | 83362fdb6ee6bfb17bc8aa1477cb5c06f54022ca /misc | |
| parent | fdeba3b8f2cea7ecb2200cab42ce28fd1e1e6a5c (diff) | |
| parent | 521862b6584eb4d68e12df5d1a5c4f7a8ef1bdf5 (diff) | |
| download | bcfg2-9de1086c937c5f8919cb279e7f601d7de064f901.tar.gz bcfg2-9de1086c937c5f8919cb279e7f601d7de064f901.tar.bz2 bcfg2-9de1086c937c5f8919cb279e7f601d7de064f901.zip | |
Merge branch 'maint'
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Conflicts:
doc/installation/distributions.txt
doc/server/snapshots/index.txt
src/lib/Bcfg2/Server/Plugin/helpers.py
src/sbin/bcfg2-server
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/bcfg2-selinux.spec | 2 | ||||
| -rw-r--r-- | misc/bcfg2.spec | 24 |
2 files changed, 24 insertions, 2 deletions
diff --git a/misc/bcfg2-selinux.spec b/misc/bcfg2-selinux.spec index 4c05f4959..9c5262dfd 100644 --- a/misc/bcfg2-selinux.spec +++ b/misc/bcfg2-selinux.spec @@ -3,7 +3,7 @@ %global pythonversion %{py_ver} %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?_initrddir: %global _initrddir %{_sysconfdir}/rc.d/init.d} -%global selinux_policyver %(%{__sed} -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp || echo 0.0.0) +%global selinux_policyver %(%{__sed} -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp 2>/dev/null || echo 0.0.0) %global selinux_types %(%{__awk} '/^#[[:space:]]*SELINUXTYPE=/,/^[^#]/ { if ($3 == "-") printf "%s ", $2 }' /etc/selinux/config 2>/dev/null) %global selinux_variants %([ -z "%{selinux_types}" ] && echo mls strict targeted || echo %{selinux_types}) diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index 5feef1d74..7655752dd 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -100,11 +100,12 @@ Requires: python-ssl %endif Requires: python-lxml >= 1.2.1 %if "%{_vendor}" == "redhat" -Requires: gamin-python %endif %if 0%{?suse_version} +Requires: python-pyinotify Requires: python-python-daemon %else +Requires: python-inotify Requires: python-daemon %endif Requires: /usr/sbin/sendmail @@ -190,6 +191,27 @@ Group: Documentation/HTML %else Group: Documentation %endif +%if 0%{?suse_version} +BuildRequires: python-M2Crypto +BuildRequires: python-Genshi +BuildRequires: python-gamin +BuildRequires: python-pyinotify +BuildRequires: python-python-daemon +BuildRequires: python-CherryPy >= 3 +%else +BuildRequires: m2crypto +BuildRequires: python-genshi +BuildRequires: gamin-python +BuildRequires: python-inotify +BuildRequires: python-daemon +%endif + +%if "%{_vendor}" == "redhat" && 0%{?rhel} < 6 && 0%{?fedora} == 0 +BuildRequires: python-ssl +%else +BuildRequires: python-cherrypy >= 3 +BuildRequires: python-mock +%endif %description doc Bcfg2 helps system administrators produce a consistent, reproducible, |