- release 5.9

- removed pear classes included in php - avaible now as separate packages
- devel package for peaple who want to use cvs pear
- additonal package with classes I couldn't find is pear packages...
STBR for tests

Changed files:
    php.spec -> 1.167

diff --git a/php.spec b/php.spec
index 2e8558d7ff515eba5aae24c12845762e8242ff16..d53789c1123333e967758b28dd78f50b1bc3c693 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -1,3 +1,6 @@
+#
+# Automatic pear requirements finding:
+%include       /usr/lib/rpm/macros.php
 
 %define        _apache2        %(rpm -q apache-devel 2> /dev/null | grep -Eq '\\-2\\.[0-9]+\\.' && echo 1 || echo 0)
 
@@ -34,7 +37,7 @@ Summary(pl):  J
 Summary(pt_BR):        A linguagem de script PHP
 Name:          php
 Version:       4.2.1
-Release:       5
+Release:       5.9
 Epoch:         3
 Group:         Libraries
 License:       The PHP license (see "LICENSE" file included in distribution)
@@ -117,6 +120,7 @@ BuildRequires:      postgresql-devel
 BuildRequires:  postgresql-backend-devel >= 7.2
 BuildRequires: pspell-devel
 %{!?_without_recode:BuildRequires:     recode-devel >= 3.5d-3}
+BuildRequires: rpm-php-pearprov
 %{!?_without_xslt:BuildRequires:       sablotron-devel}
 BuildRequires: t1lib-devel
 %{!?_without_snmp:BuildRequires: ucd-snmp-devel >= 4.2.3}
@@ -143,7 +147,6 @@ Obsoletes:  apache-mod_php
 
 %define                _sysconfdir     /etc/php
 %define                extensionsdir   %{_libdir}/php
-%define                peardir         %{_datadir}/pear
 
 %description
 PHP is an HTML-embedded scripting language. PHP attempts to make it
@@ -249,21 +252,6 @@ WWW.
 %description doc -l pt_BR
 Manual da linguagem PHP, em formato HTML.
 
-%package pear
-Summary:       PEAR - PHP Extension and Application Repository
-Summary(pl):   PEAR - Rozszerzenie PHP i Repozytorium Aplikacji
-Group:         Development/Languages/PHP
-Requires:      %{name}-cgi = %{version}
-Requires:      %{name}-pcre = %{version}
-Requires:      %{name}-xml = %{version}
-
-%description pear
-PEAR - PHP Extension and Application Repository.
-
-%description pear -l pl
-PEAR (PHP Extension and Application Repository) - Rozszerzenie PHP i
-Repozytorium Aplikacji.
-
 %package bcmath
 Summary:       bcmath extension module for PHP
 Summary(pl):   Modu³ bcmath dla PHP
@@ -859,6 +847,56 @@ support to PHP.
 Modu³ PHP umo¿liwiaj±cy tworzenie plików PDF. Wykorzystuje bibliotekê
 pdflib.
 
+%package pear
+Summary:       PEAR - PHP Extension and Application Repository
+Summary(pl):   PEAR - Rozszerzenie PHP i Repozytorium Aplikacji
+Group:         Development/Languages/PHP
+Requires:      %{name}-pcre = %{version}
+Requires:      %{name}-xml = %{version}
+
+%description pear
+PEAR - PHP Extension and Application Repository.
+
+%description pear -l pl
+PEAR (PHP Extension and Application Repository) - Rozszerzenie PHP i
+Repozytorium Aplikacji.
+
+%package pear-additional_classes
+Summary:       PEAR - PHP Extension and Application Repository
+Summary(pl):   PEAR - Rozszerzenie PHP i Repozytorium Aplikacji
+Group:         Development/Languages/PHP
+Requires:      %{name}-pcre = %{version}
+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.
+
+%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.
+
+%package pear-devel
+Summary:       PEAR - PHP Extension and Application Repository
+Summary(pl):   PEAR - Rozszerzenie PHP i Repozytorium Aplikacji
+Group:         Development/Languages/PHP
+Requires:      %{name}-cgi = %{version}
+Requires:      %{name}-pcre = %{version}
+Requires:      %{name}-xml = %{version}
+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.
+
+%description pear-devel -l pl
+PEAR (PHP Extension and Application Repository) - Rozszerzenie PHP i
+Repozytorium Aplikacji.
+Ten pakiet zawiera aplikacje potrzebne do 
+
 %package pgsql
 Summary:       PostgreSQL database module for PHP
 Summary(pl):   Modu³ bazy danych PostgreSQL dla PHP
@@ -1250,7 +1288,7 @@ for i in cgi apxs ; do
        %{?_with_oracle:--with-oracle=shared} \
        --with-pcre-regex=shared \
        --with-pdflib=shared \
-       --with-pear=%{peardir} \
+       --with-pear=%{php_pear_dir} \
        --with-pgsql=shared,/usr \
        --with-png-dir=shared,/usr \
        --with-pspell=shared \
@@ -2042,10 +2080,41 @@ fi
 
 %files pear
 %defattr(644,root,root,755)
+%dir %{php_pear_dir}
+%dir %{php_pear_dir}/Archive
+%dir %{php_pear_dir}/Console
+%dir %{php_pear_dir}/Crypt
+%dir %{php_pear_dir}/Date
+%dir %{php_pear_dir}/DB
+%dir %{php_pear_dir}/File
+%dir %{php_pear_dir}/HTML
+%dir %{php_pear_dir}/HTTP
+%dir %{php_pear_dir}/Image
+%dir %{php_pear_dir}/Mail
+%dir %{php_pear_dir}/Net
+%dir %{php_pear_dir}/PEAR
+%dir %{php_pear_dir}/Schedule
+%dir %{php_pear_dir}/XML
+
+%files pear-additional_classes
+%defattr(644,root,root,755)
+%attr(644,root,root) %{php_pear_dir}/Crypt/HCEMD5.php
+%attr(644,root,root) %{php_pear_dir}/Date/Calc.php
+%attr(644,root,root) %{php_pear_dir}/Date/Human.php
+%attr(644,root,root) %{php_pear_dir}/HTML/Form.php
+%attr(644,root,root) %{php_pear_dir}/HTML/IT*.php
+%attr(644,root,root) %{php_pear_dir}/HTML/Page.php
+%attr(644,root,root) %{php_pear_dir}/HTML/Processor.php
+%attr(644,root,root) %{php_pear_dir}/HTML/Select.php
+%attr(644,root,root) %{php_pear_dir}/HTTP/Compress.php
+%attr(644,root,root) %{php_pear_dir}/Net/SMTP.php
+%attr(644,root,root) %{php_pear_dir}/Schedule/At.php
+
+%files pear-devel
+%defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/pear
 %attr(755,root,root) %{_bindir}/pearize
 %attr(755,root,root) %{_bindir}/phptar
-%{peardir}
 
 %files pdf
 %defattr(644,root,root,755)