--- rpms/smeserver-password/contribs7/smeserver-password.spec	2008/04/22 15:48:14	1.2
+++ rpms/smeserver-password/contribs7/smeserver-password.spec	2008/05/30 19:24:18	1.9
@@ -1,10 +1,10 @@
-# $Id: smeserver-password.spec,v 1.1 2008/04/21 17:25:59 slords Exp $
+# $Id: smeserver-password.spec,v 1.8 2008/05/30 19:23:56 snetram Exp $
 # Authority: dungog
 # Name: Stephen Noble
 
 %define name smeserver-password
 %define version 1.0.0
-%define release 9
+%define release 15
 
 Summary: SME Server password panel
 Name: %{name}
@@ -17,15 +17,41 @@ Patch0: smeserver-password-1.0.0-locale-
 Patch1: smeserver-password-1.0.0-locale-2008-04-01.patch
 Patch2: smeserver-password-1.0.0-initdb.patch
 Patch3: smeserver-password-1.0.0-locale-2008-04-22.patch
+Patch4: smeserver-password-1.0.0-add2general.patch
+Patch5: smeserver-password-1.0.0-locale-2008-05-07.patch
+Patch6: smeserver-password-1.0.0-locale-2008-05-21.patch
+Patch7: smeserver-password-1.0.0-Acctinfo.patch
+Patch8: smeserver-password-1.0.0-locale-2008-05-30.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools
-Requires: e-smith-formmagick >= 1.4.0-10
+Requires: e-smith-formmagick >= 1.4.0-12
 
 %description
 Smeserver addon panel to change password strength and password ageing
 
 %changelog
+* Fri May 30 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.0.0-15
+- Apply 30 May 2008 locale patch
+
+* Sat May 24 2008 Stephen Noble <support@dungog.net> - 1.0.0-14
+- rewrite user-passwd-expiration [SME 4361]
+
+* Thu May 21 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.0.0-13
+- Apply 21 May 2008 locale patch
+- Fixing changelog version entries
+
+* Mon May 7 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.0.0-12
+- Apply 7 May 2008 locale patch
+- Removed missing patch of 5 May 2008, seems not committed and is 
+  superseeded by the one from 7 May 2008
+
+* Mon May 5 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.0.0-11
+- Apply 5 May 2008 locale patch
+
+* Sat Apr 26 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.0.0-10
+- Add common <base> tags to e-smith-formmagick's general
+
 * Tue Apr 22 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.0.0-9
 - Added 22 April 2008 locale patch
 - Moved db defaults out of spec file
@@ -68,6 +94,11 @@ Smeserver addon panel to change password
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
 
 %build
 LEXICONS=$(find root/etc/e-smith/locale/ -type f )