--- rpms/smeserver-affa/contribs7/smeserver-affa.spec	2008/02/26 01:05:31	1.1
+++ rpms/smeserver-affa/contribs7/smeserver-affa.spec	2008/04/02 15:03:56	1.14
@@ -1,7 +1,11 @@
+# $Id$
+# Authority: mweinber
+# Name: Michael Weinberger
+
 Summary: Makes the SME server a dedicated rsync based backup server
 %define name smeserver-affa
 Name: %{name}
-%define version 0.9.0
+%define version 0.10.0
 %define release 1
 Version: %{version}
 Release: %{release}%{?dist}
@@ -14,12 +18,50 @@ AutoReq: no
 Requires: smeserver-release >= 7
 Requires: perl-Filesys-DiskFree
 BuildRequires: e-smith-devtools
+Patch0: smeserver-affa-0.10.0-DNS_Timeout.patch
 
 %description
 Main purpose ist to make the SME server a dedicated rsync based backup server.
 Also providing functions to backup to USB disks or SMB shares in SOHO environments.
 
 %changelog
+* Mon Mar 10 2008 Michael Weinberger 0.10.0-1
+  Increased release number
+  Added 10 sec timeout in Net::DNS::Resolver->search
+* Mon Mar 10 2008 Michael Weinberger 0.9.0-11
+  Specfile fix
+* Mon Mar 10 2008 Michael Weinberger 0.9.0-10
+  Delete locally created watchdog file after remotecopy
+  Bugfix 4035
+  Added default AutoUnmount property to sample script
+  Fix man page
+  Do not delete md5sum in --create-backup-file when verify is skipped by user
+  Set lock in --create-backup-file
+* Sun Mar 09 2008 Michael Weinberger 0.9.0-9
+  trap signals in --create-backup-file
+* Sat Mar 08 2008 Michael Weinberger 0.9.0-8
+  Permissions in /usr/lib/affa
+* Sat Mar 08 2008 Michael Weinberger 0.9.0-7
+  md5sum in --create-backup-file
+* Fri Mar 07 2008 Michael Weinberger 0.9.0-6
+  Added option --create-backup-file
+  Using line number as error code in affaErrorExit()
+  Fixed /etc/profile.d/affa.sh
+  
+* Mon Mar 03 2008 Michael Weinberger 0.9.0-5
+- delete new style Dovecot's index files dovecot.index* 
+- delete dovecot index files on remote server in --full-restore
+
+* Fri Feb 29 2008 Michael Weinberger 0.9.0-4
+  set localhost as default remoteHostName in /etc/e-smith/templates//etc/cron.d/affa/00jobs
+
+* Wed Feb 27 2008 Michael Weinberger 0.9.0-3
+  removed %post from spec file
+
+* Sat Feb 02 2008 Michael Weinberger 0.9.0-2
+  Bugfix: Report db was not deleted in deleteJob()
+  don't use -q on ssh commands with Debug=yes
+
 * Fri Feb 1 2008 Shad L. Lords <slords@mail.com> 0.9.0-1
 - Fix specfile for building in new buildsystem
 
@@ -285,6 +327,7 @@ Also providing functions to backup to US
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1
 
 %build
 
@@ -295,6 +338,12 @@ rm -f %{name}-%{version}-filelist
 
 perl createlinks $RPM_BUILD_ROOT
 
+# Set version String
+cp -a $RPM_BUILD_ROOT/sbin/e-smith/affa $RPM_BUILD_ROOT/sbin/e-smith/affa.tmp
+VERSIONSTRING=%{version}-`echo %{release}|sed -e 's/\..*$//'`
+sed -e "s/my \$VERSION.*;/my \$VERSION='$VERSIONSTRING';/" < $RPM_BUILD_ROOT/sbin/e-smith/affa.tmp > $RPM_BUILD_ROOT/sbin/e-smith/affa
+rm -f $RPM_BUILD_ROOT/sbin/e-smith/affa.tmp
+
 rm -f %{name}-%{version}-filelist
 
 find $RPM_BUILD_ROOT -depth -type f -print |\
@@ -302,6 +351,8 @@ find $RPM_BUILD_ROOT -depth -type f -pri
  -e "s@^/sbin/e-smith/@%attr(0750,root,root) &@"\
  -e "s@^/etc/profile.d/@%attr(0755,root,root) &@"\
  -e "s@^/etc/e-smith/templates/@%attr(0644,root,root) &@"\
+ -e "s@^/usr/lib/affa/COPYING@%attr(0444,root,root) &@"\
+ -e "s@^/usr/lib/affa/@%attr(0750,root,root) &@"\
  >> %{name}-%{version}-filelist
 
 find $RPM_BUILD_ROOT -depth -type l -print |\
@@ -311,8 +362,6 @@ find $RPM_BUILD_ROOT -depth -type l -pri
 rm -rf $RPM_BUILD_ROOT
 exit 0
 
-%post
-/sbin/e-smith/db affa get AffaGlobalDisable > /dev/null || /sbin/e-smith/affa --make-cronjobs > /dev/null
 
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)