--- rpms/smeserver-vacation/contribs7/smeserver-vacation.spec	2008/03/12 06:49:58	1.4
+++ rpms/smeserver-vacation/contribs7/smeserver-vacation.spec	2008/04/29 00:13:29	1.13
@@ -1,6 +1,10 @@
+# $Id: smeserver-vacation.spec,v 1.12 2008/04/28 23:21:45 slords Exp $
+# Authority: dungog
+# Name: Stephen Noble
+
 %define name smeserver-vacation
 %define version 1.0
-%define release 17
+%define release 24
 Summary: SME Server enhancement to enable vacation messages for users.
 Name: %{name}
 Version: %{version}
@@ -12,10 +16,15 @@ Source: %{name}-%{version}.tar.gz
 Patch0: smeserver-vacation-1.0-frMenuSplit.patch
 Patch1: smeserver-vacation-1.0-pootle.patch
 Patch2: smeserver-vacation-1.0-locale-2008-03-11.patch
-
+Patch3: smeserver-vacation-1.0-locale-2008-03-14.patch
+Patch4: smeserver-vacation-1.0-locale-2008-04-01.patch
+Patch5: smeserver-vacation-1.0-locale-2008-04-22.patch
+Patch6: smeserver-vacation-1.0-add2general.patch
+Patch7: smeserver-vacation-1.0-dos2unix.patch
 BuildArchitectures: noarch
 BuildRoot: /var/tmp/%{name}-%{version}
 Requires: e-smith-release >= 7.0,
+Requires: e-smith-formmagick >= 1.4.0-12
 BuildRequires: e-smith-devtools >= 1.13.1-03
 AutoReqProv: no
 
@@ -25,16 +34,42 @@ Optionally provides a user-manager panel
 enable vacation for themselves and to modify their own message
 
 %changelog
+* Mon Apr 28 2008 Shad L. Lords <slords@mail.com> 1.0-24
+- Convert dos line endings to unix
+
+* Sat Apr 26 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.0-23
+- Add common <base> tags to e-smith-formmagick's general
+
+* Tue Apr 22 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.0-22
+- Apply 22 April 2008 locale patch
+
+* Tue Apr 1 2008 Shad L. Lords <slords@mail.com> 1.0-21
+- Update to UTF-8 translations
+
+* Fri Mar 14 2008 Stephen Noble <support@dungog.net> - 1.0-20
+- update locale 2008-03-14, removed -13
+
+* Fri Mar 14 2008 Stephen Noble <support@dungog.net> - 1.0-19
+- update locale 2008-03-13
+
+* Wed Mar 12 2008 Shad L. Lords <slords@mail.com> - 1.0-18
+- Add requires for e-smith-formmagick for UTF-8 support [SME: 3858]
+
 * Tue Mar 11 2008 Stephen Noble <support@dungog.net> - 1.0-17
 - remove dud es patch
+
 * Tue Mar 11 2008 Stephen Noble <support@dungog.net> - 1.0-16
 - update locale 2008-03-11
+
 * Sat Mar 07 2008 Stephen Noble <support@dungog.net> - 1.0-15
 - prepare en lexicons for pootle translations
+
 * Wed Dec 26 2007 Stephen Noble <support@dungog.net> 1.0-14
 - fix spanish translation
+
 * Mon Oct 29 2007 Stephen Noble <support@dungog.net> 1.0-13
 - add spanish translation, thanks Normando Hall [SME 3503]
+
 * Thu Jun 14 2007 Stephen Noble <support@dungog.net>
 - apply updates up to -11
 
@@ -141,6 +176,11 @@ enable vacation for themselves and to mo
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 perl createlinks