Explorar el Código

'mm' is just a sub-part of the 'session' extension and 'session' even could be used without 'mm', so (re)introduce 'with_session' option

Ralf S. Engelschall hace 18 años
padre
commit
448a032936
Se han modificado 2 ficheros con 17 adiciones y 3 borrados
  1. 8 1
      apache-php/apache-php.spec
  2. 9 2
      php/php.spec

+ 8 - 1
apache-php/apache-php.spec

@@ -77,6 +77,7 @@ Release:      20071221
 %option       with_pear                 no
 %option       with_pgsql                no
 %option       with_sendmail             no
+%option       with_session              no
 %option       with_simplexml            no
 %option       with_snmp                 no
 %option       with_sqlite               no
@@ -88,6 +89,10 @@ Release:      20071221
 %option       with_zlib                 no
 
 #   fixing implicit extension dependencies and correlations
+%if "%{with_mm}" == "yes"
+%undefine     with_session
+%define       with_session       yes
+%endif
 %if "%{with_pear}" == "yes"
 %undefine     with_xml
 %define       with_xml           yes
@@ -428,9 +433,11 @@ AutoReqProv:  no
 %if "%{with_openldap}" == "yes"
         --with-ldap=%{l_prefix} \
 %endif
+%if "%{with_session}" == "yes"
+        --enable-session \
+%endif
 %if "%{with_mm}" == "yes"
         --with-mm=%{l_prefix} \
-        --enable-session \
 %endif
 %if "%{with_pcre}" == "yes"
         --with-pcre-regex=%{l_prefix} \

+ 9 - 2
php/php.spec

@@ -40,7 +40,7 @@ Class:        BASE
 Group:        Language
 License:      PHP
 Version:      %{V_php}
-Release:      20071209
+Release:      20071221
 
 #   package options
 %option       with_suhosin              no
@@ -77,6 +77,7 @@ Release:      20071209
 %option       with_pear                 no
 %option       with_pgsql                no
 %option       with_sendmail             no
+%option       with_session              no
 %option       with_simplexml            no
 %option       with_snmp                 no
 %option       with_sqlite               no
@@ -88,6 +89,10 @@ Release:      20071209
 %option       with_zlib                 no
 
 #   fixing implicit extension dependencies and correlations
+%if "%{with_mm}" == "yes"
+%undefine     with_session
+%define       with_session       yes
+%endif
 %if "%{with_pear}" == "yes"
 %undefine     with_xml
 %define       with_xml           yes
@@ -424,9 +429,11 @@ AutoReqProv:  no
 %if "%{with_openldap}" == "yes"
         --with-ldap=%{l_prefix} \
 %endif
+%if "%{with_session}" == "yes"
+        --enable-session \
+%endif
 %if "%{with_mm}" == "yes"
         --with-mm=%{l_prefix} \
-        --enable-session \
 %endif
 %if "%{with_pcre}" == "yes"
         --with-pcre-regex=%{l_prefix} \