--- rpms/smeserver-vacation/contribs7/smeserver-vacation.spec	2008/03/08 02:58:07	1.2
+++ rpms/smeserver-vacation/contribs7/smeserver-vacation.spec	2008/03/12 15:11:45	1.5
@@ -1,6 +1,6 @@
 %define name smeserver-vacation
 %define version 1.0
-%define release 15
+%define release 18
 Summary: SME Server enhancement to enable vacation messages for users.
 Name: %{name}
 Version: %{version}
@@ -10,11 +10,13 @@ URL: http://www.dungog.net/sme
 Group: SMEserver/addon
 Source: %{name}-%{version}.tar.gz
 Patch0: smeserver-vacation-1.0-frMenuSplit.patch
-Patch1: smeserver-vacation-1.0-esLocale2.patch
-Patch2: smeserver-vacation-1.0-pootle.patch
+Patch1: smeserver-vacation-1.0-pootle.patch
+Patch2: smeserver-vacation-1.0-locale-2008-03-11.patch
+
 BuildArchitectures: noarch
 BuildRoot: /var/tmp/%{name}-%{version}
 Requires: e-smith-release >= 7.0,
+Requires: e-smith-formmagick >= 1.4.0-10
 BuildRequires: e-smith-devtools >= 1.13.1-03
 AutoReqProv: no
 
@@ -24,6 +26,15 @@ Optionally provides a user-manager panel
 enable vacation for themselves and to modify their own message
 
 %changelog
+* 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
 
@@ -144,16 +155,15 @@ enable vacation for themselves and to mo
 perl createlinks
 
 LEXICONS=$(find root/etc/e-smith/{locale/,web/functions/} -type f )
-
 for lexicon in $LEXICONS
 do
     /sbin/e-smith/validate-lexicon $lexicon
 done
 
-#todo  it sv
-for LINK in en-us fr de es
+LINKS=$(find /etc/e-smith/locale/ -type d -maxdepth 1 | sed 's/\/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
+ /bin/ln -s uservacations root/etc/e-smith/locale/$link/etc/e-smith/web/functions/userpanel-vacation
 done
 
 %install