rpms/func/F-8 .cvsignore, 1.5, 1.6 func.spec, 1.4, 1.5 sources, 1.5, 1.6 version, 1.4, 1.5
Michael DeHaan (mdehaan)
fedora-extras-commits at redhat.com
Fri Mar 7 20:20:21 UTC 2008
- Previous message (by thread): rpms/func/F-7 .cvsignore, 1.5, 1.6 func.spec, 1.4, 1.5 sources, 1.5, 1.6 version, 1.4, 1.5
- Next message (by thread): rpms/func/devel .cvsignore, 1.5, 1.6 func.spec, 1.6, 1.7 sources, 1.6, 1.7 version, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mdehaan
Update of /cvs/pkgs/rpms/func/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4535/F-8
Modified Files:
.cvsignore func.spec sources version
Log Message:
This is 0.18
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/func/F-8/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 8 Feb 2008 20:26:47 -0000 1.5
+++ .cvsignore 7 Mar 2008 20:19:41 -0000 1.6
@@ -2,3 +2,4 @@
func-0.14.tar.gz
func-0.16.tar.gz
func-0.17.tar.gz
+func-0.18.tar.gz
Index: func.spec
===================================================================
RCS file: /cvs/pkgs/rpms/func/F-8/func.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- func.spec 8 Feb 2008 20:26:47 -0000 1.4
+++ func.spec 7 Mar 2008 20:19:41 -0000 1.5
@@ -3,7 +3,7 @@
%define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0)
-Summary: Remote config, monitoring, and management api
+Summary: Remote management framework
Name: func
Source1: version
Version: %(echo `awk '{ print $1 }' %{SOURCE1}`)
@@ -13,6 +13,7 @@
Group: Applications/System
Requires: python >= 2.3
Requires: pyOpenSSL
+Requires: certmaster >= 0.1
BuildRequires: python-devel
%if %is_suse
BuildRequires: gettext-devel
@@ -29,7 +30,7 @@
%description
-func is a remote api for mangement, configation, and monitoring of systems.
+func is a remote api for mangement, configuration, and monitoring of systems.
%prep
%setup -q
@@ -51,18 +52,14 @@
%endif
%{_bindir}/funcd
%{_bindir}/func
-%{_bindir}/certmaster
-%{_bindir}/certmaster-ca
%{_bindir}/func-inventory
%{_bindir}/func-create-module
+#%{_bindir}/update-func
/etc/init.d/funcd
-/etc/init.d/certmaster
%dir %{_sysconfdir}/%{name}
%dir %{_sysconfdir}/%{name}/minion-acl.d/
-%dir %{_sysconfdir}/pki/%{name}
%dir /etc/func/modules/
%config(noreplace) /etc/func/minion.conf
-%config(noreplace) /etc/func/certmaster.conf
%config(noreplace) /etc/logrotate.d/func_rotate
%dir %{python_sitelib}/func
%dir %{python_sitelib}/func/minion
@@ -83,55 +80,52 @@
%dir /var/log/func
%dir /var/lib/func
-%dir /var/lib/func/certmaster
%doc AUTHORS README LICENSE
%{_mandir}/man1/func.1.gz
%{_mandir}/man1/func-inventory.1.gz
%{_mandir}/man1/funcd.1.gz
-%{_mandir}/man1/certmaster.1.gz
-%{_mandir}/man1/certmaster-ca.1.gz
%post
# for suse
if [ -x /usr/lib/lsb/install_initd ]; then
/usr/lib/lsb/install_initd /etc/init.d/funcd
- /usr/lib/lsb/install_initd /etc/init.d/certmaster
# for red hat distros
elif [ -x /sbin/chkconfig ]; then
/sbin/chkconfig --add funcd
- /sbin/chkconfig --add certmaster
# or, the old fashioned way
else
for i in 2 3 4 5; do
ln -sf /etc/init.d/funcd /etc/rc.d/rc${i}.d/S99funcd
- ln -sf /etc/init.d/certmaster /etc/rc.d/rc${i}.d/S99certmaster
done
for i in 1 6; do
ln -sf /etc/init.d/funcd /etc/rc.d/rc${i}.d/S99funcd
- ln -sf /etc/init.d/certmaster /etc/rc.d/rc${i}.d/S99certmaster
done
fi
+
+# upgrade old installs if needed
+#/usr/bin/update-func
+
exit 0
%preun
if [ "$1" = 0 ] ; then
/etc/init.d/funcd stop > /dev/null 2>&1
- /etc/init.d/certmaster stop > /dev/null 2>&1
if [ -x /usr/lib/lsb/remove_initd ]; then
/usr/lib/lsb/remove_initd /etc/init.d/funcd
- /usr/lib/lsb/remove_initd /etc/init.d/certmaster
elif [ -x /sbin/chkconfig ]; then
/sbin/chkconfig --del funcd
- /sbin/chkconfig --del certmaster
else
rm -f /etc/rc.d/rc?.d/???funcd
- rm -f /etc/rc.d/rc?.d/???certmaster
fi
fi
+
%changelog
+* Mon Mar 03 2008 Adrian Likins <alikins at redhat.com> - 0.18-1
+- split off certmaster
+
* Fri Feb 8 2008 Michael DeHaan <mdehaan at redhat.com> - 0.17-1
- bugfix release
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/func/F-8/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 8 Feb 2008 20:26:47 -0000 1.5
+++ sources 7 Mar 2008 20:19:41 -0000 1.6
@@ -1,2 +1,3 @@
8e49dac6869cb562425b22d642e4e3a9 func-0.16.tar.gz
991a8babcda1a1adf72b06ec077a05f3 func-0.17.tar.gz
+def199858286218daef908e871f2e7ca func-0.18.tar.gz
Index: version
===================================================================
RCS file: /cvs/pkgs/rpms/func/F-8/version,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- version 8 Feb 2008 20:26:47 -0000 1.4
+++ version 7 Mar 2008 20:19:41 -0000 1.5
@@ -1 +1 @@
-0.17 1
+0.18 1
- Previous message (by thread): rpms/func/F-7 .cvsignore, 1.5, 1.6 func.spec, 1.4, 1.5 sources, 1.5, 1.6 version, 1.4, 1.5
- Next message (by thread): rpms/func/devel .cvsignore, 1.5, 1.6 func.spec, 1.6, 1.7 sources, 1.6, 1.7 version, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list