From 9089cc308fb888e55dcac5b74a0f8564fb370191 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Feb 06 2008 18:06:04 +0000 Subject: 0.16 --- diff --git a/.cvsignore b/.cvsignore index 183539e..e16337d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ func-0.13.tar.gz func-0.14.tar.gz +func-0.16.tar.gz diff --git a/func.spec b/func.spec index bad920b..4b72265 100644 --- a/func.spec +++ b/func.spec @@ -1,6 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0) + Summary: Remote config, monitoring, and management api Name: func Source1: version @@ -12,18 +14,22 @@ Group: Applications/System Requires: python >= 2.3 Requires: pyOpenSSL BuildRequires: python-devel +%if %is_suse +BuildRequires: gettext-devel +%else %if 0%{?fedora} >= 8 BuildRequires: python-setuptools-devel %else BuildRequires: python-setuptools %endif +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildArch: noarch Url: https://hosted.fedoraproject.org/projects/func/ %description -func is a remote api for management, configuration, and monitoring of systems. +func is a remote api for mangement, configation, and monitoring of systems. %prep %setup -q @@ -33,7 +39,7 @@ func is a remote api for management, configuration, and monitoring of systems. %install test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install --root=$RPM_BUILD_ROOT +%{__python} setup.py install --prefix=/usr --root=$RPM_BUILD_ROOT %clean rm -fr $RPM_BUILD_ROOT @@ -41,13 +47,14 @@ rm -fr $RPM_BUILD_ROOT %files %defattr(-, root, root, -) %if 0%{?fedora} > 8 -%{python_sitearch}/func*.egg-info +%{python_sitelib}/func*.egg-info %endif %{_bindir}/funcd %{_bindir}/func %{_bindir}/certmaster %{_bindir}/certmaster-ca %{_bindir}/func-inventory +%{_bindir}/func-create-module /etc/init.d/funcd /etc/init.d/certmaster %dir %{_sysconfdir}/%{name} @@ -64,10 +71,19 @@ rm -fr $RPM_BUILD_ROOT %{python_sitelib}/func/minion/*.py* %{python_sitelib}/func/overlord/*.py* %{python_sitelib}/func/overlord/cmd_modules/*.py* +%{python_sitelib}/func/overlord/modules/*.py* %{python_sitelib}/func/*.py* %dir %{python_sitelib}/func/minion/modules %{python_sitelib}/func/minion/modules/*.py* + +# we need to make the spec and setup.py find modules +# in deep dirs automagically +%{python_sitelib}/func/minion/modules/*/*.py* +%{python_sitelib}/func/minion/modules/*/*/*.py* + %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 @@ -77,61 +93,70 @@ rm -fr $RPM_BUILD_ROOT %post -/sbin/chkconfig --add funcd -/sbin/chkconfig --add certmaster +# 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 exit 0 %preun if [ "$1" = 0 ] ; then - /sbin/service funcd stop > /dev/null 2>&1 - /sbin/chkconfig --del funcd + /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 -* Tue Dec 11 2007 Michael DeHaan - 0.0.14-2 -- python egg section added for F9 and later - -* Tue Dec 11 2007 Michael DeHaan - 0.0.14-1 -- new release to mirrors - -* Fri Oct 26 2007 Michael DeHaan - 0.0.13-3 -- Misc fixes per Fedora package-review +* Mon Feb 4 2008 Michael DeHaan - 0.16-1 +- bump version for release +- fixing versions in previous changelogs -* Wed Oct 24 2007 Michael DeHaan - 0.0.13-2 -- packaged func-inventory and associated manpage -- release bump for Fedora submission - -* Thu Oct 18 2007 Seth Vidal - 0.0.12-1 -- change out minion-acl.conf for minion-acl.d - -* Mon Oct 8 2007 Adrian Likins - 0.0.12-1 -- add cmd_modules - -* Fri Sep 28 2007 Adrian Likins - 0.0.12-1 -- remove rhpl deps - -* Fri Sep 28 2007 Michael DeHaan - 0.0.12-1 -- bump version and get ready for first public release -- add BuildRequires python-devel -- add logrotate config +* Mon Feb 4 2008 Adrian Likins - 0.15-1 +- catch some deeper minion modules as well -* Thu Sep 27 2007 Jesus Rodriguez - 0.0.11-7 -- removed unnecessary yum-utils Require +* Sun Jan 13 2008 Steve 'Ashcrow' Milner - 0.14-6 +- Added in func-create-module for scripts. -* Wed Sep 26 2007 Jesus Rodriguez - 0.0.11-5 -- fixed Requires to include pyOpenSSL for use by certmaster +* Tue Dec 18 2007 Adrian Likins - 0.14-5 +- add /var/lib/ dirs to spec file -* Tue Sep 25 2007 Michael DeHaan - 0.0.11-4 -- Added manpage documentation -- Renamed minion config file +* Thu Dec 13 2007 Eli Criffield - 0.14-4 +- changes for suse integration -* Tue Sep 25 2007 Robin Norwood - 0.0.11-3 -- Change server -> minion and client -> overlord +* Tue Dec 11 2007 Michael DeHaan - 0.14-2 +- python egg section added for F9 and later -* Thu Sep 20 2007 James Bowes - 0.0.11-2 -- Clean up some speclint warnings +* Tue Dec 11 2007 Michael DeHaan - 0.14-1 +- new release to mirrors -* Thu Sep 20 2007 Adrian Likins - 0.0.11-1 -- initial release (this one goes to .11) +* Fri Oct 26 2007 Michael DeHaan - 0.13-3 +- Misc fixes per Fedora package-review +* Wed Oct 24 2007 Michael DeHaan - 0.13-2 +- packaged func-inventory and associated manpage +- release bump for Fedora submission diff --git a/sources b/sources index 65a9c9f..67ab0e8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -03c3a9225c7c7cda2192e088ff1dd499 func-0.14.tar.gz +8e49dac6869cb562425b22d642e4e3a9 func-0.16.tar.gz