--- rpms/smeserver-vacation/contribs7/smeserver-vacation-1.0.spec	2007/12/22 21:41:57	1.2
+++ rpms/smeserver-vacation/contribs7/smeserver-vacation-1.0.spec	2007/12/26 05:04:32	1.10
@@ -1,19 +1,20 @@
-Summary: SME Server enhancement to enable vacation messages for users.
 %define name smeserver-vacation
-Name: %{name}
 %define version 1.0
-%define release 11
+%define release 14
+Summary: SME Server enhancement to enable vacation messages for users.
+Name: %{name}
 Version: %{version}
-Release: %{release}
-Distribution: SME Server
-License: GPL
+Release: %{release}%{?dist}
+License: GNU GPL version 2
 URL: http://www.dungog.net/sme
 Group: SMEserver/addon
 Source: %{name}-%{version}.tar.gz
-Packager: Stephen Noble <support@dungog.net>
+Patch0: smeserver-vacation-1.0-frMenuSplit.patch
+Patch1: smeserver-vacation-1.0-esLocale2.patch
 BuildArchitectures: noarch
 BuildRoot: /var/tmp/%{name}-%{version}
 Requires: e-smith-release >= 7.0,
+BuildRequires: e-smith-devtools >= 1.13.1-03
 AutoReqProv: no
 
 %description
@@ -22,10 +23,26 @@ Optionally provides a user-manager panel
 enable vacation for themselves and to modify their own message
 
 %changelog
+* 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
+
+* Sun Apr 29 2007 Shad L. Lords <slords@mail.com>
+- Clean up spec so package can be built by koji/plague
+
 * Fri Dec 29 2006  Stephen Noble <support@dungog.net>
-- display Vacation status correctly on modify page in server-manager
+- display Vacation status correctly on modify page in server-manager [sme 2200]
 - [1.0-11]
 
+* Thu Dec 07 2006 Shad L. Lords <slords@mail.com>
+- Update to new release naming.  No functional changes.
+- Make Packager generic
+
 * Mon Oct 30 2006  Stephen Noble <support@dungog.net>
 - display description unshaded *
 - german lexicon fix
@@ -115,25 +132,23 @@ enable vacation for themselves and to mo
 
 %prep
 %setup
+%patch0 -p1
+%patch1 -p2
 
 %build
 perl createlinks
 
-LEXICONS1=$(find root/etc/e-smith/locale/ -type f )
-LEXICONS2=$(find root/etc/e-smith/web/functions/uservacations -type f )
-LEXICONS2=$(find root/etc/e-smith/web/functions/userpanel-vacation -type f )
+LEXICONS=$(find root/etc/e-smith/{locale/,web/functions/} -type f )
 
-for lexicon in $LEXICONS1 $LEXICONS2 $LEXICONS3
+for lexicon in $LEXICONS
 do
     /sbin/e-smith/validate-lexicon $lexicon
 done
 
-#de en-us es fr de it
-for LINK in en-us fr de
+#todo  it sv
+for LINK in en-us fr de es
 do
-#  if [ -z "/etc/e-smith/locale/$LINK/etc/e-smith/web/functions/uservacations"] ; then
-     /bin/ln -s uservacations root/etc/e-smith/locale/$LINK/etc/e-smith/web/functions/userpanel-vacation
-#  fi
+ /bin/ln -s uservacations root/etc/e-smith/locale/$LINK/etc/e-smith/web/functions/userpanel-vacation
 done
 
 %install
@@ -143,27 +158,18 @@ rm -f %{name}-%{version}-filelist
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
      --file '/usr/local/bin/vacation' 'attr(0755,root,root)' \
      > %{name}-%{version}-filelist
-echo "%doc " >> %{name}-%{version}-filelist
+echo "%doc COPYING"  >> %{name}-%{version}-filelist
 
 %clean
-cd ..
-rm -rf %{name}-%{version}
+rm -rf $RPM_BUILD_ROOT
 
 %pre
 %preun
 
 %post
-#new installs
-#if [ $1 = 1 ] ; then
-
-#fi
-
-#upgrades (and new installs)
-/etc/e-smith/events/actions/navigation-conf 2>/dev/null
-
-#if [ -d /etc/e-smith/events/conf-userpanel ] ; then
-#   /sbin/e-smith/signal-event conf-userpanel
-#fi
+if [ -d /etc/e-smith/events/conf-userpanel ] ; then
+   /sbin/e-smith/signal-event conf-userpanel
+fi
 
 %postun
 #uninstall
@@ -174,7 +180,7 @@ if [ $1 = 0 ] ; then
           /sbin/e-smith/db $db delete userpanel-vacation 2>/dev/null
           /sbin/e-smith/db $db delete uservacations 2>/dev/null
 	done
-
+	
  #need to expand ~/.qmail for users who are still enabled
  /etc/e-smith/events/actions/qmail-update-user
 
@@ -183,4 +189,3 @@ fi
 
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)
-