--- rpms/smeserver-password/contribs9/smeserver-password.spec	2014/06/10 00:33:39	1.1
+++ rpms/smeserver-password/contribs9/smeserver-password.spec	2015/02/11 08:28:30	1.3
@@ -4,7 +4,7 @@
 
 %define name smeserver-password
 %define version 1.2.0
-%define release 2
+%define release 7
 
 Summary: SME Server password panel
 Name: %{name}
@@ -14,6 +14,8 @@ License: GNU GPL version 2
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
 Patch0: smeserver-password-1.0.0-locale-2014-06-08.patch
+Patch1: smeserver-password-1.2.0-fix-password-aging.patch
+Patch2: smeserver-password-1.2.0-fix_expire_field.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools
@@ -23,6 +25,13 @@ Requires: e-smith-formmagick >= 1.4.0-12
 Smeserver addon panel to change password strength and password ageing
 
 %changelog
+* Tue Feb 10 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 1.2.0-7
+- Fix the expire field error [SME: 8823]
+- code done by Stefano Zamboni <zamboni@mind-at-work.it>
+
+* Fri Feb 06 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 1.2.0-6
+- fix password aging [SME: 8823]
+
 * Sun Jun 08 2014 stephane de Labrusse <stephdl@de-labrusse.fr> 1.2.0-2
 - Initial release to contribs9
 - Added locale smeserver-password-1.0.0-locale-2014-06-08.patch
@@ -139,7 +148,8 @@ Smeserver addon panel to change password
 %prep
 %setup
 %patch0 -p1
-
+%patch1 -p1
+%patch2 -p1
 %build
 LEXICONS=$(find root/etc/e-smith/locale/ -type f )