implicitly set 'with_imap=yes' when 'with_imap_annotate=yes' is being set

apache-php/apache-php.spec

@@ -39,7 +39,7 @@ Class:        BASE
 Group:        Web
 License:      PHP
 Version:      %{V_php}
-Release:      20070702
+Release:      20070724
 
 #   package options
 %option       with_suhosin              no
@@ -96,6 +96,10 @@ Release:      20070702
 %undefine     with_gd
 %define       with_gd            yes
 %endif
+%if "%{with_imap_annotate}" == "yes"
+%undefine     with_imap
+%define       with_imap          yes
+%endif
 %if "%{with_mysql}" == "yes" || "%{with_gd}" == "yes" || "%{with_dom}" == "yes"
 %undefine     with_zlib
 %define       with_zlib          yes
@@ -194,11 +198,11 @@ PreReq:       libiconv
 %if "%{with_imap}" == "yes"
 BuildPreReq:  imap, openssl
 PreReq:       imap, openssl
-%endif
 %if "%{with_imap_annotate}" == "yes"
 BuildPreReq:  imap::with_annotate = yes
 PreReq:       imap::with_annotate = yes
 %endif
+%endif
 %if "%{with_xml}" == "yes"
 BuildPreReq:  libxml
 PreReq:       libxml

php/php.spec

@@ -39,7 +39,7 @@ Class:        BASE
 Group:        Language
 License:      PHP
 Version:      %{V_php}
-Release:      20070601
+Release:      20070724
 
 #   package options
 %option       with_suhosin              no
@@ -96,6 +96,10 @@ Release:      20070601
 %undefine     with_gd
 %define       with_gd            yes
 %endif
+%if "%{with_imap_annotate}" == "yes"
+%undefine     with_imap
+%define       with_imap          yes
+%endif
 %if "%{with_mysql}" == "yes" || "%{with_gd}" == "yes" || "%{with_dom}" == "yes"
 %undefine     with_zlib
 %define       with_zlib          yes
@@ -191,11 +195,11 @@ PreReq:       libiconv
 %if "%{with_imap}" == "yes"
 BuildPreReq:  imap, openssl
 PreReq:       imap, openssl
-%endif
 %if "%{with_imap_annotate}" == "yes"
 BuildPreReq:  imap::with_annotate = yes
 PreReq:       imap::with_annotate = yes
 %endif
+%endif
 %if "%{with_xml}" == "yes"
 BuildPreReq:  libxml
 PreReq:       libxml