OpenPKG CVS Repository
http://www.openpkg.org/cvsweb/cvsweb.cgi
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 29-Aug-2002 16:15:23
Branch: HEAD Handle: 2002082915152101
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
fix mod_php+gd+zlib situation (inter-dependencies)
Summary:
Revision Changes Path
1.82 +13 -13 openpkg-src/apache/apache.spec
1.1439 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
Index: openpkg-src/apache/apache.spec
============================================================
$ cvs diff -u -r1.81 -r1.82 apache.spec
--- openpkg-src/apache/apache.spec 26 Aug 2002 09:39:21 -0000 1.81
+++ openpkg-src/apache/apache.spec 29 Aug 2002 14:15:22 -0000 1.82
@@ -96,22 +96,22 @@
exit 1
%endif
%if "%{with_mod_ssl}" == "yes"
-%define with_mod_php_openssl yes
-%define with_mod_php_mm yes
-%endif
-%if "%{with_mod_php_mysql}" == "yes" || "%{with_mod_php_pdflib}" == "yes"
-%define with_mod_php_zlib yes
+%define with_mod_php_openssl yes
+%define with_mod_php_mm yes
%endif
%if "%{with_mod_php_freetype}" == "yes"
-%define with_mod_php_gd yes
+%define with_mod_php_gd yes
+%endif
+%if "%{with_mod_php_mysql}" == "yes" || "%{with_mod_php_pdflib}" == "yes" ||
"%{with_mod_php_gd}" == "yes"
+%define with_mod_php_zlib yes
%endif
%endif
%if "%{with_mod_php3}" == "yes"
%if "%{with_mod_ssl}" == "yes"
-%define with_mod_php3_openssl yes
+%define with_mod_php3_openssl yes
%endif
%if "%{with_mod_php3_mysql}" == "yes"
-%define with_mod_php3_zlib yes
+%define with_mod_php3_zlib yes
%endif
%endif
@@ -143,7 +143,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20020801
+Release: 20020829
# list of sources
Source0: http://www.apache.org/dist/httpd/apache_%{V_apache}.tar.gz
@@ -272,7 +272,7 @@
--define 'with_mod_perl %{with_mod_perl}' \
--define 'with_mod_php %{with_mod_php}' \
--define 'with_mod_php3 %{with_mod_php3}' \
- --define 'with_mod_ssl %{with_mod_ssl}'
+ --define 'with_mod_ssl %{with_mod_ssl}' \
Options (additional modules II):
--define 'with_mod_access_referer %{with_mod_access_referer}' \
@@ -282,7 +282,7 @@
--define 'with_mod_relocate %{with_mod_relocate}' \
--define 'with_mod_roaming %{with_mod_roaming}' \
--define 'with_mod_throttle %{with_mod_throttle}' \
- --define 'with_mod_zmod %{with_mod_zmod}'
+ --define 'with_mod_zmod %{with_mod_zmod}' \
Options (additional extensions for mod_php):
--define 'with_mod_php_bzip2 %{with_mod_php_bzip2}' \
@@ -305,7 +305,7 @@
--define 'with_mod_php_pdflib %{with_mod_php_pdflib}' \
--define 'with_mod_php_transsid %{with_mod_php_transsid}' \
--define 'with_mod_php_xml %{with_mod_php_xml}' \
- --define 'with_mod_php_zlib %{with_mod_php_zlib}
+ --define 'with_mod_php_zlib %{with_mod_php_zlib}' \
Options (additional extensions for mod_php3):
--define 'with_mod_php3_ftp %{with_mod_php3_ftp}' \
@@ -313,7 +313,7 @@
--define 'with_mod_php3_jpeg %{with_mod_php3_jpeg}' \
--define 'with_mod_php3_mysql %{with_mod_php3_mysql}' \
--define 'with_mod_php3_openssl %{with_mod_php3_openssl}' \
- --define 'with_mod_php3_zlib %{with_mod_php3_zlib}'
+ --define 'with_mod_php3_zlib %{with_mod_php3_zlib}' \
%prep
# unpack Apache distribution
Index: openpkg-web/news.txt
============================================================
$ cvs diff -u -r1.1438 -r1.1439 news.txt
--- openpkg-web/news.txt 29 Aug 2002 13:17:47 -0000 1.1438
+++ openpkg-web/news.txt 29 Aug 2002 14:15:21 -0000 1.1439
@@ -1,3 +1,4 @@
+29-Aug-2002: Upgraded package: P<apache-1.3.26-20020829>
29-Aug-2002: Upgraded package: P<glib2-2.0.6-20020829>
29-Aug-2002: Upgraded package: P<glib-1.2.10-20020829>
29-Aug-2002: Upgraded package: P<imapd-2.1.8-20020829>
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
