[system-config-users/f13/master] version 1.2.100 (cherry picked from commit efba2270319accb87a0fc0cb8673f96e4c4e80ef)

[Nils Philippsen]

commit 6708c6cfbfc209194b2c496970262e0fe32db7a1
Author: Nils Philippsen <nphilipp at fedoraproject.org>
Date:   Wed Jun 30 09:45:14 2010 +0000

    version 1.2.100
    (cherry picked from commit efba2270319accb87a0fc0cb8673f96e4c4e80ef)

 .gitignore               |    2 +-
 sources                  |    2 +-
 system-config-users.spec |   17 ++++++++++++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 49cc6e7..83df3d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-system-config-users-1.2.99.tar.bz2
+system-config-users-1.2.100.tar.bz2
diff --git a/sources b/sources
index b8a54b6..4c54203 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-58c030afafefe1a5d2e20f5b0407b501  system-config-users-1.2.99.tar.bz2
+9bfadd65273dd3dd43bf2695d953ac8d  system-config-users-1.2.100.tar.bz2
diff --git a/system-config-users.spec b/system-config-users.spec
index f7fc192..1e3b8ae 100644
--- a/system-config-users.spec
+++ b/system-config-users.spec
@@ -26,9 +26,16 @@
 %bcond_with console_util
 %endif
 
+# Enterprise versions pull in docs automatically
+%if 0%{?rhel} > 0
+%bcond_without require_docs
+%else
+%bcond_with require_docs
+%endif
+
 Summary: A graphical interface for administering users and groups
 Name: system-config-users
-Version: 1.2.99
+Version: 1.2.100
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -45,6 +52,9 @@ BuildRequires: findutils
 # package system-config-users-docs. The following ensures that updating from
 # earlier versions gives you both the main package and documentation.
 Obsoletes: system-config-users < 1.2.82
+%if %{with require_docs}
+Requires: system-config-users-docs
+%endif
 %if %{with libuser_python}
 Requires: libuser-python >= 0.56
 %else
@@ -112,6 +122,11 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/sysconfig/system-config-users
 
 %changelog
+* Wed Jun 30 2010 Nils Philippsen <nils at redhat.com> - 1.2.100-1
+- check if homedirs of new users can be created
+- prevent unlocking users with empty passwords
+- require docs in enterprise builds
+
 * Fri Jun 11 2010 Nils Philippsen <nils at redhat.com> - 1.2.99-1
 - fix exception handling on user removal (#602192)