- adapterized

Changed files:
    php.spec -> 1.519

diff --git a/php.spec b/php.spec
index 38bb249aa62ee9ca9509f6b7fb890a8bd3fbd18d..f7002cbb4f1b54b6664da378350845cca2d1e516 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -22,7 +22,6 @@
 %bcond_with    interbase_inst  # use InterBase install., not Firebird  (BR: proprietary libs)
 %bcond_with    oci8            # with Oracle oci8 extension module     (BR: proprietary libs)
 %bcond_with    oracle          # with oracle extension module          (BR: proprietary libs)
-%bcond_without mysqli          # with mysqli support (Requires mysql > 4.1)
 %bcond_without curl            # without CURL extension module
 %bcond_without imap            # without IMAP extension module
 %bcond_with    interbase       # with InterBase extension module
@@ -50,6 +49,7 @@
 %bcond_without apache2         # disable building apache 2.x module
 %bcond_without fcgi            # disable building FCGI SAPI
 %bcond_without zts             # disable experimental-zts
+%bcond_without mysqli          # with mysqli support (Requires mysql > 4.1)
 
 %define apxs1          /usr/sbin/apxs1
 %define        apxs2           /usr/sbin/apxs
@@ -137,14 +137,14 @@ BuildRequires:    bison
 BuildRequires: bzip2-devel
 %{?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}
+%{?with_db3:BuildRequires:     db3-devel >= 3.1}
 BuildRequires: elfutils-devel
 %if %{with xmlrpc}
 BuildRequires: expat-devel
 %endif
-%{?with_fdf:BuildRequires:     fdftk-devel}
 %{?with_fcgi:BuildRequires:    fcgi-devel}
+%{?with_fdf:BuildRequires:     fdftk-devel}
 BuildRequires: flex
 %if %{with mssql} || %{with sybase} || %{with sybase_ct}
 BuildRequires: freetds-devel
@@ -173,12 +173,13 @@ BuildRequires:    ncurses-ext-devel
 %if %{with openssl} || %{with ldap}
 BuildRequires: openssl-devel >= 0.9.7d
 %endif
+BuildRequires: %{__perl}
+%{?with_snmp:BuildRequires:    net-snmp-devel >= 5.0.7}
 BuildRequires: pam-devel
 %{?with_pcre:BuildRequires:    pcre-devel}
-BuildRequires: %{__perl}
 %{?with_msession:BuildRequires:        phoenix-devel}
-%{?with_pgsql:BuildRequires:   postgresql-devel}
 %{?with_pgsql:BuildRequires:   postgresql-backend-devel >= 7.2}
+%{?with_pgsql:BuildRequires:   postgresql-devel}
 BuildRequires: readline-devel
 %{?with_recode:BuildRequires:  recode-devel >= 3.5d-3}
 BuildRequires: rpm-build >= 4.4.0
@@ -186,7 +187,6 @@ BuildRequires:      rpmbuild(macros) >= 1.238
 %{?with_sqlite:BuildRequires:  sqlite-devel}
 BuildRequires: t1lib-devel
 %{?with_tidy:BuildRequires:    tidy-devel}
-%{?with_snmp:BuildRequires:    net-snmp-devel >= 5.0.7}
 %{?with_odbc:BuildRequires:    unixODBC-devel}
 %{?with_xmlrpc:BuildRequires:  xmlrpc-epi-devel}
 BuildRequires: zlib-devel >= 1.0.9
@@ -281,9 +281,9 @@ PHP - 
 Summary:       PHP DSO module for apache 1.3.x
 Summary(pl):   Modu³ DSO (Dynamic Shared Object) php dla apache 1.3.x
 Group:         Development/Languages/PHP
-Requires:      %{name}-common = %{epoch}:%{version}-%{release}
-Requires(post,preun):  %{apxs1}
 Requires(post,preun):  %{__perl}
+Requires(post,preun):  %{apxs1}
+Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      apache1(EAPI) >= 1.3.33-2
 Requires:      apache1-mod_mime
 Provides:      php = %{epoch}:%{version}-%{release}
@@ -301,8 +301,8 @@ Summary:    PHP DSO module for apache 2.x
 Summary(pl):   Modu³ DSO (Dynamic Shared Object) php dla apache 2.x
 Group:         Development/Languages/PHP
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
-Requires:      apache >= 2.0.52-2
 Requires:      apache(modules-api) = %{apache_modules_api}
+Requires:      apache >= 2.0.52-2
 Provides:      php = %{epoch}:%{version}-%{release}
 Obsoletes:     phpfi
 Obsoletes:     apache-mod_php < 1:4.1.1
@@ -410,11 +410,11 @@ Summary(pt_BR):   Arquivos de desenvolvimento para PHP
 Summary(ru):   ðÁËÅÔ ÒÁÚÒÁÂÏÔËÉ ÄÌÑ ÐÏÓÔÒÏÅÎÉÑ ÒÁÓÛÉÒÅÎÉÊ PHP
 Summary(uk):   ðÁËÅÔ ÒÏÚÒÏÂËÉ ÄÌÑ ÐÏÂÕÄÏ×É ÒÏÚÛÉÒÅÎØ PHP
 Group:         Development/Languages/PHP
+Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      autoconf
 Requires:      automake
 Requires:      libtool
 Requires:      shtool
-Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Obsoletes:     php-pear-devel
 Obsoletes:     php4-devel
 
@@ -1829,7 +1829,7 @@ echo ".so php.1" >$RPM_BUILD_ROOT%{_mandir}/man1/php.cli.1
 
 ln -sf php.cli $RPM_BUILD_ROOT%{_bindir}/php
 
-sed -e 's#/usr/lib/php#%{_libdir}/php#g' php.ini > $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
+sed -e 's#%{_prefix}/lib/php#%{_libdir}/php#g' php.ini > $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
 %if %{with fcgi}
 install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/php-cgi-fcgi.ini
 %endif