--- rpms/smeserver-password/contribs7/smeserver-password.spec	2008/04/21 17:25:59	1.1
+++ rpms/smeserver-password/contribs7/smeserver-password.spec	2008/09/28 02:58:38	1.11
@@ -1,10 +1,10 @@
-# $Id: smeserver-password-1.0.0.spec,v 1.6 2008/04/02 15:03:58 slords Exp $
+# $Id: smeserver-password.spec,v 1.10 2008/07/01 20:07:15 snetram Exp $
 # Authority: dungog
 # Name: Stephen Noble
 
 %define name smeserver-password
 %define version 1.0.0
-%define release 8
+%define release 17
 
 Summary: SME Server password panel
 Name: %{name}
@@ -15,15 +15,55 @@ Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
 Patch0: smeserver-password-1.0.0-locale-2008-03-11.patch
 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
+Patch9: smeserver-password-1.0.0-locale-2008-07-01.patch
+Patch10: smeserver-password-1.0.0-locale-2008-09-27.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
+* Sun Sep 28 2008 Stephen Noble <support@dungog.net> - 1.0.0-17
+- Apply locale patch
+
+* Tue Jul 1 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.0.0-16
+- Apply 1 July 2008 locale patch
+
+* 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
+
 * Tue Apr 1 2008 Shad L. Lords <slords@mail.com> 1.0.0-8
 - Update to UTF-8 translations
 
@@ -60,6 +100,15 @@ Smeserver addon panel to change password
 %setup
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
 
 %build
 LEXICONS=$(find root/etc/e-smith/locale/ -type f )
@@ -70,12 +119,7 @@ do
 done
 
 perl createlinks
-DEFAULTS=root/etc/e-smith/db/configuration/defaults/passwordaging
-mkdir -p $DEFAULTS
-echo "configuration" > $DEFAULTS/type
-echo "no" > $DEFAULTS/Active
-echo "180" > $DEFAULTS/PwdAge
-echo "7"   > $DEFAULTS/PwdWarn
+
 %install
 rm -rf $RPM_BUILD_ROOT
 (cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)