Disable update script after having some problems on mdehaan's F8 box

2 files changed, 3 insertions, 6 deletions

diff --git a/func.spec b/func.spec
index 855109b..e8f6d23 100644
--- a/func.spec
+++ b/func.spec
@@ -54,7 +54,7 @@ rm -fr $RPM_BUILD_ROOT
 %{_bindir}/func
 %{_bindir}/func-inventory
 %{_bindir}/func-create-module
-%{_bindir}/update-func
+#%{_bindir}/update-func
 /etc/init.d/funcd
 %dir %{_sysconfdir}/%{name}
 %dir %{_sysconfdir}/%{name}/minion-acl.d/
@@ -104,7 +104,7 @@ else
 fi
 
 # upgrade old installs if needed
-/usr/bin/update-func
+#/usr/bin/update-func
 
 exit 0
 
@@ -124,9 +124,6 @@ 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
 
 * Fri Feb 8 2008 Michael DeHaan <mdehaan@redhat.com> - 0.17-1
diff --git a/setup.py b/setup.py
index 1200c29..6ebd2df 100644
--- a/setup.py
+++ b/setup.py
@@ -33,7 +33,7 @@ if __name__ == "__main__":
 		     "scripts/func", 
                      "scripts/func-inventory",
                      "scripts/func-create-module",
-		     "scripts/update-func",
+		     # "scripts/update-func",
                 ],
 		# package_data = { '' : ['*.*'] },
                 package_dir = {"%s" % NAME: "%s" % NAME