gunnar: server/kolab-webclient/horde Makefile, 1.4, 1.5 horde.spec, 1.12, 1.13

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/horde
In directory doto:/tmp/cvs-serv9687/d/horde

Modified Files:
	Makefile horde.spec 
Log Message:
kolab/issue3472 (web client user prefs not deleted when user gets deleted) 

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/horde/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile	19 Jan 2010 05:41:54 -0000	1.4
+++ Makefile	28 Jun 2010 08:51:52 -0000	1.5
@@ -13,7 +13,10 @@
 # Get the list of configuration files if there are any in the configuration directory
 CONFIGURATION = $(shell ls configuration/$(PACKAGE)-$(VERSION)/*.php 2> /dev/null)
 
-EXTRA = package.patch $(TEMPLATES) $(CONFIGURATION)
+# Get the list of hooks if there are any in the hook directory
+HOOKS = $(shell ls hooks/$(PACKAGE)-$(VERSION)/hook-* 2> /dev/null)
+
+EXTRA = package.patch $(HOOKS) $(TEMPLATES) $(CONFIGURATION)
 
 include ../../make-helper/package-new.mk
 include ../../make-helper/fetch.mk

Index: horde.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/horde/horde.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- horde.spec	16 May 2010 09:14:37 -0000	1.12
+++ horde.spec	28 Jun 2010 08:51:52 -0000	1.13
@@ -1,7 +1,7 @@
 # Macros
 %define         V_package horde
 %define         V_version 3.3.6
-%define         V_release 20100516
+%define         V_release 20100627
 
 # Package Information
 Name:		%{V_package}
@@ -27,6 +27,7 @@
 Source9:        10-kolab_prefs_base.php
 Source10:       10-kolab_conf_base.php
 Source11:       conf.php
+Source12:       hook-delete_webmail_user.php
 
 # List of Patches
 Patch0:         package.patch
@@ -105,6 +106,7 @@
 	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/webclient_data/tmp
 	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/webclient_data/sessions
 	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates	
+	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/hooks/delete
 
 	cd %{V_package}-%{V_version}
 
@@ -160,6 +162,10 @@
 
 	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} %{S:2} %{S:3} %{S:4} %{S:5} %{S:6} %{S:7} \
 	  $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates
+
+	%{l_shtool} install -c -m 755 %{l_value -s -a} %{S:12} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/hooks/delete
+	sed -i -e 's#@@@php_bin@@@#%{l_prefix}/bin/php#' $RPM_BUILD_ROOT%{l_prefix}/var/kolab/hooks/delete/hook-*
+	sed -i -e 's#@@@prefix@@@#%{l_prefix}#' $RPM_BUILD_ROOT%{l_prefix}/var/kolab/hooks/delete/hook-*
 
 	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:8} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/config/hooks.d/
 	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:9} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/config/prefs.d/