--- rpms/smeserver-vacation/contribs7/smeserver-vacation.spec	2008/03/12 15:11:45	1.5
+++ rpms/smeserver-vacation/contribs7/smeserver-vacation.spec	2009/03/01 19:31:27	1.25
@@ -1,6 +1,10 @@
+# $Id: smeserver-vacation.spec,v 1.24 2009/01/01 11:44:06 snetram Exp $
+# Authority: dungog
+# Name: Stephen Noble
+
 %define name smeserver-vacation
 %define version 1.0
-%define release 18
+%define release 32
 Summary: SME Server enhancement to enable vacation messages for users.
 Name: %{name}
 Version: %{version}
@@ -12,11 +16,23 @@ 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
+Patch8: smeserver-vacation-1.0-locale-2008-07-01.patch
+Patch9: smeserver-vacation-1.0-Locale.patch 
+Patch10: smeserver-vacation-1.0-addPrecedenceList.patch
+Patch11: smeserver-vacation-1.0-locale-2008-09-27.patch
+Patch12: smeserver-vacation-1.0-74vacationMessage.patch
+Patch13: smeserver-vacation-1.0-locale-2008-10-14.patch
+Patch14: smeserver-vacation-1.0-locale-2009-01-01.patch
+Patch15: smeserver-vacation-1.0-locale-2009-03-01.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
 
@@ -26,6 +42,50 @@ Optionally provides a user-manager panel
 enable vacation for themselves and to modify their own message
 
 %changelog
+* Sun Mar  1 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 1.0-32
+- Apply  1 Mar 2009 locale patch [SME: 5018]
+
+* Thu Jan  1 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 1.0-31
+- Apply  1 Jan 2009 locale patch [SME: 4900]
+
+* Tue Oct 14 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.0-30
+- Apply 14 Oct 2008 locale patch
+
+* Sat Sep 27 2008 Stephen Noble <support@dungog.net> - 1.0-29
+- move .qmail fragment after SME forwarding [SME: 4603]
+- Apply 27 August 2008 locale patch
+
+* Sat Aug 13 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.0-28
+- Add precedence list to ignore functions to ignore, for instance, 
+  mail from contribs.org mailinglists [SME: 4549]
+
+* Tue Aug 12 2008 Gavin Weight <gweight@gmail.com> 1.0-27
+- Fix Locale to read vacation panel correctly. [SME: 4311] 
+
+* Tue Jul 1 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.0-26
+- Apply 1 July 2008 locale patch
+
+* 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
+
+* 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]
 
@@ -150,6 +210,19 @@ enable vacation for themselves and to mo
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
 
 %build
 perl createlinks
@@ -160,7 +233,7 @@ do
     /sbin/e-smith/validate-lexicon $lexicon
 done
 
-LINKS=$(find /etc/e-smith/locale/ -type d -maxdepth 1 | sed 's/\/etc\/e-smith\/locale\///')
+LINKS=$(find root/etc/e-smith/locale/ -type d -maxdepth 1 | sed 's/root\/etc\/e-smith\/locale\///')
 for link in $LINKS
 do
  /bin/ln -s uservacations root/etc/e-smith/locale/$link/etc/e-smith/web/functions/userpanel-vacation