thomas: server/kolab-horde-framework Makefile, 1.5, 1.6 kolab-horde-framework.spec, 1.8, 1.9

[cvs at kolab.org]

Author: thomas

Update of /kolabrepository/server/kolab-horde-framework
In directory doto:/tmp/cvs-serv14170/kolab-horde-framework

Modified Files:
	Makefile kolab-horde-framework.spec 
Log Message:
Adapt Kolab server for OpenPKG-CURRENT
(imported patch "openpkg-current" from 2.2-beta1 release)


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-horde-framework/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile	20 Apr 2007 14:56:10 -0000	1.5
+++ Makefile	17 Jul 2007 15:07:15 -0000	1.6
@@ -4,8 +4,8 @@
 endif
 
 PACKAGE = kolab-horde-framework
-VERSION = 2.1.0
-RELEASE = 20070420
+VERSION = 2.1.99
+RELEASE = 20070607
 KOLABRELEASE = $(RELEASE)
 PEARVERSION = 1.3
 

Index: kolab-horde-framework.spec
===================================================================
RCS file: /kolabrepository/server/kolab-horde-framework/kolab-horde-framework.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- kolab-horde-framework.spec	20 Apr 2007 14:56:10 -0000	1.8
+++ kolab-horde-framework.spec	17 Jul 2007 15:07:15 -0000	1.9
@@ -1,6 +1,6 @@
 # Versions
 %define		V_php_horde_pear 1.3
-%define		V_kolab_horde   2.1.0
+%define		V_kolab_horde   2.1.99
 
 # Package Information
 Name:		kolab-horde-framework
@@ -8,7 +8,7 @@
 URL:		http://www.kolab.org/
 Packager:	Steffen Hansen <steffen at klaralvdalens-datakonsult.se> (Klaraelvdalens Datakonsult AB)
 Version:	%{V_kolab_horde}
-Release:	20070420
+Release:	20070607
 Class:		JUNK
 License:	GPL
 Group:		MAIL
@@ -21,8 +21,8 @@
 # Build Info
 Prefix:		%{l_prefix}
 BuildRoot:	%{l_buildroot}
-BuildPreReq:	apache, php, php::with_pear = yes
-PreReq:		kolabd >= 2.1.0-20070420, apache, php, php::with_pear = yes
+BuildPreReq:	php, php::with_pear = yes
+PreReq:		kolabd >= 2.1.99-20070607
 AutoReq:      no
 AutoReqProv:  no
 #BuildArch:    noarch