steffen: server/kolab-resource-handlers Makefile, 1.7, 1.8 kolab-resource-handlers.spec, 1.37, 1.38

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolab-resource-handlers
In directory doto:/tmp/cvs-serv1384

Modified Files:
	Makefile kolab-resource-handlers.spec 
Log Message:
new freebusy handling

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile	19 Aug 2004 23:28:52 -0000	1.7
+++ Makefile	28 Sep 2004 13:12:26 -0000	1.8
@@ -1,5 +1,5 @@
 RPM = /kolab/bin/openpkg rpm
-VERSION = 0.2.5
+VERSION = 0.3.0
 PEARVERSION = 1.3
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC

Index: kolab-resource-handlers.spec
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- kolab-resource-handlers.spec	27 Sep 2004 15:20:56 -0000	1.37
+++ kolab-resource-handlers.spec	28 Sep 2004 13:12:26 -0000	1.38
@@ -1,6 +1,6 @@
 # Versions
 %define		V_php_horde_pear 1.3
-%define		V_kolab_reshndl   0.2.5
+%define		V_kolab_reshndl   0.3.0
 
 # Package Information
 Name:		kolab-resource-handlers
@@ -8,7 +8,7 @@
 URL:		http://www.kolab.org/
 Packager:	Steffen Hansen <steffen at klaralvdalens-datakonsult.se> (Klaraelvdalens Datakonsult AB)
 Version:	%{V_kolab_reshndl}
-Release:	20040926
+Release:	20040928
 Class:		JUNK
 License:	GPL
 Group:		MAIL
@@ -22,7 +22,7 @@
 Prefix:		%{l_prefix}
 BuildRoot:	%{l_buildroot}
 BuildPreReq:	kolab, apache, php, php::with_pear = yes
-PreReq:		kolab >= 1.9.2-20040830, apache, php, php::with_pear = yes
+PreReq:		kolab >= 1.9.2-20040928, apache, php, php::with_pear = yes
 AutoReq:      no
 AutoReqProv:  no
 #BuildArch:    noarch
@@ -46,11 +46,22 @@
 
 	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/fbview
 	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/freebusy
-	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/freebusy/data
+	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/php/freebusy
+	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/freebusy/cache
         %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/resmgr
 	
 	%{l_shtool} install -c -m 644 %{l_value -s -a} freebusy/freebusy.php  \
 	  $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/freebusy/
+	%{l_shtool} install -c -m 644 %{l_value -s -a} freebusy/pfb.php  \
+	  $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/freebusy/
+
+	%{l_shtool} install -c -m 644 %{l_value -s -a} \
+	  freebusy/misc.php \
+	  freebusy/freebusycache.class.php \
+	  freebusy/freebusy.class.php \
+	  freebusy/freebusycollector.class.php \
+	  freebusy/freebusyldap.class.php \
+	  $RPM_BUILD_ROOT%{l_prefix}/var/kolab/php/freebusy/
 
 	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/resmgr	
 	%{l_shtool} install -c -m 755 %{l_value -s -a} \
@@ -63,7 +74,7 @@
 	cp -r fbview/fbview $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www
 
 	%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
-		%dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/freebusy/data \
+		%dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/freebusy/cache \
 		%dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/resmgr \
 		%config %{l_prefix}/etc/resmgr/resmgr.conf \
 		%config %{l_prefix}/etc/resmgr/fbview.conf \