- PreReq -> Requires+Requires(post,preun) for -common (to avoid errors on rpm -e)

- s/_without_psql/_without_pgsql/g
- release 4

Changed files:
    php.spec -> 1.216

diff --git a/php.spec b/php.spec
index 5bf1ad0ca71a91a2f741a9016216290fbe158733..261faa536f00507cea37a6728d104a8164ab7a95 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -36,7 +36,7 @@
 # _without_pcre                - without PCRE extension module
 # _without_pdf         - without PDF extension module
 # _without_pspell      - without pspell extension module
-# _without_psql                - without PostgreSQL extension module
+# _without_pgsql       - without PostgreSQL extension module
 # _without_snmp                - without SNMP extension module
 # _without_recode      - without recode extension module
 # _without_sybase_ct   - without Sybase-CT extension module
@@ -53,7 +53,7 @@ Summary(ru):  PHP 
 Summary(uk):   PHP ÷ÅÒÓ¦§ 4 -- ÍÏ×Á ÐÒÅÐÒÏÃÅÓÕ×ÁÎÎÑ HTML-ÆÁÊ̦×, ×ÉËÏÎÕ×ÁÎÁ ÎÁ ÓÅÒ×ÅÒ¦
 Name:          php
 Version:       4.2.3
-Release:       3
+Release:       4
 Epoch:         3
 Group:         Libraries
 License:       PHP
@@ -135,8 +135,8 @@ BuildRequires:      pam-devel
 %{!?_without_pdf:BuildRequires:        pdflib-devel >= 4.0.0}
 BuildRequires: perl
 %{!?_without_msession:BuildRequires:   phoenix-devel}
-%{!?_without_psql:BuildRequires:       postgresql-devel}
-%{!?_without_psql:BuildRequires:       postgresql-backend-devel >= 7.2}
+%{!?_without_pgsql:BuildRequires:      postgresql-devel}
+%{!?_without_pgsql:BuildRequires:      postgresql-backend-devel >= 7.2}
 %{!?_without_pspell:BuildRequires:     pspell-devel}
 %{!?_without_recode:BuildRequires:     recode-devel >= 3.5d-3}
 BuildRequires: rpm-php-pearprov >= 4.0.2-80
@@ -159,7 +159,7 @@ PreReq:             apache(EAPI) < 2.0.0
 PreReq:                apache(EAPI) >= 1.3.9
 %endif
 PreReq:                perl
-PreReq:                %{_sbindir}/apxs
+PreReq:                /usr/sbin/apxs
 PreReq:                %{name}-common = %{version}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     phpfi
@@ -329,7 +329,8 @@ Manual da linguagem PHP, em formato HTML.
 Summary:       bcmath extension module for PHP
 Summary(pl):   Modu³ bcmath dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description bcmath
 This is a dynamic shared object (DSO) for Apache that will add bc
@@ -343,7 +344,8 @@ matematycznych takich jak w programie bc.
 Summary:       Bzip2 extension module for PHP
 Summary(pl):   Modu³ bzip2 dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description bzip2
 This is a dynamic shared object (DSO) for Apache that will add
@@ -356,7 +358,8 @@ Modu
 Summary:       Calendar extension module for PHP
 Summary(pl):   Modu³ funkcji kalendarza dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description calendar
 This is a dynamic shared object (DSO) for Apache that will add
@@ -370,7 +373,8 @@ wsparcie dla kalendarza.
 Summary:       cpdf extension module for PHP
 Summary(pl):   Modu³ cpdf dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description cpdf
 This is a dynamic shared object (DSO) for Apache that will add libcpdf
@@ -383,7 +387,8 @@ Modu
 Summary:       crack extension module for PHP
 Summary(pl):   Modu³ crack dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description crack
 This is a dynamic shared object (DSO) for Apache that will add
@@ -400,7 +405,8 @@ Uwaga: to jest modu
 Summary:       ctype extension module for PHP
 Summary(pl):   Modu³ ctype dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description ctype
 This is a dynamic shared object (DSO) for Apache that will add ctype
@@ -413,7 +419,8 @@ Modu
 Summary:       curl extension module for PHP
 Summary(pl):   Modu³ curl dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description curl
 This is a dynamic shared object (DSO) for Apache that will add curl
@@ -426,7 +433,8 @@ Modu
 Summary:       DBA extension module for PHP
 Summary(pl):   Modu³ DBA dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description dba
 This is a dynamic shared object (DSO) for Apache that will add
@@ -440,7 +448,8 @@ wsparcie dla baz danych opartych na plikach (DBA).
 Summary:       DBase extension module for PHP
 Summary(pl):   Modu³ DBase dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description dbase
 This is a dynamic shared object (DSO) for Apache that will add DBase
@@ -453,7 +462,8 @@ Modu
 Summary:       DBX extension module for PHP
 Summary(pl):   Modu³ DBX dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description dbx
 This is a dynamic shared object (DSO) for Apache that will add DB
@@ -469,7 +479,8 @@ mysql, pgsql, mssql, fbsql i inne.
 Summary:       Direct I/O extension module for PHP
 Summary(pl):   Modu³ Direct I/O dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description dio
 This is a dynamic shared object (DSO) for Apache that will add direct
@@ -487,6 +498,8 @@ Uwaga: to jest modu
 Summary:       DOM XML extension module for PHP
 Summary(pl):   Modu³ DOM XML dla PHP
 Group:         Libraries
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description domxml
 This is a dynamic shared object (DSO) for Apache that will add DOM XML
@@ -503,7 +516,8 @@ Uwaga: to jest modu
 Summary:       exif extension module for PHP
 Summary(pl):   Modu³ exif dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description exif
 This is a dynamic shared object (DSO) for Apache that will add exif
@@ -516,7 +530,8 @@ Modu
 Summary:       filePro extension module for PHP
 Summary(pl):   Modu³ filePro dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description filepro
 This is a dynamic shared object (DSO) for Apache that will add PHP
@@ -530,7 +545,8 @@ mo
 Summary:       FTP extension module for PHP
 Summary(pl):   Modu³ FTP dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description ftp
 This is a dynamic shared object (DSO) for Apache that will add FTP
@@ -543,9 +559,10 @@ Modu
 Summary:       GD extension module for PHP
 Summary:       Modu³ GD dla PHP
 Group:         Libraries
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 %{!?_without_gif:Requires:     gd(gif)}
-PreReq:                %{name}-common = %{version}
-%{!?_without_gif:Provides:     %{name}-gd(gif) = %{epoch}:%{version}}
+%{!?_without_gif:Provides:     %{name}-gd(gif) = %{epoch}:%{version}-%{release}}
 
 %description gd
 This is a dynamic shared object (DSO) for Apache that will add GD
@@ -561,7 +578,8 @@ obrazk
 Summary:       gettext extension module for PHP
 Summary(pl):   Modu³ gettext dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description gettext
 This is a dynamic shared object (DSO) for Apache that will add gettext
@@ -574,7 +592,8 @@ Modu
 Summary:       gmp extension module for PHP
 Summary(pl):   Modu³ gmp dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description gmp
 This is a dynamic shared object (DSO) for Apache that will add
@@ -587,7 +606,8 @@ Modu
 Summary:       Hyperwave extension module for PHP
 Summary(pl):   Modu³ Hyperwave dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description hyperwave
 This is a dynamic shared object (DSO) for Apache that will add
@@ -600,7 +620,8 @@ Modu
 Summary:       iconv extension module for PHP
 Summary(pl):   Modu³ iconv dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description iconv
 This is a dynamic shared object (DSO) for Apache that will add iconv
@@ -614,7 +635,8 @@ Summary:    IMAP extension module for PHP
 Summary(pl):   Modu³ IMAP dla PHP
 Summary(pt_BR):        Um módulo para aplicações PHP que usam IMAP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description imap
 This is a dynamic shared object (DSO) for Apache that will add IMAP
@@ -630,7 +652,8 @@ Um m
 Summary:       Interbase database module for PHP
 Summary(pl):   Modu³ bazy danych Interbase dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 Autoreq:       false
 
 %description interbase
@@ -646,7 +669,8 @@ Modu
 Summary:       Java extension module for PHP
 Summary(pl):   Modu³ Javy dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description java
 This is a dynamic shared object (DSO) for Apache that will add JAVA
@@ -662,7 +686,8 @@ Summary:    LDAP extension module for PHP
 Summary(pl):   Modu³ LDAP dla PHP
 Summary(pt_BR):        Um módulo para aplicações PHP que usam LDAP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description ldap
 This is a dynamic shared object (DSO) for Apache that will add LDAP
@@ -673,11 +698,13 @@ Modu
 
 %description ldap -l pt_BR
 Um módulo para aplicações PHP que usam LDAP.
+
 %package mbstring
 Summary:       mbstring extension module for PHP
 Summary(pl):   Modu³ mbstring dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description mbstring
 This is a dynamic shared object (DSO) for Apache that will add
@@ -690,7 +717,8 @@ Modu
 Summary:       mcal extension module for PHP
 Summary(pl):   Modu³ mcal dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description mcal
 This is a dynamic shared object (DSO) for Apache that will add mcal
@@ -704,7 +732,8 @@ do kalendarzy).
 Summary:       mcrypt extension module for PHP
 Summary(pl):   Modu³ mcrypt dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description mcrypt
 This is a dynamic shared object (DSO) for Apache that will add mcrypt
@@ -717,7 +746,8 @@ Modu
 Summary:       mhash extension module for PHP
 Summary(pl):   Modu³ mhash dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description mhash
 This is a dynamic shared object (DSO) for Apache that will add mhash
@@ -730,7 +760,8 @@ Modu
 Summary:       ming extension module for PHP
 Summary(pl):   Modu³ ming dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description ming
 This is a dynamic shared object (DSO) for Apache that will add ming
@@ -744,7 +775,8 @@ ming.
 Summary:       mnoGoSearch extension module for PHP
 Summary(pl):   Modu³ mnoGoSearch dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description mnogosearch
 This is a dynamic shared object (DSO) for Apache that will allow you
@@ -758,7 +790,8 @@ wyszukiwarki mnoGoSearch.
 Summary:       msession extension module for PHP
 Summary(pl):   Modu³ msession dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description msession
 This is a dynamic shared object (DSO) for Apache that will allow you
@@ -777,7 +810,8 @@ Summary:    MySQL database module for PHP
 Summary(pl):   Modu³ bazy danych MySQL dla PHP
 Summary(pt_BR):        Um módulo para aplicações PHP que usam bancos de dados MySQL
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description mysql
 This is a dynamic shared object (DSO) for Apache that will add MySQL
@@ -794,7 +828,8 @@ Um m
 Summary:       Oracle 8 database module for PHP
 Summary(pl):   Modu³ bazy danych Oracle 8 dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 Autoreq:       false
 
 %description oci8
@@ -811,7 +846,8 @@ Summary:    ODBC extension module for PHP
 Summary(pl):   Modu³ ODBC dla PHP
 Summary(pt_BR):        Um módulo para aplicações PHP que usam bases de dados ODBC
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 Requires:      unixODBC >= 2.1.1-3
 
 %description odbc
@@ -828,7 +864,8 @@ Um m
 Summary:       OpenSSL extension module for PHP
 Summary(pl):   Modu³ OpenSSL dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description openssl
 This is a dynamic shared object (DSO) for Apache that will add OpenSSL
@@ -845,7 +882,8 @@ Uwaga: to jest modu
 Summary:       Oracle 7 database module for PHP
 Summary(pl):   Modu³ bazy danych Oracle 7 dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 Autoreq:       false
 
 %description oracle
@@ -859,7 +897,8 @@ Modu
 Summary:       Overload extension module for PHP
 Summary(pl):   Modu³ Overload dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description overload
 This is a dynamic shared object (DSO) for Apache that will add
@@ -876,7 +915,8 @@ Uwaga: to jest modu
 Summary:       Process Control extension module for PHP
 Summary(pl):   Modu³ Process Control dla PHP
 Group:         Libraries
-PreReq:                %{name}-cgi = %{version}
+Requires(post,preun):  %{name}-cgi = %{version}
+Requires:              %{name}-cgi = %{version}
 
 %description pcntl
 This is a dynamic shared object (DSO) for Apache that will add process
@@ -897,7 +937,8 @@ u
 Summary:       PCRE extension module for PHP
 Summary(pl):   Modu³ PCRE dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description pcre
 This is a dynamic shared object (DSO) for Apache that will add Perl
@@ -911,8 +952,9 @@ Modu
 Summary:       libPDF module for PHP
 Summary(pl):   Modu³ do tworzenia plików PDF dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
 PreReq:                pdflib
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description pdf
 This is a dynamic shared object (DSO) for Apache that will add PDF
@@ -926,7 +968,8 @@ pdflib.
 Summary:       PostgreSQL database module for PHP
 Summary(pl):   Modu³ bazy danych PostgreSQL dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description pgsql
 This is a dynamic shared object (DSO) for Apache that will add
@@ -944,7 +987,8 @@ Um m
 Summary:       POSIX extension module for PHP
 Summary(pl):   Modu³ POSIX dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description posix
 This is a dynamic shared object (DSO) for Apache that will add POSIX
@@ -957,7 +1001,8 @@ Modu
 Summary:       pspell extension module for PHP
 Summary(pl):   Modu³ pspell dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description pspell
 This is a dynamic shared object (DSO) for Apache that will add pspell
@@ -972,7 +1017,8 @@ sprawdzanie pisowni s
 Summary:       recode extension module for PHP
 Summary(pl):   Modu³ recode dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 Requires:      recode >= 3.5d-3
 
 %description recode
@@ -987,7 +1033,8 @@ bibliotek
 Summary:       session extension module for PHP
 Summary(pl):   Modu³ session dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description session
 This is a dynamic shared object (DSO) for Apache that will add session
@@ -1000,7 +1047,8 @@ Modu
 Summary:       Shared Memory Operations extension module for PHP
 Summary(pl):   Modu³ shmop dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description shmop
 This is a dynamic shared object (DSO) for Apache that will add Shared
@@ -1017,7 +1065,8 @@ Uwaga: to jest modu
 Summary:       SNMP extension module for PHP
 Summary(pl):   Modu³ SNMP dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description snmp
 This is a dynamic shared object (DSO) for Apache that will add SNMP
@@ -1030,7 +1079,8 @@ Modu
 Summary:       sockets extension module for PHP
 Summary(pl):   Modu³ socket dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description sockets
 This is a dynamic shared object (DSO) for Apache that will add sockets
@@ -1047,7 +1097,8 @@ Uwaga: to jest modu
 Summary:       Sybase-CT extension module for PHP
 Summary(pl):   Modu³ Sybase-CT dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description sybase-ct
 This is a dynamic shared object (DSO) for Apache that will add Sybase
@@ -1061,7 +1112,8 @@ CT-lib.
 Summary:       SysV sem extension module for PHP
 Summary(pl):   Modu³ SysV sem dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description sysvsem
 This is a dynamic shared object (DSO) for Apache that will add SysV
@@ -1074,7 +1126,8 @@ Modu
 Summary:       SysV shm extension module for PHP
 Summary(pl):   Modu³ SysV shm dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description sysvshm
 This is a dynamic shared object (DSO) for Apache that will add SysV
@@ -1087,8 +1140,9 @@ Modu
 Summary:       wddx extension module for PHP
 Summary(pl):   Modu³ wddx dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
 PreReq:                %{name}-session = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description wddx
 This is a dynamic shared object (DSO) for Apache that will add wddx
@@ -1101,7 +1155,8 @@ Modu
 Summary:       XML extension module for PHP
 Summary(pl):   Modu³ XML dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description xml
 This is a dynamic shared object (DSO) for Apache that will add XML
@@ -1118,7 +1173,8 @@ zwi
 Summary:       xmlrpc extension module for PHP
 Summary(pl):   Modu³ xmlrpc dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description xmlrpc
 This is a dynamic shared object (DSO) for Apache that will add XMLRPC
@@ -1135,7 +1191,8 @@ Uwaga: to jest modu
 Summary:       xslt extension module for PHP
 Summary(pl):   Modu³ xslt dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description xslt
 This is a dynamic shared object (DSO) for Apache that will add xslt
@@ -1148,7 +1205,8 @@ Modu
 Summary:       yaz extension module for PHP
 Summary(pl):   Modu³ yaz dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description yaz
 This is a dynamic shared object (DSO) for Apache that will add yaz
@@ -1163,7 +1221,8 @@ Z39.50 s
 Summary:       NIS (yp) extension module for PHP
 Summary(pl):   Modu³ NIS (yp) dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description yp
 This is a dynamic shared object (DSO) for Apache that will add NIS
@@ -1177,7 +1236,8 @@ wsparcie dla NIS (Yellow Pages).
 Summary:       zip extension module for PHP
 Summary(pl):   Modu³ zip dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description zip
 This is a dynamic shared object (DSO) for Apache that will add ZZipLib
@@ -1191,7 +1251,8 @@ Modu
 Summary:       Zlib extension module for PHP
 Summary(pl):   Modu³ zlib dla PHP
 Group:         Libraries
-PreReq:                %{name}-common = %{version}
+Requires(post,preun):  %{name}-common = %{version}
+Requires:              %{name}-common = %{version}
 
 %description zlib
 This is a dynamic shared object (DSO) for Apache that will add
@@ -1372,7 +1433,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} \
-       %{?_without_psql:--without-pgsql}%{!?_without_psql:--with-pgsql=shared,/usr} \
+       %{?_without_pgsql:--without-pgsql}%{!?_without_pgsql:--with-pgsql=shared,/usr} \
        --with-png-dir=shared,/usr \
        %{!?_without_pspell:--with-pspell=shared} \
        %{!?_without_recode:--with-recode=shared} \
@@ -2181,7 +2242,7 @@ fi
 %attr(755,root,root) %{extensionsdir}/pdf.so
 %endif
 
-%if %{!?_without_psql:1}%{?_without_psql:0}
+%if %{!?_without_pgsql:1}%{?_without_pgsql:0}
 %files pgsql
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/pgsql.so