--- rpms/smeserver-affa/contribs7/smeserver-affa.spec	2008/03/08 17:04:38	1.7
+++ rpms/smeserver-affa/contribs7/smeserver-affa.spec	2008/11/25 16:20:17	1.20
@@ -1,8 +1,12 @@
+# $Id: smeserver-affa.spec,v 1.18 2008/05/27 12:12:29 mweinber Exp $
+# 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 release 7
+%define version 1.0.0
+%define release 3
 Version: %{version}
 Release: %{release}%{?dist}
 License: GNU GPL (GNU General Public License)
@@ -14,17 +18,39 @@ AutoReq: no
 Requires: smeserver-release >= 7
 Requires: perl-Filesys-DiskFree
 BuildRequires: e-smith-devtools
-Patch0: smeserver-affa-0.9.0-debugsshquiet.patch
-Patch1: smeserver-affa-0.9.0-defaultRemoteHostName.patch
-Patch2: smeserver-affa-0.9.0-dovecotDeleteNewStyleIndexFiles.patch
-Patch3: smeserver-affa-0.9.0-createBackupFileOption.patch
-Patch4: smeserver-affa-0.9.0-createBackupFileOption2.patch
+Patch0: smeserver-affa-1.0.0-bug4210.patch
+Patch1: smeserver-affa-1.0.0-desktop.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
+* Tue May 27 2008 Michael Weinberger 1.0.0-3
+  Re-added type 'desktop' to pre-backup event for SME6 compatibility
+* Tue Apr 22 2008 Michael Weinberger 1.0.0-2
+  Bug fix #4210, command "affa --show-schedule" executes postJobCommand
+* Fri Apr 04 2008 Michael Weinberger 1.0.0-1
+  Final release
+  man page updated
+* Fri Apr 04 2008 Michael Weinberger 0.10.0-2
+  added --all option to --rise
+* 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
@@ -311,11 +337,8 @@ Also providing functions to backup to US
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1 
-%patch4 -p1
+%patch0 -p1 
+%patch1 -p1 
 
 %build
 
@@ -329,7 +352,7 @@ 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/_VERSIONSTRING_/$VERSIONSTRING/" < $RPM_BUILD_ROOT/sbin/e-smith/affa.tmp > $RPM_BUILD_ROOT/sbin/e-smith/affa
+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
@@ -339,6 +362,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 |\