--- rpms/smeserver-subversion/contribs7/smeserver-subversion.spec	2008/02/24 16:04:08	1.13
+++ rpms/smeserver-subversion/contribs7/smeserver-subversion.spec	2008/02/25 22:51:53	1.16
@@ -2,7 +2,7 @@ Summary: Subversion for SME Server
 %define name smeserver-subversion
 Name: %{name}
 %define version 1.4
-%define release 0
+%define release 2
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -17,6 +17,13 @@ Patch7: %{name}-%{version}-ImplementRead
 Patch8: %{name}-%{version}-ImplementReadWriteAccessLocale-fr.patch
 Patch9: %{name}-%{version}-ImplementReadWriteAccessLocale-sv.patch
 Patch10: %{name}-%{version}-ImplementReadWriteAccessLocale-it.patch
+Patch11: %{name}-%{version}-FixFontTagInLocale.patch
+Patch12: smeserver-subversion-1.4-initdb.patch
+Patch13: %{name}-%{version}-ImproveRepositoryDeleteSanityCheck.patch
+Patch14: %{name}-%{version}-RemoveEvent-subversion-delete.patch
+Patch15: %{name}-%{version}-AddHooksToUSerAndGroupDeleteEvents.patch
+Patch16: %{name}-%{version}-UpdateCreateLinksScript.patch
+Patch17: %{name}-%{version}-SanitizeGroupMemberExpansion.patch
 Group: Applications/Internet
 Source: %{name}-%{version}.tgz
 BuildArchitectures: noarch
@@ -28,6 +35,20 @@ BuildRequires: e-smith-devtools >= 1.13.
 Implementation of Subversion for SME Server 7 using WebDAV.
 
 %changelog
+* Mon Feb 25 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 
+- 1.4-3 
+- Add hooks to user-delete and group-delete event [SME: 3981]
+- Remove subversion-delete event since it is and should not be used [SME: 3982]
+- Improve sanity check on repository-delete event [SME: 3983]
+
+* Mon Feb 25 2008 Shad L. Lords <slords@mail.com> 
+- 1.4-2
+- Remove scripts and move db initialition to package
+
+* Sun Feb 24 2008 Jonathan Martens <smeserver-contribs@snetram.nl>
+- 1.4-1
+- Removed font tag in locale files [SME: 3977]
+
 * Sat Feb 23 2008 Jonathan Martens <smeserver-contribs@snetram.nl>
 - 1.4-0
 - Removed skel folder should have been obsoleted since 1.2-8 [SME: 3079]
@@ -168,22 +189,17 @@ Implementation of Subversion for SME Ser
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
-rm -f root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28SubversionContent.orig
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
 
 %build
 perl createlinks
 
-DEFAULTS=root/etc/e-smith/db/configuration/defaults/modDAVSVN
-mkdir -p $DEFAULTS
-
-echo "service"  > $DEFAULTS/type
-echo "enabled"  > $DEFAULTS/status
-
-DEFAULTS=root/etc/e-smith/db/configuration/defaults/maxRepositoryNameLength
-mkdir -p $DEFAULTS
-
-echo "31"  > $DEFAULTS/type
-
 %install
 rm -rf $RPM_BUILD_ROOT
 (cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
@@ -193,35 +209,5 @@ rm -f %{name}-%{version}-filelist
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
-true
-
-%post
-if [ "$1" = "1" ] ; then  # first install
-  # Expand the server-manager templates to add
-  # references to the smeserver-subversion panel
-  /sbin/e-smith/db configuration set modDAVSVN service status enabled
-  /sbin/e-smith/db configuration set maxRepositoryNameLength 31
-  /sbin/e-smith/signal-event subversion-modify
-  echo "Rebuilding server-manager (this can take a while) ..."
-  /etc/e-smith/events/actions/navigation-conf >/dev/null 2>&1
-fi
-true
-
-%preun
-if [ "$1" = "0" ] ; then # last uninstall
-  /sbin/e-smith/db configuration setprop modDAVSVN status disabled
-  /sbin/e-smith/signal-event subversion-delete
-  /sbin/e-smith/signal-event subversion-modify
-fi
-true
-
-%postun
-# Expand the server-manager templates to update/remove
-# references to the smeserver-subversion panel
-echo "Rebuilding server-manager (this can take a while) ..."
-/etc/e-smith/events/actions/navigation-conf >/dev/null 2>&1
-true
-
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)