- merge translations from KSI and adapterize spec file.

Changed files:
    php.spec -> 1.169

diff --git a/php.spec b/php.spec
index 2b27487da1171a32d2c1b863146de44e5775a80e..b7f8bd15a217c258da9ae2a30b7dda5305abb78d 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -35,6 +35,8 @@ 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
 Summary(pt_BR):        A linguagem de script PHP
+Summary(ru):   PHP ÷ÅÒÓÉÉ 4 -- ÑÚÙË ÐÒÅÐÒÏÃÅÓÓÉÒÏ×ÁÎÉÑ HTML-ÆÁÊÌÏ×, ×ÙÐÏÌÎÑÅÍÙÊ ÎÁ ÓÅÒ×ÅÒÅ
+Summary(uk):   PHP ÷ÅÒÓ¦§ 4 -- ÍÏ×Á ÐÒÅÐÒÏÃÅÓÕ×ÁÎÎÑ HTML-ÆÁÊ̦×, ×ÉËÏÎÕ×ÁÎÁ ÎÁ ÓÅÒ×ÅÒ¦
 Name:          php
 Version:       4.2.1
 Release:       6
@@ -56,7 +58,7 @@ Patch2:               %{name}-mysql-socket.patch
 Patch3:                %{name}-mail.patch
 Patch4:                %{name}-link-libs.patch
 Patch5:                %{name}-fastcgi.patch
-Patch6:                %{name}-no_%{name}_pcre_in_SAPI_c.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
@@ -117,7 +119,7 @@ BuildRequires:      perl
 %{!?_without_msession:BuildRequires:   phoenix-devel}
 BuildRequires: pkgconfig
 BuildRequires: postgresql-devel
-BuildRequires:  postgresql-backend-devel >= 7.2
+BuildRequires: postgresql-backend-devel >= 7.2
 BuildRequires: pspell-devel
 %{!?_without_recode:BuildRequires:     recode-devel >= 3.5d-3}
 BuildRequires: rpm-php-pearprov
@@ -172,11 +174,12 @@ non-connerciaux, qui rent facile la creation de pages web liees avec
 des bases de donnees. L'utilisation la plus commune de PHP est
 probablement en remplacement de scripts CGI. Le module mod_php permet
 au serveur web apache de comprendre et de traiter le langage PHP
-integre dans des pages web. Ce package contient PHP version %{version}.
-Si vous utilisez des applications qui utilisent specifiquement PHP/FI,
-vous devrez installer le module PHP/FI inclus dans le package mod_php.
-Si vous debutez avec PHP, vous devriez installer ce package. Vous
-aurez egalement besoin dinstaller le serveur web Apache.
+integre dans des pages web. Ce package contient PHP version
+%{version}. Si vous utilisez des applications qui utilisent
+specifiquement PHP/FI, vous devrez installer le module PHP/FI inclus
+dans le package mod_php. Si vous debutez avec PHP, vous devriez
+installer ce package. Vous aurez egalement besoin dinstaller le
+serveur web Apache.
 
 %description -l pl
 PHP jest jêzykiem skryptowym, którego polecenia umieszcza siê w
@@ -192,6 +195,27 @@ com algumas caracter
 linguagem é permitir que desenvolvedores web escrevam páginas
 dinamicamente geradas de forma rápida.
 
+%description -l ru
+PHP4 - ÜÔÏ ÑÚÙË ÎÁÐÉÓÁÎÉÑ ÓËÒÉÐÔÏ×, ×ÓÔÒÁÉ×ÁÅÍÙÈ × HTML-ËÏÄ. PHP
+ÐÒÅÄÌÁÇÁÅÔ ÉÎÔÅÒÇÒÁÃÉÀ Ó ÍÎÏÖÅÓÔ×ÏÍ óõâä, ÐÏÜÔÏÍÕ ÎÁÐÉÓÁÎÉÅ ÓËÒÉÐÔÏ×
+ÄÌÑ ÒÁÂÏÔÙ Ó ÂÁÚÁÍÉ ÄÁÎÎÙÈ ÏÔÎÏÓÉÔÅÌØÎÏ ÐÒÏÓÔÏ. îÁÉÂÏÌÅÅ ÐÏÐÕÌÑÒÎÏÅ
+ÉÓÐÏÌØÚÏ×ÁÎÉÅ PHP - ÚÁÍÅÎÁ ÄÌÑ CGI ÓËÒÉÐÔÏ×.
+
+üÔÏÔ ÐÁËÅÔ ÓÏÄÅÒÖÉÔ ÓÁÍÏÄÏÓÔÁÔÏÞÎÕÀ (CGI) ×ÅÒÓÉÀ ÉÎÔÅÒÐÒÅÔÁÔÏÒÁ ÑÚÙËÁ.
+÷Ù ÄÏÌÖÎÙ ÔÁËÖÅ ÕÓÔÁÎÏ×ÉÔØ ÐÁËÅÔ %{name}-common. åÓÌÉ ×ÁÍ ÎÕÖÅÎ
+ÉÎÔÅÒÐÒÅÔÁÔÏÒ PHP × ËÁÞÅÓÔ×Å ÍÏÄÕÌÑ apache, ÕÓÔÁÎÏ×ÉÔÅ ÐÁËÅÔ
+apache-php.
+
+%description -l uk
+PHP4 - ÃÅ ÍÏ×Á ÎÁÐÉÓÁÎÎÑ ÓËÒÉÐÔ¦×, ÝÏ ×ÂÕÄÏ×ÕÀÔØÓÑ × HTML-ËÏÄ. PHP
+ÐÒÏÐÏÎÕ¤ ¦ÎÔÅÇÒÁæÀ Ú ÂÁÇÁÔØÍÁ óõâä, ÔÏÍÕ ÎÁÐÉÓÁÎÎÑ ÓËÒÉÐÔ¦× ÄÌÑ
+ÒÏÂÏÔÉ Ú ÂÁÚÁÍÉ ÄÁÎÉÈ ¤ ÄÏ×Ï̦ ÐÒÏÓÔÉÍ. îÁʦÌØÛ ÐÏÐÕÌÑÒÎÅ
+×ÉËÏÒÉÓÔÁÎÎÑ PHP - ÚÁͦÎÁ ÄÌÑ CGI ÓËÒÉÐÔ¦×.
+
+ãÅÊ ÐÁËÅÔ Í¦ÓÔÉÔØ ÓÁÍÏÄÏÓÔÁÔÎÀ (CGI) ×ÅÒÓ¦À ¦ÎÔÅÒÐÒÅÔÁÔÏÒÁ ÍÏ×É. ÷É
+ÍÁ¤ÔÅ ÔÁËÏÖ ×ÓÔÁÎÏ×ÉÔÉ ÐÁËÅÔ %{name}-common. ñËÝÏ ×ÁÍ ÐÏÔÒ¦ÂÅÎ
+¦ÎÔÅÒÐÒÅÔÁÔÏÒ PHP × ÑËÏÓÔ¦ ÍÏÄÕÌÑ apache, ×ÓÔÁÎÏצÔØ ÐÁËÅÔ apache-php.
+
 %package cgi
 Summary:       PHP as CGI program
 Summary(pl):   PHP jako program CGI
@@ -207,6 +231,8 @@ PHP jako program CGI.
 %package common
 Summary:       Common files nneded by both apache module and CGI
 Summary(pl):   Wspólne pliki dla modu³u apacha i programu CGI
+Summary(ru):   òÁÚÄÅÌÑÅÍÙÅ ÂÉÂÌÉÏÔÅËÉ ÄÌÑ php
+Summary(uk):   â¦Â̦ÏÔÅËÉ ÓЦÌØÎÏÇÏ ×ÉËÏÒÉÓÔÁÎÎÑ ÄÌÑ php
 Group:         Libraries
 Provides:      %{name}-session = %{version}
 Obsoletes:     %{name}-session <= %{epoch}:%{version}-%{release}
@@ -217,15 +243,30 @@ Common files needed by both apache module and CGI.
 %description common -l pl
 Wspólne pliki dla modu³u apacha i programu CGI.
 
+%description common -l ru
+üÔÏÔ ÐÁËÅÔ ÓÏÄÅÒÖÉÔ ÏÂÝÉÅ ÆÁÊÌÙ ÄÌÑ ÒÁÚÎÙÈ ×ÁÒÉÁÎÔÏ× ÒÅÁÌÉÚÁÃÉÉ PHP
+(ÓÁÍÏÄÏÓÔÁÔÏÞÎÏÊ É × ËÁÞÅÓÔ×Å ÍÏÄÕÌÑ apache).
+
+%description common -l uk
+ãÅÊ ÐÁËÅÔ Í¦ÓÔÉÔØ ÓЦÌØΦ ÆÁÊÌÉ ÄÌÑ Ò¦ÚÎÉÈ ×ÁÒ¦ÁÎÔ¦× ÒÅÁ̦ÚÁæ§ PHP
+(ÓÁÍÏÄÏÓÔÁÔÎØϧ ÔÁ × ÑËÏÓÔ¦ ÍÏÄÕÌÑ apache).
+
 %package devel
 Summary:       Files for PHP modules development
 Summary(pl):   Pliki do kompilacji modu³ów PHP
 Summary(pt_BR):        Arquivos de desenvolvimento para PHP
+Summary(ru):   ðÁËÅÔ ÒÁÚÒÁÂÏÔËÉ ÄÌÑ ÐÏÓÔÒÏÅÎÉÑ ÒÁÓÛÉÒÅÎÉÊ PHP4
+Summary(uk):   ðÁËÅÔ ÒÏÚÒÏÂËÉ ÄÌÑ ÐÏÂÕÄÏ×É ÒÏÚÛÉÒÅÎØ PHP4
 Group:         Development/Languages/PHP
 Requires:      %{name}-common = %{version}
 
 %description devel
-Files for PHP modules development.
+The php-devel package lets you compile dynamic extensions to PHP.
+Included here is the source for the php extensions. Instead of
+recompiling the whole php binary to add support for, say, oracle,
+install this package and use the new self-contained extensions
+support. For more information, read the file
+SELF-CONTAINED-EXTENSIONS.
 
 %description devel -l pl
 Pliki potrzebne do kompilacji modu³ów PHP.
@@ -234,6 +275,20 @@ Pliki potrzebne do kompilacji modu
 Este pacote contém arquivos usados no desenvolvimento de programas ou
 módulos PHP.
 
+%description devel -l uk
+ðÁËÅÔ php-devel ÄÁ¤ ÍÏÖÌÉצÓÔØ ËÏÍЦÌÀ×ÁÔÉ ÄÉÎÁͦÞΦ ÒÏÚÛÉÒÅÎÎÑ PHP.
+äÏ ÐÁËÅÔÕ ×ËÌÀÞÅÎÏ ×ÉȦÄÎÉÊ ËÏÄ ÄÌÑ ÒÏÚÛÉÒÅÎØ. úÁͦÓÔØ ÐÏ×ÔÏÒÎϧ
+ËÏÍЦÌÑæ§ ¦ÎÁÒÎÏÇÏ ÆÁÊÌÕ php ÄÌÑ ÄÏÄÁÎÎÑ, ÎÁÐÒÉËÌÁÄ, ЦÄÔÒÉÍËÉ
+oracle, ×ÓÔÁÎÏצÔØ ÃÅÊ ÐÁËÅÔ ÄÌÑ ËÏÍЦÌÑæ§ ÏËÒÅÍÉÈ ÒÏÚÛÉÒÅÎØ.
+äÅÔÁÌØΦÛÁ ¦ÎÆÏÒÍÁÃ¦Ñ - × ÆÁÊ̦ SELF-CONTAINED-EXTENSIONS.
+
+%description devel -l ru
+ðÁËÅÔ php-devel ÄÁÅÔ ×ÏÚÍÏÖÎÏÓÔØ ËÏÍÐÉÌÉÒÏ×ÁÔØ ÄÉÎÁÍÉÞÅÓËÉÅ ÒÁÓÛÉÒÅÎÉÑ
+PHP. ðÁËÅÔ ×ËÌÀÞÁÅÔ ÉÓÈÏÄÎÙÊ ËÏÄ ÜÔÉÈ ÒÁÓÛÉÒÅÎÉÊ. ÷ÍÅÓÔÏ ÐÏ×ÔÏÒÎÏÊ
+ËÏÍÐÉÌÑÃÉÉ ÂÉÎÁÒÎÏÇÏ ÆÁÊÌÁ php ÄÌÑ ÄÏÂÁ×ÌÅÎÉÑ, ÎÁÐÒÉÍÅÒ, ÐÏÄÄÅÒÖËÉ
+oracle, ÕÓÔÁÎÏ×ÉÔÅ ÜÔÏÔ ÐÁËÅÔ ÄÌÑ ËÏÍÐÉÌÉÒÏ×ÁÎÉÑ ÏÔÄÅÌØÎÙÈ ÒÁÓÛÉÒÅÎÉÊ.
+ðÏÄÒÏÂÎÏÓÔÉ - × ÆÁÊÌÅ SELF-CONTAINED-EXTENSIONS.
+
 %package doc
 Summary:       Online manual for PHP
 Summary(pl):   Dokumentacja dla PHP
@@ -330,8 +385,8 @@ Group:              Libraries
 PreReq:                %{name}-common = %{version}
 
 %description ctype
-This is a dynamic shared object (DSO) for Apache that will add
-ctype support to PHP.
+This is a dynamic shared object (DSO) for Apache that will add ctype
+support to PHP.
 
 %description crack -l pl
 Modu³ PHP umo¿liwiaj±cy korzystanie z funkcji ctype.
@@ -383,8 +438,8 @@ Group:              Libraries
 PreReq:                %{name}-common = %{version}
 
 %description dbx
-This is a dynamic shared object (DSO) for Apache that will add
-DB abstraction layer to PHP. DBX supports odbc, mysql, pgsql, mssql,
+This is a dynamic shared object (DSO) for Apache that will add DB
+abstraction layer to PHP. DBX supports odbc, mysql, pgsql, mssql,
 fbsql and more.
 
 %description dbx -l pl
@@ -399,8 +454,8 @@ Group:              Libraries
 PreReq:                %{name}-common = %{version}
 
 %description dio
-This is a dynamic shared object (DSO) for Apache that will add
-direct file I/O support to PHP.
+This is a dynamic shared object (DSO) for Apache that will add direct
+file I/O support to PHP.
 
 Warning: this is an experimental module.
 
@@ -672,8 +727,8 @@ Group:              Libraries
 PreReq:                %{name}-common = %{version}
 
 %description mnogosearch
-This is a dynamic shared object (DSO) for Apache that will allow
-you to access mnoGoSearch free search engine in PHP.
+This is a dynamic shared object (DSO) for Apache that will allow you
+to access mnoGoSearch free search engine in PHP.
 
 %description mnogosearch -l pl
 Modu³ PHP dodaj±cy pozwalaj±cy na dostêp do wolnodostêpnego silnika
@@ -686,9 +741,9 @@ Group:              Libraries
 PreReq:                %{name}-common = %{version}
 
 %description msession
-This is a dynamic shared object (DSO) for Apache that will allow
-you to use msession in PHP. msession is a high speed session daemon
-which can run either locally or remotely. It is designed to provide
+This is a dynamic shared object (DSO) for Apache that will allow you
+to use msession in PHP. msession is a high speed session daemon which
+can run either locally or remotely. It is designed to provide
 consistent session management for a PHP web farm.
 
 %description msession -l pl
@@ -870,13 +925,13 @@ Requires: %{name}-pear
 Requires:      %{name}-xml = %{version}
 
 %description pear-additional_classes
-PEAR - PHP Extension and Application Repository.
-Additional classes which can't be found in pear packages.
+PEAR - PHP Extension and Application Repository. Additional classes
+which can't be found in pear packages.
 
 %description pear-additional_classes -l pl
 PEAR (PHP Extension and Application Repository) - Rozszerzenie PHP i
-Repozytorium Aplikacji.
-Dodatkowe klasy, których nie ma w innych pakietach peara.
+Repozytorium Aplikacji. Dodatkowe klasy, których nie ma w innych
+pakietach peara.
 
 %package pear-devel
 Summary:       PEAR - PHP Extension and Application Repository
@@ -889,13 +944,12 @@ Requires: %{name}-pear
 Requires:      %{name}-pear-PEAR-Command
 
 %description pear-devel
-PEAR - PHP Extension and Application Repository.
-This package contains aplications needed to use pear from cvs.
+PEAR - PHP Extension and Application Repository. This package contains
+aplications needed to use pear from cvs.
 
 %description pear-devel -l pl
 PEAR (PHP Extension and Application Repository) - Rozszerzenie PHP i
-Repozytorium Aplikacji.
-Ten pakiet zawiera aplikacje potrzebne do 
+Repozytorium Aplikacji. Ten pakiet zawiera aplikacje potrzebne do
 
 %package pgsql
 Summary:       PostgreSQL database module for PHP
@@ -978,8 +1032,8 @@ Group:             Libraries
 PreReq:                %{name}-common = %{version}
 
 %description shmop
-This is a dynamic shared object (DSO) for Apache that will add
-Shared Memory Operations support to PHP.
+This is a dynamic shared object (DSO) for Apache that will add Shared
+Memory Operations support to PHP.
 
 Warning: this is an experimental module.
 
@@ -1025,8 +1079,8 @@ Group:            Libraries
 PreReq:                %{name}-common = %{version}
 
 %description sybase-ct
-This is a dynamic shared object (DSO) for Apache that will add
-Sybase and MS SQL databases support through CT-lib to PHP.
+This is a dynamic shared object (DSO) for Apache that will add Sybase
+and MS SQL databases support through CT-lib to PHP.
 
 %description sybase-ct -l pl
 Modu³ PHP dodaj±cy obs³ugê baz danych Sybase oraz MS SQL poprzez
@@ -1155,8 +1209,8 @@ Group:            Libraries
 PreReq:                %{name}-common = %{version}
 
 %description zip
-This is a dynamic shared object (DSO) for Apache that will add
-ZZipLib (read-only access to ZIP archives) support to PHP.
+This is a dynamic shared object (DSO) for Apache that will add ZZipLib
+(read-only access to ZIP archives) support to PHP.
 
 %description zip -l pl
 Modu³ PHP umo¿liwiaj±cy korzystanie z bibliotekli ZZipLib
@@ -1214,11 +1268,11 @@ for i in cgi apxs ; do
 %configure \
        `[ $i = cgi ] && echo --enable-discard-path` \
        `[ $i = fastcgi ] && echo --enable-discard-path --with-fastcgi=%{_prefix}` \
-%if %{_apache2}        
+%if %{_apache2}
        `[ $i = apxs ] && echo --with-apxs2=%{_sbindir}/apxs` \
 %else
        `[ $i = apxs ] && echo --with-apxs=%{_sbindir}/apxs` \
-%endif 
+%endif
        --with-config-file-path=%{_sysconfdir} \
        --with-exec-dir=%{_bindir} \
        --%{!?debug:dis}%{?debug:en}able-debug \
@@ -1563,7 +1617,7 @@ fi
 if [ "$1" = "0" ]; then
        %{_sbindir}/php-module-install remove interbase %{_sysconfdir}/php.ini
 fi
-       
+
 %post java
 %{_sbindir}/php-module-install install java %{_sysconfdir}/php.ini