Adapt Kolab server for OpenPKG-CURRENT diff --git a/kolab-horde-fbview/Makefile b/kolab-horde-fbview/Makefile --- a/kolab-horde-fbview/Makefile +++ b/kolab-horde-fbview/Makefile @@ -3,8 +3,8 @@ endif endif PACKAGE = kolab-horde-fbview -VERSION = 2.1.0 -RELEASE = 20070420 +VERSION = 2.1.99 +RELEASE = 20070607 KOLABRELEASE = $(RELEASE) RPM = /kolab/bin/openpkg rpm diff --git a/kolab-horde-fbview/kolab-horde-fbview.spec b/kolab-horde-fbview/kolab-horde-fbview.spec --- a/kolab-horde-fbview/kolab-horde-fbview.spec +++ b/kolab-horde-fbview/kolab-horde-fbview.spec @@ -1,5 +1,5 @@ # Versions -%define V_kolab_fbview 2.1.0 +%define V_kolab_fbview 2.1.99 # Package Information Name: kolab-horde-fbview @@ -7,7 +7,7 @@ URL: http://www.kolab.org/ URL: http://www.kolab.org/ Packager: Steffen Hansen (Klaraelvdalens Datakonsult AB) Version: %{V_kolab_fbview} -Release: 20070420 +Release: 20070607 Class: JUNK License: GPL Group: MAIL @@ -19,8 +19,8 @@ Source0: kolab-horde-fbview-%{V_kolab_fb # Build Info Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: apache, php, php::with_pear = yes -PreReq: kolabd >= 2.1.0-20070420, kolab-horde-framework >= 2.1.0-20070420, apache, php, php::with_pear = yes +BuildPreReq: php, php::with_pear = yes +PreReq: kolabd >= 2.1.99-20070607, kolab-horde-framework >= 2.1.99-20070607 AutoReq: no AutoReqProv: no #BuildArch: noarch diff --git a/kolab-horde-fbview/kolab-horde-fbview/fbview/po/translation.php b/kolab-horde-fbview/kolab-horde-fbview/fbview/po/translation.php --- a/kolab-horde-fbview/kolab-horde-fbview/fbview/po/translation.php +++ b/kolab-horde-fbview/kolab-horde-fbview/fbview/po/translation.php @@ -1,4 +1,4 @@ -#!/kolab/bin/php -c /kolab/etc/apache/php.ini +#!/kolab/bin/php -c /kolab/etc/apache2/php.ini (Klaraelvdalens Datakonsult AB) Version: %{V_kolab_horde} -Release: 20070420 +Release: 20070607 Class: JUNK License: GPL Group: MAIL @@ -21,8 +21,8 @@ Source1: kolab-horde-framework-%{V_kolab # 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 diff --git a/kolab-resource-handlers/kolab-resource-handlers/configure.ac b/kolab-resource-handlers/kolab-resource-handlers/configure.ac --- a/kolab-resource-handlers/kolab-resource-handlers/configure.ac +++ b/kolab-resource-handlers/kolab-resource-handlers/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ(2.59) AC_PREREQ(2.59) -m4_define(_VERSION,2.1.0) +m4_define(_VERSION,2.1.99) AC_INIT([kolab-resource-handlers],[_VERSION],[kolab-devel@kolab.org]) AC_CONFIG_AUX_DIR(.) diff --git a/kolab-resource-handlers/kolab-resource-handlers/kolab-resource-handlers.spec.in b/kolab-resource-handlers/kolab-resource-handlers/kolab-resource-handlers.spec.in --- a/kolab-resource-handlers/kolab-resource-handlers/kolab-resource-handlers.spec.in +++ b/kolab-resource-handlers/kolab-resource-handlers/kolab-resource-handlers.spec.in @@ -19,8 +19,8 @@ Source0: kolab-resource-handlers-%{V_kol # Build Info Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: apache, php, php::with_pear = yes -PreReq: kolabd >= 2.1.0-20070420, kolab-horde-framework >= 2.1.0-20070420, apache, php, php::with_pear = yes +BuildPreReq: php, php::with_pear = yes +PreReq: kolabd >= 2.1.99-20070607, kolab-horde-framework >= 2.1.99-20070607 AutoReq: no AutoReqProv: no #BuildArch: noarch diff --git a/kolab-webadmin/kolab-webadmin/configure.ac b/kolab-webadmin/kolab-webadmin/configure.ac --- a/kolab-webadmin/kolab-webadmin/configure.ac +++ b/kolab-webadmin/kolab-webadmin/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ(2.57) AC_PREREQ(2.57) -m4_define(_VERSION,2.1.0) +m4_define(_VERSION,2.1.99) AC_INIT([kolab-webadmin],[_VERSION],[kolab-devel@kolab.org]) AC_CONFIG_SRCDIR(php/admin/include/ldap.class.php) AC_CONFIG_AUX_DIR(.) diff --git a/kolab-webadmin/kolab-webadmin/kolab-webadmin.spec.in b/kolab-webadmin/kolab-webadmin/kolab-webadmin.spec.in --- a/kolab-webadmin/kolab-webadmin/kolab-webadmin.spec.in +++ b/kolab-webadmin/kolab-webadmin/kolab-webadmin.spec.in @@ -41,10 +41,10 @@ Source0: kolab-webadmin-%{version}. # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 2.5.0 -PreReq: OpenPKG, openpkg >= 2.5.0, kolabd >= 2.1.0-20070420 -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_bdb = 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: php-smarty >= 2.6.3 +BuildPreReq: OpenPKG, openpkg >= 20070603 +PreReq: OpenPKG, openpkg >= 20070603 +PreReq: kolabd >= 2.1.99-20070607 +PreReq: php-smarty >= 2.6.18 AutoReq: no AutoReqProv: no diff --git a/kolabd/kolabd/configure.ac b/kolabd/kolabd/configure.ac --- a/kolabd/kolabd/configure.ac +++ b/kolabd/kolabd/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ(2.59) 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@kolab.org]) AC_CONFIG_AUX_DIR(.) diff --git a/kolabd/kolabd/dist_conf/kolab b/kolabd/kolabd/dist_conf/kolab --- a/kolabd/kolabd/dist_conf/kolab +++ b/kolabd/kolabd/dist_conf/kolab @@ -31,7 +31,7 @@ pkgdocdir=${datadir}/doc pkgdocdir=${datadir}/doc # /kolab/bin/perl -V:vendorlib | sed "s/.*'\(.*\)'\;/\1/" -perllib=${libdir}/perl/vendor_perl/5.8.7 +perllib=${libdir}/perl/vendor_perl/5.8.8 amavisd_conffile=${sysconfdir}/amavisd/amavisd.conf amavisd_templatedir=${sysconfdir}/amavisd/templates @@ -145,15 +145,15 @@ webserver_document_root=${localstatedir} webserver_document_root=${localstatedir}/kolab/www webserver_cgidir=${webserver_document_root}/cgi-bin webserver_sessions=${localstatedir}/kolab/httpd_sessions -webserver_logdir=${localstatedir}/apache/log +webserver_logdir=${localstatedir}/apache2/log webserver_acceptlock=${webserver_logdir}/accept.lock webserver_runtime_status=${webserver_logdir}/apache_runtime_status webserver_errorlogfile=${webserver_logdir}/apache-error.log webserver_accesslogfile=${webserver_logdir}/apache-access.log -webserver_confdir=${sysconfdir}/apache -webserver_pidfile=${localstatedir}/apache/run/apache.pid -webserver_mime_magicfile=${sysconfdir}/apache/mime.magic -webserver_mime_typesfile=${sysconfdir}/apache/mime.types +webserver_confdir=${sysconfdir}/apache2 +webserver_pidfile=${localstatedir}/apache2/run/apache2.pid +webserver_mime_magicfile=${sysconfdir}/apache2/mime.magic +webserver_mime_typesfile=${sysconfdir}/apache2/mime.types webserver_sslscache=${webserver_logdir}/ssl_scache webserver_sslmutex=${webserver_logdir}/ssl_mutex # webserver_web_prefix is empty indeed @@ -161,9 +161,9 @@ webserver_musr=kolab webserver_musr=kolab webserver_usr=${kolab_usr} webserver_grp=${kolab_grp} -webserver_rpm=apache - -phpini_dir=${sysconfdir}/apache +webserver_rpm=apache2 + +phpini_dir=${sysconfdir}/apache2 phplibdir=${libdir}/php phplibdir2=${kolab_statedir}/php phppeardir=${phplibdir2}/pear diff --git a/kolabd/kolabd/kolabd.spec.in b/kolabd/kolabd/kolabd.spec.in --- a/kolabd/kolabd/kolabd.spec.in +++ b/kolabd/kolabd/kolabd.spec.in @@ -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 @@ Source0: kolabd-%{version}.tar.bz2 # 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 diff --git a/perl-kolab/Kolab-Conf/Conf.pm.in b/perl-kolab/Kolab-Conf/Conf.pm.in --- a/perl-kolab/Kolab-Conf/Conf.pm.in +++ b/perl-kolab/Kolab-Conf/Conf.pm.in @@ -328,8 +328,8 @@ sub build { $Kolab::haschanged{'postfix'} = 1; } elsif ($cfg =~ /saslauthd/) { $Kolab::haschanged{'saslauthd'} = 1; - } elsif ($cfg =~ /apache/) { - $Kolab::haschanged{'apache'} = 1; + } elsif ($cfg =~ /apache2/) { + $Kolab::haschanged{'apache2'} = 1; } elsif ($cfg =~ /proftpd/) { $Kolab::haschanged{'proftpd'} = 1; } elsif ($cfg =~ /openldap/) { diff --git a/perl-kolab/configure.ac b/perl-kolab/configure.ac --- a/perl-kolab/configure.ac +++ b/perl-kolab/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ(2.59) AC_PREREQ(2.59) -m4_define(_VERSION,5.8.7) +m4_define(_VERSION,5.8.8) AC_INIT([perl-kolab],[_VERSION],[kolab-devel@kolab.org]) AC_CONFIG_AUX_DIR(.) diff --git a/php-smarty/Makefile b/php-smarty/Makefile --- a/php-smarty/Makefile +++ b/php-smarty/Makefile @@ -1,8 +1,8 @@ RPM = /kolab/bin/openpkg rpm RPM = /kolab/bin/openpkg rpm NAME = Smarty PACKAGE = php-smarty -VERSION = 2.6.10 -RELEASE = 20051003 +VERSION = 2.6.18 +RELEASE = 20070607 KOLABRELEASE = $(RELEASE) ifeq "x$(KOLABRPMSRC)" "x" diff --git a/php-smarty/php-smarty.spec b/php-smarty/php-smarty.spec --- a/php-smarty/php-smarty.spec +++ b/php-smarty/php-smarty.spec @@ -1,14 +1,14 @@ # Versions -%define V_php 4.3.11 -%define V_Smarty 2.6.10 +%define V_php 5.2.3 +%define V_Smarty 2.6.18 # Package Information Name: php-smarty Summary: Template engine for PHP URL: http://smarty.php.net/ Packager: Steffen Hansen (Klaraelvdalens Datakonsult AB) -Version: 2.6.10 -Release: 20051003 +Version: 2.6.18 +Release: 20070607 Class: JUNK License: LGPL Group: Languages @@ -20,8 +20,6 @@ Source0: http://smarty.php.net/distribut # Build Info Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: apache >= 1.2.29 -PreReq: apache >= 1.2.29 AutoReq: no AutoReqProv: no #BuildArch: noarch