rpms/func/EL-5 .cvsignore, 1.3, 1.4 func.spec, 1.2, 1.3 sources, 1.3, 1.4

[Michael DeHaan (mdehaan)]

Author: mdehaan

Update of /cvs/pkgs/rpms/func/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4894/EL-5

Modified Files:
	.cvsignore func.spec sources 
Log Message:
0.16




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/func/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Dec 2007 19:27:11 -0000	1.3
+++ .cvsignore	6 Feb 2008 18:30:34 -0000	1.4
@@ -1,2 +1,3 @@
 func-0.13.tar.gz
 func-0.14.tar.gz
+func-0.16.tar.gz


Index: func.spec
===================================================================
RCS file: /cvs/pkgs/rpms/func/EL-5/func.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- func.spec	11 Dec 2007 19:27:11 -0000	1.2
+++ func.spec	6 Feb 2008 18:30:34 -0000	1.3
@@ -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,11 +14,15 @@
 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/
@@ -33,18 +39,22 @@
 
 %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
 
 %files
 %defattr(-, root, root, -)
+%if 0%{?fedora} > 8
+%{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}
@@ -61,10 +71,19 @@
 %{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
@@ -74,58 +93,70 @@
 
 
 %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 <mdehaan at redhat.com> - 0.0.14-1
-- new release to mirrors
-
-* Fri Oct 26 2007 Michael DeHaan <mdehaan at redhat.com> - 0.0.13-3
-- Misc fixes per Fedora package-review
+* Mon Feb 4 2008 Michael DeHaan <mdehaan at redhat.com> - 0.16-1
+- bump version for release
+- fixing versions in previous changelogs
 
-* Wed Oct 24 2007 Michael DeHaan <mdehaan at redhat.com> - 0.0.13-2
-- packaged func-inventory and associated manpage
-- release bump for Fedora submission
-
-* Thu Oct 18 2007 Seth Vidal <skvidal at fedoraproject.org> - 0.0.12-1
-- change out minion-acl.conf for minion-acl.d
-
-* Mon Oct 8 2007 Adrian Likins <alikins at redhat.com> - 0.0.12-1
-- add cmd_modules
-
-* Fri Sep 28 2007 Adrian Likins <alikins at redhat.com> - 0.0.12-1
-- remove rhpl deps
+* Mon Feb 4 2008 Adrian Likins <alikins at redhat.com> - 0.15-1
+- catch some deeper minion modules as well
 
-* Fri Sep 28 2007 Michael DeHaan <mdehaan at redhat.com> - 0.0.12-1
-- bump version and get ready for first public release
-- add BuildRequires python-devel
-- add logrotate config
+* Sun Jan 13 2008 Steve 'Ashcrow' Milner <smilner at redhat.como> - 0.14-6
+- Added in func-create-module for scripts.
 
-* Thu Sep 27 2007 Jesus Rodriguez <jesusr at redhat.com> - 0.0.11-7
-- removed unnecessary yum-utils Require
+* Tue Dec 18 2007 Adrian Likins <alikins at redhat.com> - 0.14-5
+- add /var/lib/ dirs to spec file
 
-* Wed Sep 26 2007 Jesus Rodriguez <jesusr at redhat.com> - 0.0.11-5
-- fixed Requires to include pyOpenSSL for use by certmaster
+* Thu Dec 13 2007 Eli Criffield <elicriffield at gmail.com> - 0.14-4
+- changes for suse integration 
 
-* Tue Sep 25 2007 Michael DeHaan <mdehaan at redhat.com> - 0.0.11-4
-- Added manpage documentation 
-- Renamed minion config file
+* Tue Dec 11 2007 Michael DeHaan <mdehaan at redhat.com> - 0.14-2
+- python egg section added for F9 and later
 
-* Tue Sep 25 2007 Robin Norwood <rnorwood at redhat.com> - 0.0.11-3
-- Change server -> minion and client -> overlord
-
-* Thu Sep 20 2007 James Bowes <jbowes at redhat.com> - 0.0.11-2
-- Clean up some speclint warnings
+* Tue Dec 11 2007 Michael DeHaan <mdehaan at redhat.com> - 0.14-1
+- new release to mirrors
 
-* Thu Sep 20 2007 Adrian Likins <alikins at redhat.com> - 0.0.11-1
-- initial release (this one goes to .11)
+* Fri Oct 26 2007 Michael DeHaan <mdehaan at redhat.com> - 0.13-3
+- Misc fixes per Fedora package-review
 
+* Wed Oct 24 2007 Michael DeHaan <mdehaan at redhat.com> - 0.13-2
+- packaged func-inventory and associated manpage
+- release bump for Fedora submission


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/func/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Dec 2007 19:27:11 -0000	1.3
+++ sources	6 Feb 2008 18:30:34 -0000	1.4
@@ -1 +1 @@
-c8b5c9ba356311132adb12cc2f6bc48e  func-0.14.tar.gz
+8e49dac6869cb562425b22d642e4e3a9  func-0.16.tar.gz