--- rpms/smeserver-vacation/contribs9/smeserver-vacation.spec	2013/11/13 10:43:03	1.1
+++ rpms/smeserver-vacation/contribs9/smeserver-vacation.spec	2015/09/12 09:01:17	1.10
@@ -1,10 +1,10 @@
-# $Id: smeserver-vacation.spec,v 1.4 2013/07/15 23:31:55 unnilennium Exp $
+# $Id: smeserver-vacation.spec,v 1.9 2015/09/12 09:00:08 stephdl Exp $
 # Authority: dungog
 # Name: Stephen Noble
 
 %define name smeserver-vacation
 %define version 1.1
-%define release 1
+%define release 9
 Summary: SME Server enhancement to enable vacation messages for users.
 Name: %{name}
 Version: %{version}
@@ -13,9 +13,16 @@ License: GNU GPL version 2
 URL: http://www.dungog.net/sme
 Group: SMEserver/addon
 Source: %{name}-%{version}.tar.xz
+Patch0: smeserver-vacation-1.1-fix_dbmopen.patch
+Patch1: smeserver-vacation-1.1-multiline_matching.patch
+Patch2: smeserver-vacation-1.1-explain_better_virtual_sender_domain.patch
+Patch3: smeserver-vacation-1.1-do_not_localize_from_header.patch
+Patch4: smeserver-vacation-1.1-subject_match_case_insensitive.patch
+Patch5: smeserver-vacation-1.1-auto_enable_disable_vacation.patch
+Patch6: smeserver-vacation-1.1-locale-2015-09-12.patch
 BuildArchitectures: noarch
 BuildRoot: /var/tmp/%{name}-%{version}
-Requires: e-smith-release >= 7.0,
+Requires: e-smith-release >= 9.0,
 Requires: e-smith-formmagick >= 1.4.0-12
 BuildRequires: e-smith-devtools >= 1.13.1-03
 AutoReqProv: no
@@ -26,6 +33,30 @@ Optionally provides a user-manager panel
 enable vacation for themselves and to modify their own message
 
 %changelog
+* Sat Sep 12 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 1.1-9.sme
+- Added smeserver-vacation-1.1-locale-2015-09-12.patch
+
+* Fri Sep 4 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 1.1-7.sme 
+- code done by Mats Schuh <m.schuh@neckargeo.net>
+- Allow automated enabling and disabling of user vacations on given dates [SME: 7555]
+- Above functionality provided by additional db accounts entries and a cron script
+
+* Thu Jan 8 2015 Daniel Berteaud <daniel@firewall-services.com> 1.1-6.sme
+- Make the subject header match case insensitive (patch from Mats Schuh) [SME: 8777]
+
+* Thu Jan 8 2015 Daniel Berteaud <daniel@firewall-services.com> 1.1-5.sme
+- Do not localize From header (patch from Mats Schuh) [SME: 8776]
+
+* Tue Jan 6 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 1.1-4.sme
+- Updated instructions to use virtual sender domain for vacation message
+- Created by Mats Schuh m.schuh@neckargeo.net
+
+* Wed Dec 24 2014 Daniel Berteaud <daniel@firewall-services.com> 1.1-3.sme
+- Fix multiline matching [SME: 8741]
+
+* Wed Dec 24 2014 Daniel Berteaud <daniel@firewall-services.com> 1.1-2.sme
+- Fix dbmopen by specifying the dbm module to use (DB_File) [SME: 8741]
+
 * Wed Nov 13 2013 Daniel Berteaud <daniel@firewall-services.com> 1.1-1.sme
 - Rebuild for SME9
 
@@ -221,6 +252,13 @@ enable vacation for themselves and to mo
 
 %prep
 %setup
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 perl createlinks
@@ -243,6 +281,7 @@ rm -rf $RPM_BUILD_ROOT
 rm -f %{name}-%{version}-filelist
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
      --file '/usr/local/bin/vacation' 'attr(0755,root,root)' \
+     --file '/sbin/e-smith/vacation/check_vacation_dates.sh' 'attr(0755,root,root)' \
      > %{name}-%{version}-filelist
 echo "%doc COPYING"  >> %{name}-%{version}-filelist