--- rpms/e-smith-base/sme8/e-smith-base.spec 2011/03/13 10:03:36 1.127 +++ rpms/e-smith-base/sme8/e-smith-base.spec 2011/03/14 10:22:00 1.128 @@ -1,4 +1,4 @@ -# $Id: e-smith-base.spec,v 1.126 2011/03/02 20:08:24 snetram Exp $ +# $Id: e-smith-base.spec,v 1.127 2011/03/13 10:03:36 snetram Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base @@ -55,7 +55,6 @@ Patch42: e-smith-base-5.2.0-fix-gid.patc Patch43: e-smith-base-5.2.0-weak-updates.patch Patch44: e-smith-base-5.2.0-apache_alias_for_www.patch Patch45: e-smith-base-5.2.0-no-nic2.patch -Patch46: e-smith-base-5.2.0-allow-admin-pwd-change.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: mod_auth_external Requires: e-smith-lib >= 2.2.0-2 @@ -103,6 +102,9 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Sun Mar 13 2011 Jonathan Martens 5.2.0-58.sme +- Revert admin password change through user-manager [SME: 3759] + * Sun Mar 13 2011 Jonathan Martens 5.2.0-57.sme - Allow admin password change through user-manager [SME: 3759] @@ -1543,7 +1545,6 @@ e-smith server and gateway software - ba %patch43 -p1 %patch44 -p1 %patch45 -p1 -%patch46 -p1 %pre if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]