- formatting, no macros in Obsoletes for old packages

[packages/php.git] / php.spec

diff --git a/php.spec b/php.spec
index 66f9b2df3d655f3d052162bb11ed509c83bbe941..f88d098a1a814d719aaab9885b75b91eaf0329d3 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -47,9 +47,11 @@
 %undefine      with_recode
 %undefine      with_mm
 %endif
-# x86-only libs
-%ifnarch %{ix86}
+%ifnarch %{ix86} sparc sparcv9 ppc
 %undefine      with_interbase
+%endif
+# x86-only lib
+%ifnarch %{ix86}
 %undefine      with_msession
 %endif
 %include       /usr/lib/rpm/macros.php
@@ -60,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.6
-%define        _rc     RC2
-Release:       0.%{_rc}
+Version:       4.3.8
+%define        _rc     %{nil}
+Release:       1
 Epoch:         3
 Group:         Libraries
 License:       PHP
 Source0:       http://downloads.php.net/ilia/%{name}-%{version}%{_rc}.tar.bz2
-# Source0-md5: 0bf89373a60f65cd37c1e3e652e278f5
+# Source0-md5: e8ab484fcb94cd2e0d7ecfd0762cfd33
 Source1:       FAQ.%{name}
 Source2:       zend.gif
 Source4:       %{name}-module-install
@@ -106,6 +108,7 @@ Patch27:    %{name}-db-shared.patch
 Patch28:       %{name}-sybase-fix.patch
 Patch29:       %{name}-mssql-fix.patch
 Patch30:       %{name}-lib64.patch
+Patch31:       %{name}-mnogosearch-fix.patch
 Icon:          php4.gif
 URL:           http://www.php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:       Firebird-devel >= 1.0.2.908-2}}
@@ -116,7 +119,7 @@ BuildRequires:      automake >= 1.4d
 BuildRequires: bison
 BuildRequires: bzip2-devel
 BuildRequires: cracklib-devel >= 2.7-15
-%{?with_curl:BuildRequires:    curl-devel >= 7.9.8 }
+%{?with_curl:BuildRequires:    curl-devel >= 7.12.0 }
 BuildRequires: cyrus-sasl-devel
 %{?with_db3:BuildRequires:     db3-devel >= 3.1}
 %{!?with_db3:BuildRequires:    db-devel >= 4.0}
@@ -131,7 +134,7 @@ BuildRequires:      freetds-devel
 %endif
 BuildRequires: freetype-devel >= 2.0
 %{?with_fribidi:BuildRequires: fribidi-devel >= 0.10.4}
-BuildRequires: gd-devel >= 2.0.1
+BuildRequires: gd-devel >= 2.0.20
 %{?with_gif:BuildRequires:     gd-devel(gif)}
 %{!?with_gif:BuildConflicts:   gd-devel(gif)}
 BuildRequires: gdbm-devel
@@ -181,7 +184,7 @@ BuildRequires:      zziplib-devel
 BuildRequires: fcgi-devel
 # apache 1.3 vs apache 2.0
 %if %{_apache2}
-BuildRequires:  apr-devel >= 1:0.9.4-1
+BuildRequires: apr-devel >= 1:0.9.4-1
 PreReq:                apache >= 2.0.40
 Requires:      apache(modules-api) = %{apache_modules_api}
 %else
@@ -312,7 +315,7 @@ Summary(ru):        
 Summary(uk):   â¦Â̦ÏÔÅËÉ ÓЦÌØÎÏÇÏ ×ÉËÏÒÉÓÔÁÎÎÑ ÄÌÑ php
 Group:         Libraries
 Provides:      %{name}-session = %{epoch}:%{version}-%{release}
-Obsoletes:     %{name}-session <= %{epoch}:%{version}-%{release}
+Obsoletes:     php-session <= %{epoch}:%{version}-%{release}
 
 %description common
 Common files needed by both apache module and CGI.
@@ -336,7 +339,7 @@ Summary(ru):        
 Summary(uk):   ðÁËÅÔ ÒÏÚÒÏÂËÉ ÄÌÑ ÐÏÂÕÄÏ×É ÒÏÚÛÉÒÅÎØ PHP4
 Group:         Development/Languages/PHP
 Requires:      %{name}-common = %{epoch}:%{version}
-Obsoletes:     %{name}-pear-devel
+Obsoletes:     php-pear-devel
 
 %description devel
 The php-devel package lets you compile dynamic extensions to PHP.
@@ -390,8 +393,8 @@ Requires(post,preun):       %{name}-common = %{epoch}:%{version}
 Requires:      %{name}-common = %{epoch}:%{version}
 
 %description bzip2
-This is a dynamic shared object (DSO) for PHP that will add
-bzip2 compression support to PHP.
+This is a dynamic shared object (DSO) for PHP that will add bzip2
+compression support to PHP.
 
 %description bzip2 -l pl
 Modu³ PHP umo¿liwiaj±cy u¿ywanie kompresji bzip2.
@@ -577,8 +580,8 @@ Requires(post,preun):       %{name}-common = %{epoch}:%{version}
 Requires:      %{name}-common = %{epoch}:%{version}
 
 %description exif
-This is a dynamic shared object (DSO) for PHP that will add EXIF
-tags support in image files.
+This is a dynamic shared object (DSO) for PHP that will add EXIF tags
+support in image files.
 
 %description exif -l pl
 Modu³ PHP dodaj±cy obs³ugê znaczników EXIF w plikach obrazków.
@@ -652,6 +655,7 @@ Summary(pl):        Modu
 Group:         Libraries
 Requires(post,preun):  %{name}-common = %{epoch}:%{version}
 Requires:      %{name}-common = %{epoch}:%{version}
+Requires:      gd >= 2.0.20
 %{?with_gif:Requires:  gd(gif)}
 %{?with_gif:Provides:  %{name}-gd(gif) = %{epoch}:%{version}-%{release}}
 
@@ -803,8 +807,8 @@ Requires(post,preun):       %{name}-common = %{epoch}:%{version}
 Requires:      %{name}-common = %{epoch}:%{version}
 
 %description mbstring
-This is a dynamic shared object (DSO) for PHP that will add
-multibyte string support.
+This is a dynamic shared object (DSO) for PHP that will add multibyte
+string support.
 
 %description mbstring -l pl
 Modu³ PHP dodaj±cy obs³ugê ci±gów znaków wielobajtowych.
@@ -929,7 +933,8 @@ This is a dynamic shared object (DSO) for PHP that will add MS SQL
 databases support through FreeTDS library.
 
 %description mssql -l pl
-Modu³ PHP dodaj±cy obs³ugê baz danych MS SQL poprzez bibliotekê FreeTDS.
+Modu³ PHP dodaj±cy obs³ugê baz danych MS SQL poprzez bibliotekê
+FreeTDS.
 
 %package mysql
 Summary:       MySQL database module for PHP
@@ -1459,7 +1464,7 @@ Summary(pl):      PEAR - Rozszerzenie PHP i Repozytorium Aplikacji
 Group:         Development/Languages/PHP
 Requires:      %{name}-pcre = %{epoch}:%{version}
 Requires:      %{name}-xml = %{epoch}:%{version}
-Obsoletes:     %{name}-pear-additional_classes
+Obsoletes:     php-pear-additional_classes
 
 %description pear
 PEAR - PHP Extension and Application Repository.
@@ -1517,6 +1522,7 @@ cp php.ini-dist php.ini
 %ifarch amd64
 %patch30 -p1
 %endif
+%patch31 -p1
 
 %build
 CFLAGS="%{rpmcflags} -DEAPI=1 -I/usr/X11R6/include"
@@ -2032,7 +2038,7 @@ fi
 
 %preun mssql
 if [ "$1" = "0" ]; then
-        %{_sbindir}/php-module-install remove mssql %{_sysconfdir}/php.ini
+       %{_sbindir}/php-module-install remove mssql %{_sysconfdir}/php.ini
 fi
 
 %post mysql