summaryrefslogtreecommitdiffstats
path: root/func.spec
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2008-07-11 16:35:58 -0400
committerMichael DeHaan <mdehaan@redhat.com>2008-07-11 16:35:58 -0400
commited30c66bfc08e95c959f4dc9b14b09d4a1ae07de (patch)
tree34eb3f86fb4295bb45543b5a6d52d6bca50e3aa1 /func.spec
parent287bf22c59f714c6925377a3a44f59a8906c2e50 (diff)
parent035a69e6bc140e7079ac1c4ca90679b577ad1b56 (diff)
downloadfunc-ed30c66bfc08e95c959f4dc9b14b09d4a1ae07de.tar.gz
func-ed30c66bfc08e95c959f4dc9b14b09d4a1ae07de.tar.xz
func-ed30c66bfc08e95c959f4dc9b14b09d4a1ae07de.zip
Merge branch 'ssalevan_delegation'
Conflicts: func.spec func/minion/modules/certmastermod.py setup.py
Diffstat (limited to 'func.spec')
-rw-r--r--func.spec6
1 files changed, 6 insertions, 0 deletions
diff --git a/func.spec b/func.spec
index b4b1410..bf6d3df 100644
--- a/func.spec
+++ b/func.spec
@@ -13,6 +13,7 @@ License: GPLv2+
Group: Applications/System
Requires: python >= 2.3
Requires: pyOpenSSL
+Requires: pyYaml
Requires: certmaster >= 0.1
BuildRequires: python-devel
%if %is_suse
@@ -55,6 +56,7 @@ rm -fr $RPM_BUILD_ROOT
%{_bindir}/func-inventory
%{_bindir}/func-create-module
%{_bindir}/func-transmit
+%{_bindir}/func-build-map
#%{_bindir}/update-func
/etc/init.d/funcd
%dir %{_sysconfdir}/%{name}
@@ -128,6 +130,9 @@ fi
%changelog
+* Fri Jul 11 2008 Michael DeHaan <mdehaan@redhat.com> - 0.23-1
+- (for ssalevan) adding in mapping/delegation tools
+
* Mon Jul 07 2008 Michael DeHaan <mdehaan@redhat.com> - 0.22-1
- packaged func-transmit script
@@ -141,6 +146,7 @@ fi
- fix fedora bug #441283 - typo in postinstall scriptlet
(the init.d symlinks for runlevels 1 and 6 were created wrong)
+
* Mon Mar 03 2008 Adrian Likins <alikins@redhat.com> - 0.18-1
- split off certmaster