--- rpms/smeserver-subversion/contribs7/smeserver-subversion.spec	2008/02/28 19:31:49	1.19
+++ rpms/smeserver-subversion/contribs7/smeserver-subversion.spec	2008/03/12 08:45:56	1.28
@@ -2,7 +2,7 @@ Summary: Subversion for SME Server
 %define name smeserver-subversion
 Name: %{name}
 %define version 1.4
-%define release 5
+%define release 10
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -29,17 +29,46 @@ Patch19: smeserver-subversion-1.4-Reorga
 Patch20: smeserver-subversion-1.4-AddLocale-es.patch
 Patch21: smeserver-subversion-1.4-ModifyRepositoryFixes.patch
 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
 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 smeserver-release >= 7 mod_dav_svn httpd >= 2 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 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
+  it after /etc/e-smith/db/configuration/migrate/20smtpd-auth
+- Clean out empty files created after patching
+
+* Sat Mar 01 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 
+- 1.4-6
+- Full access for groups does not work [SME: 3998]
+- group-delete hook is preventing groups from being deleted [SME: 3999]
+- Fix migrate script to not overwrite users/groups access privileges 
+  on updates [SME: 4003]
+
 * Thu Feb 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 
 - 1.4-5
 - Modifying repository does not change MIME type setting 
@@ -220,6 +249,10 @@ Implementation of Subversion for SME Ser
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
 
 %build
 perl createlinks