new OpenPKG world order: upgrade from Apache 1.3 to 2.2 (part 2/3: modified dependency packages)

axkit/axkit.spec

@@ -61,7 +61,7 @@ Class:        EVAL
 Group:        Web
 License:      GPL/Artistic
 Version:      %{V_axkit}
-Release:      20070311
+Release:      20070622
 
 #   list of sources
 Source0:      http://www.apache.org/dist/xml/axkit/AxKit-%{V_axkit}.tar.gz
@@ -96,8 +96,8 @@ Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20040130, perl, perl-openpkg
 PreReq:       OpenPKG, openpkg >= 20040130, perl
-BuildPreReq:  apache::with_mod_perl = yes, perl-apache
-PreReq:       apache::with_mod_perl = yes, perl-apache
+BuildPreReq:  apache-perl, perl-apache
+PreReq:       apache-perl, perl-apache
 BuildPreReq:  perl-crypto, perl-comp, perl-ldap, perl-time
 PreReq:       perl-crypto, perl-comp, perl-ldap, perl-time
 BuildPreReq:  perl-xml::with_sablotron = yes

drupal/drupal.spec

@@ -105,7 +105,7 @@ Class:        PLUS
 Group:        CMS
 License:      GPL
 Version:      %{V_drupal}
-Release:      20070418
+Release:      20070622
 
 #   list of sources
 Source0:      http://ftp.osuosl.org/pub/drupal/files/projects/drupal-%{V_drupal}.tar.gz
@@ -188,13 +188,13 @@ BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20060823
 PreReq:       OpenPKG, openpkg >= 20060823
 PreReq:       apache, pcre
-PreReq:       apache::with_mod_php = yes
-PreReq:       apache::with_mod_php_gd = yes
-PreReq:       apache::with_mod_php_mbstring = yes
-PreReq:       apache::with_mod_php_mm = yes
-PreReq:       apache::with_mod_php_mysql = yes
-PreReq:       apache::with_mod_php_pcre = yes
-PreReq:       apache::with_mod_php_xml = yes
+PreReq:       apache-php
+PreReq:       apache-php::with_gd = yes
+PreReq:       apache-php::with_mbstring = yes
+PreReq:       apache-php::with_mm = yes
+PreReq:       apache-php::with_mysql = yes
+PreReq:       apache-php::with_pcre = yes
+PreReq:       apache-php::with_xml = yes
 PreReq:       pcre::with_utf8
 AutoReq:      no
 AutoReqProv:  no

kolab/kolab.spec

@@ -38,7 +38,7 @@ Class:        EVAL
 Group:        Mail
 License:      GPL
 Version:      20041215
-Release:      20070418
+Release:      20070622
 
 #   package options
 %option       with_genuine   no
@@ -58,7 +58,7 @@ PreReq:       proftpd >= 1.2.9-20031031, proftpd::with_ldap = yes
 PreReq:       gdbm >= 1.8.3-20030213, gdbm::with_ndbm = yes
 PreReq:       postfix >= 2.0.16-20031028, postfix::with_ldap = yes, postfix::with_sasl = yes, postfix::with_ssl = yes
 PreReq:       imapd >= 2.2.3-20040202, imapd::with_group = yes
-PreReq:       apache >= 1.3.29-20031124, apache::with_gdbm_ndbm = yes, apache::with_mod_auth_ldap = yes, apache::with_mod_dav = yes, apache::with_mod_php = yes, apache::with_mod_php_gdbm = 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:       apache >= 1.3.29-20031124, apache::with_mod_ldap = yes, apache::with_mod_dav = yes, apache-php, apache-php::with_gdbm = yes, apache-php::with_gettext = yes, apache-php::with_imap = yes, apache-php::with_openldap = yes, apache-php::with_xml = yes, apache::with_mod_ssl = yes
 %if "%{with_genuine}" == "no"
 PreReq:       perl-kolab, perl-db
 %endif

mediawiki/mediawiki.spec

@@ -37,7 +37,7 @@ Class:        EVAL
 Group:        CMS
 License:      GPL
 Version:      %{V_major}.%{V_minor}
-Release:      20070511
+Release:      20070622
 
 #   list of sources
 Source0:      http://download.wikimedia.org/mediawiki/%{V_major}/mediawiki-%{version}.tar.gz
@@ -53,12 +53,12 @@ BuildPreReq:  OpenPKG, openpkg >= 20040130
 PreReq:       OpenPKG, openpkg >= 20040130
 PreReq:       mysql
 PreReq:       apache
-PreReq:       apache::with_mod_php = yes
-PreReq:       apache::with_mod_php_mm = yes
-PreReq:       apache::with_mod_php_xml = yes
-PreReq:       apache::with_mod_php_pcre = yes
-PreReq:       apache::with_mod_php_mysql = yes
-PreReq:       apache::with_mod_php_gd = yes
+PreReq:       apache-php
+PreReq:       apache-php::with_mm = yes
+PreReq:       apache-php::with_xml = yes
+PreReq:       apache-php::with_pcre = yes
+PreReq:       apache-php::with_mysql = yes
+PreReq:       apache-php::with_gd = yes
 PreReq:       pcre, pcre::with_utf8 = yes
 PreReq:       diffutils
 PreReq:       imagemagick

modsurvey/modsurvey.spec

@@ -33,7 +33,7 @@ Class:        EVAL
 Group:        Web
 License:      GPL
 Version:      3.2.4
-Release:      20070418
+Release:      20070622
 
 #   list of sources
 Source0:      http://www.modsurvey.org/download/tarballs/modsurvey-%{version}.tgz
@@ -47,7 +47,7 @@ BuildPreReq:  OpenPKG, openpkg >= 20040130
 PreReq:       OpenPKG, openpkg >= 20040130
 BuildPreReq:  perl, perl-www
 PreReq:       perl, perl-www
-PreReq:       apache, apache::with_mod_perl = yes
+PreReq:       apache, apache-perl
 AutoReq:      no
 AutoReqProv:  no
 

openpkg-registry/openpkg-registry.spec

@@ -33,7 +33,7 @@ Class:        PLUS
 Group:        Bootstrapping
 License:      BSD-style
 Version:      1.1.2
-Release:      20070418
+Release:      20070622
 
 #   package options
 %option       with_client  yes
@@ -52,7 +52,7 @@ PreReq:       OpenPKG, openpkg >= 20060823
 %if "%{with_server}" == "yes"
 PreReq:       perl-dbi::with_dbd_sqlite, perl-dbi::with_dbd_pgsql
 PreReq:       postgresql
-PreReq:       apache::with_mod_perl
+PreReq:       apache-perl
 PreReq:       perl-www >= perl-www-5.8.7-20051031
 PreReq:       perl-xml
 PreReq:       cfg, cfg::with_perl = yes

perl-apache/perl-apache.spec

@@ -51,7 +51,7 @@ Class:        EVAL
 Group:        Perl
 License:      GPL/Artistic
 Version:      %{V_perl}
-Release:      20070526
+Release:      20070622
 
 #   list of sources
 Source0:      http://www.cpan.org/modules/by-module/Apache/Apache-AuthCookie-%{V_apache_authcookie}.tar.gz
@@ -76,8 +76,8 @@ Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20040130, perl >= %{V_perl}, perl-openpkg >= %{V_perl}-20040126
 PreReq:       OpenPKG, openpkg >= 20040130, perl >= %{V_perl}
-BuildPreReq:  apache::with_mod_perl = yes, perl-dbi
-PreReq:       apache::with_mod_perl = yes, perl-dbi
+BuildPreReq:  apache-perl, perl-dbi
+PreReq:       apache-perl, perl-dbi
 AutoReq:      no
 AutoReqProv:  no
 

php-eaccelerator/php-eaccelerator.spec

@@ -37,7 +37,7 @@ Class:        PLUS
 Group:        Language
 License:      GPL
 Version:      %{V_opkg}
-Release:      20070213
+Release:      20070622
 
 #   package options
 %option       with_apache  yes
@@ -54,7 +54,7 @@ PreReq:       OpenPKG, openpkg >= 20040130
 BuildPreReq:  php
 PreReq:       php
 %if "%{with_apache}" == "yes"
-PreReq:       apache, apache::with_mod_php = yes
+PreReq:       apache, apache-php
 %endif
 AutoReq:      no
 AutoReqProv:  no

phpbb/phpbb.spec

@@ -33,7 +33,7 @@ Class:        EVAL
 Group:        CMS
 License:      GPL
 Version:      3.0.RC1
-Release:      20070521
+Release:      20070622
 
 #   list of sources
 Source0:      http://switch.dl.sourceforge.net/phpbb/phpBB-%{version}.tar.bz2
@@ -47,12 +47,12 @@ BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20060823
 PreReq:       OpenPKG, openpkg >= 20060823
 PreReq:       apache
-PreReq:       apache::with_mod_php_gd = yes
-PreReq:       apache::with_mod_php_zlib = yes
-PreReq:       apache::with_mod_php_pcre = yes
-PreReq:       apache::with_mod_php_ftp = yes
-PreReq:       apache::with_mod_php_xml = yes
-PreReq:       apache::with_mod_php_sqlite = yes
+PreReq:       apache-php::with_gd = yes
+PreReq:       apache-php::with_zlib = yes
+PreReq:       apache-php::with_pcre = yes
+PreReq:       apache-php::with_ftp = yes
+PreReq:       apache-php::with_xml = yes
+PreReq:       apache-php::with_sqlite = yes
 PreReq:       pcre, pcre::with_utf8 = yes
 PreReq:       sqlite
 PreReq:       imagemagick

poweradmin/poweradmin.spec

@@ -33,7 +33,7 @@ Class:        EVAL
 Group:        DNS
 License:      QPL
 Version:      1.2.7
-Release:      20061013
+Release:      20070622
 
 #   list of sources
 Source0:      http://switch.dl.sourceforge.net/poweradmin/poweradmin-%{version}.tar.bz2
@@ -45,7 +45,7 @@ Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20040130
 PreReq:       OpenPKG, openpkg >= 20040130
-PreReq:       apache, apache::with_mod_php = yes, apache::with_mod_php_mysql = yes
+PreReq:       apache, apache-php, apache-php::with_mysql = yes
 PreReq:       php, php::with_pear = yes, php::with_mysql = yes
 AutoReq:      no
 AutoReqProv:  no

rt/rt.spec

@@ -44,7 +44,7 @@ Class:        EVAL
 Group:        Ticketing
 License:      GPL
 Version:      %{V_rt}
-Release:      20070611
+Release:      20070622
 
 #   package options
 %option       with_db_sqlite       no
@@ -85,8 +85,8 @@ BuildPreReq:  perl-sys, perl-util, perl-ds, perl-text, perl-apache, perl-module
 PreReq:       perl-sys, perl-util, perl-ds, perl-text, perl-apache, perl-module
 BuildPreReq:  perl-dbi, perl-dbix, perl-mail, perl-www, perl-locale, perl-devel, perl-cache
 PreReq:       perl-dbi, perl-dbix, perl-mail, perl-www, perl-locale, perl-devel, perl-cache
-BuildPreReq:  apache, apache::with_mod_perl = yes
-PreReq:       apache, apache::with_mod_perl = yes
+BuildPreReq:  apache, apache-perl
+PreReq:       apache, apache-perl
 %if "%{with_db_sqlite}" == "yes"
 PreReq:       sqlite, perl-dbi::with_dbd_sqlite = yes
 %endif

squirrelmail/squirrelmail.spec

@@ -51,7 +51,7 @@ Class:        EVAL
 Group:        Mail
 License:      GPL
 Version:      %{V_sqmail}
-Release:      20070510
+Release:      20070622
 
 #   package options
 %option       with_plugins  no
@@ -86,7 +86,7 @@ Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20060823
 PreReq:       OpenPKG, openpkg >= 20060823, imapd, MTA, apache
-PreReq:       apache::with_mod_php = yes, apache::with_mod_php_xml = yes
+PreReq:       apache-php, apache-php::with_xml = yes
 AutoReq:      no
 AutoReqProv:  no
 

sympa/sympa.spec

@@ -33,7 +33,7 @@ Class:        EVAL
 Group:        Mail
 License:      GPL
 Version:      5.3.2
-Release:      20070614
+Release:      20070622
 
 #   list of sources
 Source0:      http://www.sympa.org/distribution/sympa-%{version}.tar.gz
@@ -58,7 +58,7 @@ BuildPreReq:  perl-db, perl-dbi, perl-dbi::with_dbd_mysql = yes
 PreReq:       perl-db, perl-dbi, perl-dbi::with_dbd_mysql = yes
 BuildPreReq:  perl-xml, perl-xml::with_libxml = yes
 PreReq:       perl-xml, perl-xml::with_libxml = yes
-PreReq:       apache, apache::with_mod_fastcgi = yes
+PreReq:       apache, apache-fastcgi = yes
 PreReq:       MTA
 AutoReq:      no
 AutoReqProv:  no

wordpress/wordpress.spec

@@ -46,7 +46,7 @@ Class:        PLUS
 Group:        CMS
 License:      GPL
 Version:      %{V_wordpress}
-Release:      20070621
+Release:      20070622
 
 #   list of sources
 Source0:      http://wordpress.org/wordpress-%{V_wordpress}.tar.gz
@@ -72,10 +72,10 @@ BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20060823, infozip
 PreReq:       OpenPKG, openpkg >= 20060823
 PreReq:       apache, wget
-PreReq:       apache::with_mod_php = yes
-PreReq:       apache::with_mod_php_mysql = yes
-PreReq:       apache::with_mod_php_pcre = yes
-PreReq:       apache::with_mod_php_sendmail = yes
+PreReq:       apache-php
+PreReq:       apache-php::with_mysql = yes
+PreReq:       apache-php::with_pcre = yes
+PreReq:       apache-php::with_sendmail = yes
 AutoReq:      no
 AutoReqProv:  no