- added _without_curl and _without_psql bcond.

[packages/php.git] / php.spec

diff --git a/php.spec b/php.spec
index 90ca3a0eeb6b6cb3800b8d2c081c10d2a9c92eec..f4cecf730707f81c8deb6396c405ffa3ed082cfe 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -38,6 +38,9 @@
 # _without_xml         - without XML extension module
 # _without_xmlrpc      - without XML-RPC extension module
 # _without_xslt                - without XSLT extension module
+#
+# _without_curl                - wihtout CURL support 
+# _without_psql                - without PostgreSQL support
 Summary:       The PHP HTML-embedded scripting language for use with Apache
 Summary(fr):   Le langage de script embarque-HTML PHP pour Apache
 Summary(pl):   Jêzyk skryptowy PHP -- u¿ywany wraz z serwerem Apache
@@ -46,7 +49,7 @@ Summary(ru):  PHP 
 Summary(uk):   PHP ÷ÅÒÓ¦§ 4 -- ÍÏ×Á ÐÒÅÐÒÏÃÅÓÕ×ÁÎÎÑ HTML-ÆÁÊ̦×, ×ÉËÏÎÕ×ÁÎÁ ÎÁ ÓÅÒ×ÅÒ¦
 Name:          php
 Version:       4.2.3
-Release:       1
+Release:       3
 Epoch:         3
 Group:         Libraries
 License:       PHP
@@ -64,24 +67,23 @@ Patch2:             %{name}-mysql-socket.patch
 Patch3:                %{name}-mail.patch
 Patch4:                %{name}-link-libs.patch
 Patch5:                %{name}-fastcgi.patch
-#Patch6:               %{name}-no_php_pcre_in_SAPI_c.patch
-Patch7:                %{name}-libpq_fs_h_path.patch
-Patch8:                %{name}-wddx-fix.patch
-Patch9:                %{name}-cpdf-fix.patch
-Patch10:       %{name}-session-fix-shared.patch
-Patch11:       %{name}-hyperwave-fix.patch
-Patch12:       %{name}-openssl-for-ext-only.patch
-Patch13:       %{name}-java-fix.patch
-Patch14:       %{name}-mcal-shared-lib.patch
-Patch15:       %{name}-msession-shared-lib.patch
-Patch16:       %{name}-build_modules.patch
-Patch17:       %{name}-sapi-ini-file.patch
-Patch18:       %{name}-php_iconv_string_declaration.patch
-Patch19:       %{name}-pear-cosmetic.patch
-Patch20:       %{name}-mnogosearch.patch
-Patch21:       %{name}-ini.patch
-Patch22:       %{name}-acam.patch
-Patch23:       %{name}-xmlrpc-fix.patch
+Patch6:                %{name}-libpq_fs_h_path.patch
+Patch7:                %{name}-wddx-fix.patch
+Patch8:                %{name}-cpdf-fix.patch
+Patch9:                %{name}-session-fix-shared.patch
+Patch10:       %{name}-hyperwave-fix.patch
+Patch11:       %{name}-openssl-for-ext-only.patch
+Patch12:       %{name}-java-fix.patch
+Patch13:       %{name}-mcal-shared-lib.patch
+Patch14:       %{name}-msession-shared-lib.patch
+Patch15:       %{name}-build_modules.patch
+Patch16:       %{name}-sapi-ini-file.patch
+Patch17:       %{name}-php_iconv_string_declaration.patch
+Patch18:       %{name}-pear-cosmetic.patch
+Patch19:       %{name}-mnogosearch.patch
+Patch20:       %{name}-ini.patch
+Patch21:       %{name}-acam.patch
+Patch22:       %{name}-xmlrpc-fix.patch
 Icon:          php4.gif
 URL:           http://www.php.net/
 BuildRequires: apache-devel
@@ -90,7 +92,7 @@ BuildRequires:        automake >= 1.4d
 BuildRequires: bison
 BuildRequires: bzip2-devel
 BuildRequires: cracklib-devel >= 2.7-15
-BuildRequires: curl-devel
+%{!?_without_curl:BuildRequires:       curl-devel}
 BuildRequires: cyrus-sasl-devel
 BuildRequires: db3-devel >= 3.1.17
 %if %(expr %{?_without_xml:0}%{!?_without_xml:1} + %{?_without_xmlrpc:0}%{!?_without_xmlrpc:1})
@@ -128,8 +130,8 @@ BuildRequires:      pam-devel
 %{!?_without_pdf:BuildRequires:        pdflib-devel >= 4.0.0}
 BuildRequires: perl
 %{!?_without_msession:BuildRequires:   phoenix-devel}
-BuildRequires: postgresql-devel
-BuildRequires: postgresql-backend-devel >= 7.2
+%{!?_without_psql:BuildRequires:       postgresql-devel}
+%{!?_without_psql:BuildRequires:       postgresql-backend-devel >= 7.2}
 BuildRequires: pspell-devel
 %{!?_without_recode:BuildRequires:     recode-devel >= 3.5d-3}
 BuildRequires: rpm-php-pearprov >= 4.0.2-80
@@ -145,7 +147,8 @@ BuildRequires:      zziplib-devel
 #BuildRequires:        fastcgi-devkit
 # apache 1.3 vs apache 2.0
 %if %{_apache2}
-PreReq:                apache >= 2.0.39
+PreReq:                apache >= 2.0.40
+%requires_eq   apache
 %else
 PreReq:                apache(EAPI) < 2.0.0
 PreReq:                apache(EAPI) >= 1.3.9
@@ -535,6 +538,7 @@ Modu
 Summary:       GD extension module for PHP
 Summary:       Modu³ GD dla PHP
 Group:         Libraries
+%{!?_without_gif:Requires:     gd(gif)}
 PreReq:                %{name}-common = %{version}
 %{!?_without_gif:Provides:     %{name}-gd(gif) = %{epoch}:%{version}}
 
@@ -1247,7 +1251,7 @@ Repozytorium Aplikacji. Ten pakiet zawiera aplikacje potrzebne do
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-#%patch6 -p1
+%patch6 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
@@ -1261,13 +1265,12 @@ Repozytorium Aplikacji. Ten pakiet zawiera aplikacje potrzebne do
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
-%patch20 -p1
 cp php.ini-dist php.ini
-%patch21 -p1
+%patch20 -p1
 # for ac2.53b/am1.6b - AC_LANG_CXX has AM_CONDITIONAL, so cannot be invoked
 # conditionally...
+%patch21 -p1
 %patch22 -p1
-%patch23 -p1
 
 install -d manual
 bzip2 -dc %{SOURCE3} | tar -xf - -C manual
@@ -1325,7 +1328,7 @@ for i in cgi apxs ; do
        --with-bz2=shared \
        %{!?_without_cpdf:--with-cpdflib=shared} \
        --with-crack=shared \
-       --with-curl=shared \
+       %{?_without_curl:--without-curl}%{!?_without_curl:--with-curl=shared} \
        --without-db2 \
        --with-db3 \
        --with-dbase=shared \
@@ -1364,7 +1367,7 @@ for i in cgi apxs ; do
        %{?_without_pcre:--without-pcre-regex}%{!?_without_pcre:--with-pcre-regex=shared} \
        %{!?_without_pdf:--with-pdflib=shared} \
        --with-pear=%{php_pear_dir} \
-       --with-pgsql=shared,/usr \
+       %{?_without_psql:--without-pgsql}%{!?_without_psql:--with-pgsql=shared,/usr} \
        --with-png-dir=shared,/usr \
        --with-pspell=shared \
        %{!?_without_recode:--with-recode=shared} \
@@ -2004,9 +2007,11 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/ctype.so
 
+%if %{!?_without_curl:1}%{?_without_curl:0}
 %files curl
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/curl.so
+%endif
 
 %files dba
 %defattr(644,root,root,755)
@@ -2165,9 +2170,11 @@ fi
 %attr(755,root,root) %{extensionsdir}/pdf.so
 %endif
 
+%if %{!?_without_psql:1}%{?_without_psql:0}
 %files pgsql
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/pgsql.so
+%endif
 
 %files posix
 %defattr(644,root,root,755)