gunnar: server/php-kolab Makefile,1.25,1.26 php-kolab.spec,1.4,1.5

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/php-kolab
In directory doto:/tmp/cvs-serv12367/php-kolab

Modified Files:
	Makefile php-kolab.spec 
Log Message:
More code finally leaves Kolab CVS and moves upstream. kolab-freebusy is being replaced by the PEAR package Kolab_FreeBusy from pear.horde.org. The package has not been officially released yet as it still needs some reasonable testing on the Kolab server but the first release will happen once I finished that.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Makefile,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- Makefile	31 Jul 2008 16:43:07 -0000	1.25
+++ Makefile	12 Sep 2008 05:20:20 -0000	1.26
@@ -25,8 +25,7 @@
   endif
 endif
 
-MODULES = Kolab_Freebusy \
-          Kolab_Filter   \
+MODULES = Kolab_Filter   \
           Kolab_Webadmin
 
 SOURCES = $(MODULES:%=%-$(SOURCE_TAG).tgz)

Index: php-kolab.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/php-kolab.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- php-kolab.spec	16 Aug 2007 12:16:51 -0000	1.4
+++ php-kolab.spec	12 Sep 2008 05:20:20 -0000	1.5
@@ -18,9 +18,8 @@
 Release:      %{V_release}
 
 # List of Sources
-Source0:    Kolab_Freebusy-%{V_source_tag}.tgz
-Source1:    Kolab_Filter-%{V_source_tag}.tgz
-Source2:    Kolab_Webadmin-%{V_source_tag}.tgz
+Source0:    Kolab_Filter-%{V_source_tag}.tgz
+Source1:    Kolab_Webadmin-%{V_source_tag}.tgz
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -40,9 +39,6 @@
 php-kolab provides several PEAR-style package with PHP routines for
 the Kolab Groupware server.
 
-Kolab_Freebusy provides the library required for free/busy support on
-the server.
-
 Kolab_Filter holds routines necessary to parse iCal mail messages.
 
 Kolab_Webadmin groups utilities for the Kolab web admin frontend.
@@ -52,10 +48,6 @@
 %build
 
 %install
-        env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M"   \
-            PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
-	    %{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/Kolab_Freebusy-%{V_source_tag}.tgz
-
         env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M"   \
             PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
 	    %{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/Kolab_Filter-%{V_source_tag}.tgz