Merge branch 'my-devel'

2 files changed, 12 insertions, 1 deletions

diff --git a/func.spec b/func.spec
index c43da30..cff9bb0 100644
--- a/func.spec
+++ b/func.spec
@@ -54,6 +54,7 @@ rm -fr $RPM_BUILD_ROOT
 %{_bindir}/func
 %{_bindir}/func-inventory
 %{_bindir}/func-create-module
+%{_bindir}/update-func
 /etc/init.d/funcd
 %dir %{_sysconfdir}/%{name}
 %dir %{_sysconfdir}/%{name}/minion-acl.d/
@@ -102,6 +103,10 @@ else
         ln -sf /etc/init.d/funcd /etc/rc.d/rc${i}.d/S99funcd
    done
 fi
+
+# upgrade old installs if needed
+/usr/bin/update-func
+
 exit 0
 
 %preun
@@ -117,7 +122,11 @@ if [ "$1" = 0 ] ; then
 fi
 
 
+
 %changelog
+* Mon Mar 03 2008 Adrian Likins <alikins@redhat.com> - 0.18-1
+- run update-func from the %post
+
 * Wed Feb 13 2008 Adrian Likins <alikins@redhat.com> - 0.18-1
 - split off certmaster
 
diff --git a/setup.py b/setup.py
index acba0f2..a36f348 100644
--- a/setup.py
+++ b/setup.py
@@ -30,9 +30,11 @@ if __name__ == "__main__":
                 url = "https://hosted.fedoraproject.org/projects/func/",
                 license = "GPL",
 		scripts = [
-                     "scripts/funcd", "scripts/func", 
+                     "scripts/funcd",
+		     "scripts/func", 
                      "scripts/func-inventory",
                      "scripts/func-create-module",
+		     "scripts/update-func",
                 ],
 		# package_data = { '' : ['*.*'] },
                 package_dir = {"%s" % NAME: "%s" % NAME