OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 28-Oct-2004 17:03:28
Branch: HEAD Handle: 2004102816032700
Modified files:
openpkg-src/apache apache.spec
Log:
backout with_mod_php_gd+with_mod_php_pdflib hack, allowing for both
installation of package and usage of PNG functions (pdflib was
repaired today)
Summary:
Revision Changes Path
1.269 +7 -7 openpkg-src/apache/apache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.268 -r1.269 apache.spec
--- openpkg-src/apache/apache.spec 27 Oct 2004 07:27:11 -0000 1.268
+++ openpkg-src/apache/apache.spec 28 Oct 2004 15:03:27 -0000 1.269
@@ -66,7 +66,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20041027
+Release: 20041028
# package options (suexec related)
%option with_suexec yes
@@ -166,7 +166,7 @@
%undefine with_mod_php_gd
%define with_mod_php_gd yes
%endif
-%if "%{with_mod_php_mysql}" == "yes" || "%{with_mod_php_gd}" == "yes" ||
"%{with_mod_php_dom}" == "yes"
+%if "%{with_mod_php_mysql}" == "yes" || "%{with_mod_php_pdflib}" == "yes" ||
"%{with_mod_php_gd}" == "yes" || "%{with_mod_php_dom}" == "yes"
%undefine with_mod_php_zlib
%define with_mod_php_zlib yes
%endif
@@ -254,8 +254,8 @@
PreReq: db
%endif
%if "%{with_mod_php_pdflib}" == "yes"
-BuildPreReq: pdflib
-PreReq: pdflib
+BuildPreReq: pdflib, jpeg, png
+PreReq: pdflib, jpeg, png
%endif
%if "%{with_mod_php_zlib}" == "yes"
BuildPreReq: zlib
@@ -669,7 +669,7 @@
%if "%{with_mod_ssl}" == "yes"
CFLAGS="$CFLAGS -DEAPI"
%endif
-%if "%{with_mod_php_gd}" == "yes" && "%{with_mod_php_pdflib}" != "yes"
+%if "%{with_mod_php_gd}" == "yes"
LIBS="$LIBS -lpng -lz"
%endif
%if "%{with_mod_php_gettext}" == "yes" || "%{with_mod_php_mssql}" == "yes"
@@ -732,11 +732,9 @@
%endif
%if "%{with_mod_php_gd}" == "yes"
--with-gd=%{l_prefix} \
-%if "%{with_mod_php_pdflib}" != "yes"
--with-jpeg-dir=%{l_prefix} \
--with-png-dir=%{l_prefix} \
%endif
-%endif
%if "%{with_mod_php_freetype}" == "yes"
--enable-gd-imgstrttf \
--enable-gd-native-ttf \
@@ -762,6 +760,8 @@
%endif
%if "%{with_mod_php_pdflib}" == "yes"
--with-pdflib=%{l_prefix} \
+ --with-jpeg-dir=%{l_prefix} \
+ --with-png-dir=%{l_prefix} \
%endif
%if "%{with_mod_php_ssl}" == "yes" || "%{with_mod_php_openldap}" == "yes"
--with-openssl=%{l_prefix} \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
