This commit was manufactured by cvs2git to create branch 'RA-

[packages/php.git] / php.spec

diff --git a/php.spec b/php.spec
index 7ae8f2dabd121d600659dd97af80cd950d3eb52b..211ffb304296d32c28af196be5d3c327a74a9b7f 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -4,19 +4,19 @@
 #   (any crash reports related to session modules?)
 #
 # Conditional build:
-%bcond_without db3             # do not use db3 packages instead of db (4.x) for Berkeley DB support
 %bcond_with    fdf             # with FDF (PDF forms) module           (BR:proprietary lib)
+%bcond_with    fribidi         # with FriBiDi extension module
+%bcond_with    interbase       # with InterBase extension module
 %bcond_with    interbase_inst  # use InterBase install., not Firebird  (BR:proprietary libs)
 %bcond_with    java            # with Java extension module            (BR:jdk)
 %bcond_with    oci8            # with Oracle oci8 extension module     (BR:proprietary libs)
 %bcond_with    oracle          # with oracle extension module          (BR:proprietary libs)
+%bcond_with    qtdom           # with QT DOM extension module
 %bcond_without cpdf            # without cpdf extension module
 %bcond_without curl            # without CURL extension module
+%bcond_without db3             # use db packages instead of db3 (3.x) for Berkeley DB support
 %bcond_without domxslt         # without DOM XSLT/EXSLT support in DOM XML extension module
-%bcond_with    fribidi         # with FriBiDi extension module
-%bcond_without gif             # build GD extension module with gd library without GIF support
 %bcond_without imap            # without IMAP extension module
-%bcond_with    interbase       # with InterBase extension module
 %bcond_without ldap            # without LDAP extension module
 %bcond_without mhash           # without mhash extension module
 %bcond_without ming            # without ming extension module
@@ -31,7 +31,6 @@
 %bcond_without pgsql           # without PostgreSQL extension module
 %bcond_without pspell          # without pspell extension module
 %bcond_without recode          # without recode extension module
-%bcond_with    qtdom           # with QT DOM extension module
 %bcond_without snmp            # without SNMP extension module
 %bcond_without sybase          # without Sybase and Sybase-CT extension modules
 %bcond_without wddx            # without WDDX extension module
@@ -63,14 +62,14 @@ Summary(pt_BR):     A linguagem de script PHP
 Summary(ru):   PHP ÷ÅÒÓÉÉ 4 -- ÑÚÙË ÐÒÅÐÒÏÃÅÓÓÉÒÏ×ÁÎÉÑ HTML-ÆÁÊÌÏ×, ×ÙÐÏÌÎÑÅÍÙÊ ÎÁ ÓÅÒ×ÅÒÅ
 Summary(uk):   PHP ÷ÅÒÓ¦§ 4 -- ÍÏ×Á ÐÒÅÐÒÏÃÅÓÕ×ÁÎÎÑ HTML-ÆÁÊ̦×, ×ÉËÏÎÕ×ÁÎÁ ÎÁ ÓÅÒ×ÅÒ¦
 Name:          php
-Version:       4.3.8
+Version:       4.3.10
 %define        _rc     %{nil}
 Release:       0.1
 Epoch:         3
 Group:         Libraries
 License:       PHP
-Source0:       http://downloads.php.net/ilia/%{name}-%{version}%{_rc}.tar.bz2
-# Source0-md5: e8ab484fcb94cd2e0d7ecfd0762cfd33
+Source0:       http://www.php.net/distributions/%{name}-%{version}%{_rc}.tar.bz2
+# Source0-md5: 7e56824dae9679c59a8234eb848aa542
 Source1:       FAQ.%{name}
 Source2:       zend.gif
 Source3:       %{name}-module-install
@@ -108,14 +107,14 @@ Patch25:  %{name}-no_pear_install.patch
 Patch26:       %{name}-zlib.patch
 Patch27:       %{name}-db-shared.patch
 Patch28:       %{name}-sybase-fix.patch
-Patch29:       %{name}-mssql-fix.patch
 Patch30:       %{name}-lib64.patch
 Patch31:       %{name}-mnogosearch-fix.patch
+Patch32:       %{name}-gd_imagerotate_enable.patch
 Icon:          php4.gif
 URL:           http://www.php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:       Firebird-devel >= 1.0.2.908-2}}
 BuildRequires: apache-devel
-%{?with_pspell:BuildRequires:  aspell-devel >= 2:0.50.0}
+%{?with_pspell:BuildRequires:  aspell-devel >= 2:0.33.7}
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake >= 1.4d
 BuildRequires: bison
@@ -136,9 +135,8 @@ BuildRequires:      freetds-devel
 %endif
 BuildRequires: freetype-devel >= 2.0
 %{?with_fribidi:BuildRequires: fribidi-devel >= 0.10.4}
-BuildRequires: gd-devel >= 2.0.1
-%{?with_gif:BuildRequires:     gd-devel(gif)}
-%{!?with_gif:BuildConflicts:   gd-devel(gif)}
+BuildRequires: gd-devel >= 2.0.28-1.3
+BuildRequires: gd-devel(gif)
 BuildRequires: gdbm-devel
 BuildRequires: gmp-devel
 %{?with_imap:BuildRequires:    imap-devel >= 1:2001-0.BETA.200107022325.2 }
@@ -656,9 +654,9 @@ Summary(pl):        Modu
 Group:         Libraries
 Requires(post,preun):  %{name}-common = %{epoch}:%{version}
 Requires:      %{name}-common = %{epoch}:%{version}
-Requires:      gd >= 2.0.1
-%{?with_gif:Requires:  gd(gif)}
-%{?with_gif:Provides:  %{name}-gd(gif) = %{epoch}:%{version}-%{release}}
+Requires:      gd >= 2.0.28-1.3
+Requires:      gd(gif)
+Provides:      %{name}-gd(gif) = %{epoch}:%{version}-%{release}
 
 %description gd
 This is a dynamic shared object (DSO) for PHP that will add GD
@@ -1465,6 +1463,7 @@ Summary(pl):      PEAR - Rozszerzenie PHP i Repozytorium Aplikacji
 Group:         Development/Languages/PHP
 Requires:      %{name}-pcre = %{epoch}:%{version}
 Requires:      %{name}-xml = %{epoch}:%{version}
+Obsoletes:     php-pear-additional_classes <= 4.3
 
 %description pear
 PEAR - PHP Extension and Application Repository.
@@ -1552,11 +1551,11 @@ cp php.ini-dist php.ini
 %patch26 -p1
 %patch27 -p1
 %patch28 -p1
-%patch29 -p1
 %ifarch amd64
 %patch30 -p1
 %endif
-%patch31 -p1
+#%patch31 -p1
+%patch32 -p1
 
 %build
 CFLAGS="%{rpmcflags} -DEAPI=1 -I%{_prefix}/X11R6/include"