Merge branch 'master' of github.com:webmin/usermin

README

@@ -1,4 +1,4 @@
-Usermin Version 2.000
+Usermin Version 2.001
 ---------------------
 To setup usermin, simply run the  setup.sh  shell script, which should be
 found in the same directory as this README file. This will setup Usermin

makedist.pl

@@ -40,9 +40,9 @@
 	  "javascript-lib.pl", "usermin-pam-osx",
 	  "config-lib.pl", "entities_map.txt",
 	  "password_form.cgi", "password_change.cgi", "ui-lib.pl",
-	  "pam_login.cgi", "WebminUI", "uptracker.cgi", "webmin_search.cgi",
+	  "pam_login.cgi", "uptracker.cgi", "webmin_search.cgi",
 	  "webmin-search-lib.pl", "WebminCore.pm", "robots.txt", "html-editor-lib.pl" );
-@mlist = ("cshrc", "file", "forward", "language", "mailbox",
+@mlist = ("cshrc", "forward", "language", "mailbox",
 	  "plan", "ssh", "telnet", "theme", "gnupg", "proc", "cron",
 	  "changepass", "shell", "at", "fetchmail", "quota", "mysql",
 	  "procmail", "chfn", "htaccess", "commands", "man", "usermount",

makerpm.pl

@@ -69,7 +69,6 @@
 print SPEC <<EOF;
 %global __perl_provides %{nil}
 
-#%define BuildRoot /tmp/%{name}-%{version}
 %define __spec_install_post %{nil}
 
 Summary: A web-based user account administration interface

version

@@ -1 +1 @@
-2.000
+2.001