--- rpms/smeserver-vacation/contribs7/smeserver-vacation.spec	2008/03/14 09:42:44	1.7
+++ rpms/smeserver-vacation/contribs7/smeserver-vacation.spec	2008/06/27 20:05:31	1.15
@@ -1,6 +1,10 @@
+# $Id: smeserver-vacation.spec,v 1.14 2008/05/05 19:30:44 snetram Exp $
+# Authority: dungog
+# Name: Stephen Noble
+
 %define name smeserver-vacation
 %define version 1.0
-%define release 20
+%define release 25
 Summary: SME Server enhancement to enable vacation messages for users.
 Name: %{name}
 Version: %{version}
@@ -13,11 +17,14 @@ Patch0: smeserver-vacation-1.0-frMenuSpl
 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-10
+Requires: e-smith-formmagick >= 1.4.0-12
 BuildRequires: e-smith-devtools >= 1.13.1-03
 AutoReqProv: no
 
@@ -27,6 +34,21 @@ Optionally provides a user-manager panel
 enable vacation for themselves and to modify their own message
 
 %changelog
+* Mon May 5 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.0-25
+- Apply 5 May 2008 locale patch
+
+* 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
 
@@ -158,6 +180,10 @@ enable vacation for themselves and to mo
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 perl createlinks