steffen: server/kolab-resource-handlers Makefile, 1.11, 1.12 kolab-resource-handlers.spec, 1.138, 1.139

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	Makefile kolab-resource-handlers.spec 
Log Message:
Separated Horde Framework from kolab-resource-handlers

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Makefile	3 Oct 2005 01:46:35 -0000	1.11
+++ Makefile	14 Oct 2005 14:40:36 -0000	1.12
@@ -9,5 +9,4 @@
 	test -d $(KOLABRPMSRC)/kolab-resource-handlers || mkdir $(KOLABRPMSRC)/kolab-resource-handlers
 	tar -cvj --exclude=CVS --exclude=\*~ -f $(KOLABRPMSRC)/kolab-resource-handlers/kolab-resource-handlers-$(VERSION).tar.bz2 *
 	cp kolab-resource-handlers.spec $(KOLABRPMSRC)/kolab-resource-handlers/
-	cd $(KOLABRPMSRC)/kolab-resource-handlers && wget -c "ftp://ftp.horde.org/pub/pear/pear-$(PEARVERSION).tar.bz2"
 	cd $(KOLABRPMSRC)/kolab-resource-handlers && $(RPM) -ba kolab-resource-handlers.spec

Index: kolab-resource-handlers.spec
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -d -r1.138 -r1.139
--- kolab-resource-handlers.spec	14 Oct 2005 09:22:02 -0000	1.138
+++ kolab-resource-handlers.spec	14 Oct 2005 14:40:36 -0000	1.139
@@ -1,5 +1,4 @@
 # Versions
-%define		V_php_horde_pear 1.3
 %define		V_kolab_reshndl   2.0.99
 
 # Package Information
@@ -15,14 +14,13 @@
 Distribution:	OpenPKG
 
 # List of Sources
-Source0:	http://ftp.horde.org/pub/pear/pear-%{V_php_horde_pear}.tar.bz2
-Source1:	kolab-resource-handlers-%{V_kolab_reshndl}.tar.bz2
+Source0:	kolab-resource-handlers-%{V_kolab_reshndl}.tar.bz2
 
 # Build Info
 Prefix:		%{l_prefix}
 BuildRoot:	%{l_buildroot}
 BuildPreReq:	apache, php, php::with_pear = yes
-PreReq:		kolabd >= 2.0.0-20050727, apache, php, php::with_pear = yes
+PreReq:		kolabd >= 2.0.99-20050727, kolab-horde-framework >= 2.0.99-20051014, apache, php, php::with_pear = yes
 AutoReq:      no
 AutoReqProv:  no
 #BuildArch:    noarch
@@ -31,18 +29,12 @@
 Blah blah
 
 %prep
-	%setup0 -q -T -b 0 -n pear
-	# rpmtool barfs on files with spaces...
-	mv docs/Text_Wiki/docs/free\ links.wiki.txt docs/Text_Wiki/docs/free_links.wiki.txt
-	%setup1 -q -T -b 1 -n kolab-resource-handlers
+	%setup0 -q -T -b 0 -n kolab-resource-handlers
 
 %build
 
 %install
 	rm -rf $RPM_BUILD_ROOT
-	
-	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/php
-	cp -r ../pear $RPM_BUILD_ROOT%{l_prefix}/var/kolab/php
 
 	%{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
@@ -81,9 +73,6 @@
 	  $RPM_BUILD_ROOT%{l_prefix}/var/kolab/php/kolabfilter
 
 	cp -r fbview/fbview $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www
-	%{l_shtool} install -c -m 644 %{l_value -s -a} \
-		fbview/fbview/framework/install-packages.php \
-		$RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/fbview/framework
 
 	%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
 		%dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/freebusy/cache \
@@ -97,6 +86,3 @@
 	rm -rf $RPM_BUILD_ROOT
 
 %files -f files
-
-%post
-	cd %{l_prefix}/var/kolab/www/fbview/framework && env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off" %{l_prefix}/bin/php -d safe_mode=off install-packages.php --install-dir %{l_prefix}/var/kolab/php/pear