diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2013-11-04 10:26:32 -0600 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2013-11-04 10:26:32 -0600 |
| commit | c2a164eb809c5d540495ae8bb2734cfa45643f33 (patch) | |
| tree | 2aa00730650aceee77186b05ad113baf3aaa9775 /misc | |
| parent | 84986b353b34bace90172cdef5636530e825dad4 (diff) | |
| parent | 0ceb2e76488a3fa4dbbc8cbb537e0366e0f665b2 (diff) | |
| download | bcfg2-c2a164eb809c5d540495ae8bb2734cfa45643f33.tar.gz bcfg2-c2a164eb809c5d540495ae8bb2734cfa45643f33.tar.bz2 bcfg2-c2a164eb809c5d540495ae8bb2734cfa45643f33.zip | |
Merge branch 'maint'
Conflicts:
doc/server/admin/index.txt
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/bcfg2.spec | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index fc997ebc0..788ec1cf3 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -72,7 +72,6 @@ BuildRequires: python-nose BuildRequires: mock BuildRequires: m2crypto BuildRequires: Django -BuildRequires: PyYAML BuildRequires: python-genshi BuildRequires: python-cheetah BuildRequires: pylibacl @@ -113,11 +112,9 @@ BuildRequires: systemd-units %endif Requires: python-lxml -Requires: m2crypto %if 0%{?rhel} && 0%{?rhel} < 6 Requires: python-ssl %endif -Requires: pylibacl Requires: libselinux-python %if 0%{?fedora} >= 16 @@ -183,11 +180,8 @@ Requires: python-daemon %endif Requires: /usr/sbin/sendmail Requires: /usr/bin/openssl -Requires: python-genshi -Requires: python-cheetah Requires: graphviz Requires: python-nose -Requires: PyYAML %if %{_vendor} == redhat %if 0%{?fedora} >= 16 |