|
@@ -84,7 +84,6 @@
|
|
|
%{!?with_mod_php3_jpeg: %define with_mod_php3_jpeg no}
|
|
%{!?with_mod_php3_jpeg: %define with_mod_php3_jpeg no}
|
|
|
%{!?with_mod_php3_mysql: %define with_mod_php3_mysql no}
|
|
%{!?with_mod_php3_mysql: %define with_mod_php3_mysql no}
|
|
|
%{!?with_mod_php3_openssl: %define with_mod_php3_openssl no}
|
|
%{!?with_mod_php3_openssl: %define with_mod_php3_openssl no}
|
|
|
-%{!?with_mod_php3_pdflib: %define with_mod_php3_pdflib no}
|
|
|
|
|
%{!?with_mod_php3_zlib: %define with_mod_php3_zlib no}
|
|
%{!?with_mod_php3_zlib: %define with_mod_php3_zlib no}
|
|
|
|
|
|
|
|
# fixing implicit inter-module dependencies and correlations
|
|
# fixing implicit inter-module dependencies and correlations
|
|
@@ -109,7 +108,7 @@ exit 1
|
|
|
%if "%{with_mod_ssl}" == "yes"
|
|
%if "%{with_mod_ssl}" == "yes"
|
|
|
%define with_mod_php3_openssl yes
|
|
%define with_mod_php3_openssl yes
|
|
|
%endif
|
|
%endif
|
|
|
-%if "%{with_mod_php3_mysql}" == "yes" || "%{with_mod_php3_pdflib}" == "yes"
|
|
|
|
|
|
|
+%if "%{with_mod_php3_mysql}" == "yes"
|
|
|
%define with_mod_php3_zlib yes
|
|
%define with_mod_php3_zlib yes
|
|
|
%endif
|
|
%endif
|
|
|
%endif
|
|
%endif
|
|
@@ -142,7 +141,7 @@ Distribution: OpenPKG [REL]
|
|
|
Group: Web
|
|
Group: Web
|
|
|
License: ASF
|
|
License: ASF
|
|
|
Version: %{V_apache}
|
|
Version: %{V_apache}
|
|
|
-Release: 20020723
|
|
|
|
|
|
|
+Release: 20020731
|
|
|
|
|
|
|
|
# list of sources
|
|
# list of sources
|
|
|
Source0: http://www.apache.org/dist/httpd/apache_%{V_apache}.tar.gz
|
|
Source0: http://www.apache.org/dist/httpd/apache_%{V_apache}.tar.gz
|
|
@@ -241,9 +240,6 @@ BuildPreReq: mysql
|
|
|
%if "%{with_mod_php3_openssl}" == "yes"
|
|
%if "%{with_mod_php3_openssl}" == "yes"
|
|
|
BuildPreReq: openssl
|
|
BuildPreReq: openssl
|
|
|
%endif
|
|
%endif
|
|
|
-%if "%{with_mod_php3_pdflib}" == "yes"
|
|
|
|
|
-BuildPreReq: pdflib
|
|
|
|
|
-%endif
|
|
|
|
|
%if "%{with_mod_php3_zlib}" == "yes"
|
|
%if "%{with_mod_php3_zlib}" == "yes"
|
|
|
BuildPreReq: zlib
|
|
BuildPreReq: zlib
|
|
|
%endif
|
|
%endif
|
|
@@ -292,7 +288,6 @@ AutoReqProv: no
|
|
|
with_mod_php3_jpeg %{with_mod_php3_jpeg}
|
|
with_mod_php3_jpeg %{with_mod_php3_jpeg}
|
|
|
with_mod_php3_mysql %{with_mod_php3_mysql}
|
|
with_mod_php3_mysql %{with_mod_php3_mysql}
|
|
|
with_mod_php3_openssl %{with_mod_php3_openssl}
|
|
with_mod_php3_openssl %{with_mod_php3_openssl}
|
|
|
- with_mod_php3_pdflib %{with_mod_php3_pdflib}
|
|
|
|
|
with_mod_php3_zlib %{with_mod_php3_zlib}
|
|
with_mod_php3_zlib %{with_mod_php3_zlib}
|
|
|
|
|
|
|
|
%prep
|
|
%prep
|
|
@@ -532,9 +527,6 @@ AutoReqProv: no
|
|
|
%if "%{with_mod_php3_zlib}" == "yes"
|
|
%if "%{with_mod_php3_zlib}" == "yes"
|
|
|
--with-zlib=%{l_prefix} \
|
|
--with-zlib=%{l_prefix} \
|
|
|
%endif
|
|
%endif
|
|
|
-%if "%{with_mod_php3_pdflib}" == "yes"
|
|
|
|
|
- --with-pdflib=%{l_prefix} \
|
|
|
|
|
-%endif
|
|
|
|
|
%if "%{with_mod_php3_jpeg}" == "yes"
|
|
%if "%{with_mod_php3_jpeg}" == "yes"
|
|
|
--with-jpeg=${prefix} \
|
|
--with-jpeg=${prefix} \
|
|
|
%endif
|
|
%endif
|