gunnar: server/kolabd/kolabd kolabd.spec.in,1.17,1.18

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	kolabd.spec.in 
Log Message:
OpenPKG renamed the package back to apache.

Index: kolabd.spec.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.spec.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- kolabd.spec.in	27 Aug 2007 19:11:49 -0000	1.17
+++ kolabd.spec.in	11 Oct 2007 15:14:53 -0000	1.18
@@ -59,16 +59,16 @@
 PreReq:       amavisd
 PreReq:       clamav >= 0.90
 PreReq:       imap, imap::with_annotate = yes
-PreReq:       apache2, apache2::with_mod_dav = yes, apache2::with_mod_ssl = yes, apache2::with_mod_ldap = yes
+PreReq:       apache, apache::with_mod_dav = yes, apache::with_mod_ssl = yes, apache::with_mod_ldap = yes
 
 %if "%{with_horde}" == "yes"
 # FIXME (optional)
 # what about php::with_tidy = yes (for Horde Imp)
 PreReq:       php, php::with_pear = yes, php::with_gettext = yes, php::with_dom = yes, php::with_mcrypt = yes, php::with_iconv = yes, php::with_mbstring = yes, php::with_mbregex = yes, php::with_gd = yes, php::with_imap = yes, php::with_ssl = yes, php::with_ctype = yes, php::with_openldap = yes, php::with_mhash = yes, php::with_zlib = yes, php::with_bdb = yes, php::with_imap_annotate = yes, php::with_pear = yes, php::with_xml = yes, php::with_mm = yes
-PreReq:       apache2-php, apache2-php::with_gettext = yes, apache2-php::with_dom = yes, apache2-php::with_mcrypt = yes, apache2-php::with_iconv = yes, apache2-php::with_mbstring = yes, apache2-php::with_mbregex = yes, apache2-php::with_gd = yes, apache2-php::with_imap = yes, apache2-php::with_ssl = yes, apache2-php::with_ctype = yes, apache2-php::with_openldap = yes, apache2-php::with_mhash = yes, apache2-php::with_zlib = yes, apache2-php::with_bdb = yes, apache2-php::with_imap_annotate = yes, apache2-php::with_pear = yes, apache2-php::with_xml = yes, apache2-php::with_mm = yes
+PreReq:       apache-php, apache-php::with_gettext = yes, apache-php::with_dom = yes, apache-php::with_mcrypt = yes, apache-php::with_iconv = yes, apache-php::with_mbstring = yes, apache-php::with_mbregex = yes, apache-php::with_gd = yes, apache-php::with_imap = yes, apache-php::with_ssl = yes, apache-php::with_ctype = yes, apache-php::with_openldap = yes, apache-php::with_mhash = yes, apache-php::with_zlib = yes, apache-php::with_bdb = yes, apache-php::with_imap_annotate = yes, apache-php::with_pear = yes, apache-php::with_xml = yes, apache-php::with_mm = yes
 %else
 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-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:       apache-php, apache-php::with_zlib = yes, apache-php::with_bdb = yes, apache-php::with_gettext = yes, apache-php::with_imap = yes, apache-php::with_imap_annotate = yes, apache-php::with_openldap = yes, apache-php::with_pear = yes, apache-php::with_xml = yes, apache-php::with_dom = yes, apache-php::with_ssl = yes, apache-php::with_mbstring = yes, apache-php::with_mm = yes
 %endif
 
 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