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

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	horde.spec 
Log Message:
Completed the spec for to yield a first draft of a new horde base application package. The package installs and provides a working horde installation.

Index: horde.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/horde/horde.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- horde.spec	12 Jan 2010 14:13:56 -0000	1.4
+++ horde.spec	12 Jan 2010 22:17:57 -0000	1.5
@@ -23,6 +23,9 @@
 Source5:        webclient-config_nls.php.template
 Source6:        webclient-config_prefs.php.template
 Source7:        webclient-config_registry.php.template
+Source8:        10-kolab_hooks_base.php
+Source9:        10-kolab_prefs_base.php
+Source10:       10-kolab_conf_base.php
 
 # List of Patches
 Patch0:         package.patch
@@ -57,6 +60,7 @@
 PreReq:       Horde_Text_Filter
 PreReq:       Horde_Text_Flowed
 PreReq:       Horde_Tree
+PreReq:       Horde_UI
 PreReq:       Kolab_Format >= 1.0.1
 PreReq:       Kolab_Server >= 0.5.0
 PreReq:       Kolab_Storage >= 0.4.0
@@ -92,6 +96,7 @@
 
 	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client
 	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/webclient_data/storage
+	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/webclient_data/log
 	%{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	
@@ -99,7 +104,11 @@
 	cd %{V_package}-%{V_version}
 
 	cd config
-	for CONFIG in *.dist; do cp $CONFIG `basename $CONFIG .dist`; done
+	for CONFIG in *.dist;                          \
+	    do                                         \
+	      cp $CONFIG `basename $CONFIG .dist`;     \
+	      mkdir -p `basename $CONFIG .php.dist`.d; \
+	done
 	cd ..
 
 	rm test.php
@@ -121,6 +130,8 @@
 	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/VFS*
 	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/XML
 
+        sqlite $RPM_BUILD_ROOT%{l_prefix}/var/kolab/webclient_data/storage/horde.db < scripts/sql/horde_alarms.sql
+        sqlite $RPM_BUILD_ROOT%{l_prefix}/var/kolab/webclient_data/storage/horde.db < scripts/sql/horde_perms.sql
         sqlite $RPM_BUILD_ROOT%{l_prefix}/var/kolab/webclient_data/storage/horde.db < scripts/sql/horde_syncml.sql
 
 	cd ..
@@ -128,6 +139,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 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/
+	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:10} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/config/conf.d/
+
 	sed -i -e 's#@@@horde_confdir@@@#%{l_prefix}/var/kolab/www/client/config#' $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates/*.php.template
 
 	%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
@@ -138,6 +153,7 @@
             '%config %{l_prefix}/etc/kolab/templates/webclient-config_nls.php.template' \
             '%config %{l_prefix}/etc/kolab/templates/webclient-config_prefs.php.template' \
             '%config %{l_prefix}/etc/kolab/templates/webclient-config_registry.php.template' \
+            %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/webclient_data/log \
             %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/webclient_data/storage \
             %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/webclient_data/storage/horde.db \
             %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/webclient_data/tmp \