--- rpms/smeserver-subversion/contribs7/smeserver-subversion.spec	2008/03/01 22:11:26	1.22
+++ rpms/smeserver-subversion/contribs7/smeserver-subversion.spec	2008/03/29 23:26:10	1.31
@@ -2,7 +2,7 @@ Summary: Subversion for SME Server
 %define name smeserver-subversion
 Name: %{name}
 %define version 1.4
-%define release 7
+%define release 11
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -31,17 +31,40 @@ Patch21: smeserver-subversion-1.4-Modify
 Patch22: smeserver-subversion-1.4-RepositoryMIMETypeFix.patch
 Patch23: smeserver-subversion-1.4-RewriteMigrateScript.patch
 Patch24: smeserver-subversion-1.4-FixGroupsFullAccess.patch
+Patch25: smeserver-subversion-1.4-migratefix.patch
+Patch26: smeserver-subversion-1.4-locale-2008-03-10.patch
+Patch27: smeserver-subversion-1.4-locale-2008-03-29.patch
 Group: Applications/Internet
 Source: %{name}-%{version}.tgz
 BuildArchitectures: noarch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
-Requires: smeserver-mod_dav subversion >= 1.2 smeserver-release >= 7 mod_dav_svn httpd >= 2
+Requires: smeserver-mod_dav subversion >= 1.2 
+Requires: smeserver-release >= 7 
+Requires: mod_dav_svn httpd >= 2 
+Requires: e-smith-formmagick >= 1.4.0-10
 BuildRequires: e-smith-devtools >= 1.13.1-03
 
 %description
 Implementation of Subversion for SME Server 7 using WebDAV.
 
 %changelog
+* Wed Mar 29 2008 Jonathan Martens <smeserver-contribs@snetram.nl>
+- 1.4-11
+- Update locale by importing patch generated using the new tranlsation website
+- Split requires line to read one line per package
+
+* Wed Mar 12 2008 Jonathan Martens <smeserver-contribs@snetram.nl>
+- 1.4-10
+- Included e-smith-formagick requirement according to Gavin's comment (11) in [SME: 3858]
+
+* Mon Mar 10 2008 Jonathan Martens <smeserver-contribs@snetram.nl>
+- 1.4-9
+- Update locale by importing patch generated using the new tranlsation website
+- Removed untranslated locales from patch
+
+* Sat Mar 01 2008 Shad L. Lords <slords@mail.com> 1.4-8
+- Simplify migrate fragment and ensure we don't overwrite props [SME: 4003]
+
 * Sat Mar 01 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 
 - 1.4-7
 - Rewrite and split migrate scripts for user(s) and group(s), model
@@ -237,9 +260,9 @@ Implementation of Subversion for SME Ser
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
-# Cleaning out empty files caused by patches
-rm -f root/etc/e-smith/events/actions/subversion-delete
-rm -f root/etc/e-smith/db/accounts/migrate/80subversion
+%patch25 -p1
+%patch26 -p1
+%patch27 -p1
 
 %build
 perl createlinks