thomas: server/kolabd/kolabd configure.ac, 1.9, 1.10 kolabd.spec.in, 1.10, 1.11

cvs at kolab.org cvs at kolab.org
Tue Jul 17 17:07:17 CEST 2007


Author: thomas

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv14170/kolabd/kolabd

Modified Files:
	configure.ac kolabd.spec.in 
Log Message:
Adapt Kolab server for OpenPKG-CURRENT
(imported patch "openpkg-current" from 2.2-beta1 release)


Index: configure.ac
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/configure.ac,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- configure.ac	17 Apr 2007 14:44:36 -0000	1.9
+++ configure.ac	17 Jul 2007 15:07:15 -0000	1.10
@@ -1,7 +1,7 @@
 AC_PREREQ(2.59)
 
 # not the real version
-m4_define(_VERSION,2.1.0)
+m4_define(_VERSION,2.1.99)
 AC_INIT([kolabd],[_VERSION],[kolab-devel at kolab.org])
 AC_CONFIG_AUX_DIR(.)
 

Index: kolabd.spec.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.spec.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- kolabd.spec.in	3 Jul 2007 16:35:46 -0000	1.10
+++ kolabd.spec.in	17 Jul 2007 15:07:15 -0000	1.11
@@ -26,7 +26,7 @@
 
 #   package version
 %define       V_ei_maj 2.1
-%define       V_ei_min 0
+%define       V_ei_min 99
 
 #   package information
 Name:         kolabd
@@ -48,16 +48,23 @@
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 2.5.0
-PreReq:       OpenPKG, openpkg >= 2.5.0, openldap >= 2.3.29, imapd, sasl, apache, proftpd, perl, perl-ldap, perl-mail
-PreReq:       sasl >= 2.1.19-2.2.0, sasl::with_ldap = yes, sasl::with_login = yes
-PreReq:       proftpd >= 1.2.10-2.2.0, proftpd::with_ldap = yes
-PreReq:       postfix >= 2.2.5, postfix::with_ldap = yes, postfix::with_sasl = yes, postfix::with_ssl = yes
-PreReq:       imapd >= 2.2.12-2.5.0, imapd::with_group = yes
-PreReq:       apache >= 1.3.33-2.5.0, apache::with_mod_auth_ldap = yes, apache::with_mod_dav = yes, apache::with_mod_php = yes, apache::with_mod_php_gettext = yes, apache::with_mod_php_imap = yes, apache::with_mod_php_openldap = yes, apache::with_mod_php_xml = yes, apache::with_mod_ssl = yes
-PreReq:       perl-kolab >= 5.8.7-20070420, perl-db
-PreReq:	      amavisd >= 2.3.3-2.5.0
-PreReq:	      clamav >= 0.90-20070214
+BuildPreReq:  OpenPKG, openpkg >= 20070603
+PreReq:       OpenPKG, openpkg >= 20070603
+
+PreReq:       postfix, postfix::with_ldap = yes, postfix::with_sasl = yes, postfix::with_ssl = yes
+PreReq:       sasl::with_ldap = yes, sasl::with_login = yes
+PreReq:       amavisd
+PreReq:       clamav >= 0.90
+PreReq:       imap, imap::with_annotate = yes
+PreReq:       php, php::with_zlib = yes, php::with_bdb = yes, php::with_gettext = yes, php::with_imap = yes, php::with_imap_annotate = yes, php::with_openldap = yes, php::with_pear = yes, php::with_xml = yes, php::with_dom = yes, php::with_ssl = yes, php::with_mbstring = yes, php::with_mm = yes
+PreReq:       apache2, apache2::with_mod_dav = yes, apache2::with_mod_ssl = yes, apache2::with_mod_ldap = yes
+PreReq:       apache2-php, apache2-php::with_zlib = yes, apache2-php::with_bdb = yes, apache2-php::with_gettext = yes, apache2-php::with_imap = yes, apache2-php::with_imap_annotate = yes, apache2-php::with_openldap = yes, apache2-php::with_pear = yes, apache2-php::with_xml = yes, apache2-php::with_dom = yes, apache2-php::with_ssl = yes, apache2-php::with_mbstring = yes, apache2-php::with_mm = yes
+PreReq:       imapd, imapd::with_group = yes, imapd::with_group_igncase = yes, imapd::with_ldap = yes, imapd::with_annotate = yes, imapd::with_atvdom = yes, imapd::with_morelogging = yes, imapd::with_kolab = yes
+PreReq:       proftpd, proftpd::with_ldap = yes
+PreReq:       perl-ssl
+PreReq:       perl-www
+PreReq:       perl-ldap
+PreReq:       perl-kolab >= 5.8.8-20070607
 AutoReq:      no
 AutoReqProv:  no
 





More information about the commits mailing list