--- rpms/smeserver-subversion/contribs7/smeserver-subversion.spec	2008/04/21 21:22:48	1.36
+++ rpms/smeserver-subversion/contribs7/smeserver-subversion.spec	2008/05/21 20:54:41	1.43
@@ -1,4 +1,4 @@
-# $Id: smeserver-subversion.spec,v 1.35 2008/04/21 04:33:42 slords Exp $
+# $Id: smeserver-subversion.spec,v 1.42 2008/05/21 20:42:28 snetram Exp $
 # Authority: snetram
 # Name: Jonathan Martens
 
@@ -6,7 +6,7 @@ Summary: Subversion for SME Server
 %define name smeserver-subversion
 Name: %{name}
 %define version 1.4
-%define release 15
+%define release 21
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -41,6 +41,9 @@ Patch27: smeserver-subversion-1.4-locale
 Patch28: smeserver-subversion-1.4-locale-2008-04-10.patch
 Patch29: smeserver-subversion-1.4-badpt.patch
 Patch30: smeserver-subversion-1.4-locale-2008-04-21.patch
+Patch31: smeserver-subversion-1.4-add2general.patch
+Patch32: smeserver-subversion-1.4-locale-2008-04-26.patch
+Patch33: smeserver-subversion-1.4-locale-2008-05-21.patch
 Group: Applications/Internet
 Source: %{name}-%{version}.tgz
 BuildArchitectures: noarch
@@ -48,13 +51,31 @@ BuildRoot: /var/tmp/%{name}-%{version}-%
 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
+Requires: e-smith-formmagick >= 1.4.0-12
 BuildRequires: e-smith-devtools >= 1.13.1-03
 
 %description
 Implementation of Subversion for SME Server 7 using WebDAV.
 
 %changelog
+* Thu May 21 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.4-21
+- Removed development patches
+
+* Thu May 21 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.4-20
+- Apply 21 May 2008 locale patch
+
+* Fri May 9 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.4-19
+- Try to clarify panel read/write properties (a bit more) [SME: 4237]
+
+* Mon Apr 28 2008 Shad L. Lords <slords@mail.com> 1.4-18
+- Bump release to rebuild
+
+* Thu Apr 24 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.4-17
+- Updated common <base> entries for other locales
+
+* Thu Apr 24 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.4-16
+- Take common <base> entries from e-smith-formmagick's general
+
 * Mon Apr 21 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.4-15
 - Updated pt_BR locale
 
@@ -287,6 +308,9 @@ Implementation of Subversion for SME Ser
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
+%patch31 -p1
+%patch32 -p1
+%patch33 -p1
 
 %build
 perl createlinks