- add Renderers subpackage for minimal base dependency; rel 3

Changed files:
    php-pear-PHP_CompatInfo.spec -> 1.39

diff --git a/php-pear-PHP_CompatInfo.spec b/php-pear-PHP_CompatInfo.spec
index 50ecb618f03600de2d0632d850332d17224e92ac..60a4e328378d8567089c592686771dab5befd5f4 100644 (file)
--- a/php-pear-PHP_CompatInfo.spec
+++ b/php-pear-PHP_CompatInfo.spec
@@ -1,5 +1,3 @@
-# TODO
-# - renderers should be optional?
 %include       /usr/lib/rpm/macros.php
 %define                _class          PHP
 %define                _subclass       CompatInfo
@@ -9,7 +7,7 @@ Summary:        %{_pearname} - determine minimal requirements for a program
 Summary(pl.UTF-8):     %{_pearname} - określanie minimalnych wymagań programu
 Name:          php-pear-%{_pearname}
 Version:       1.8.1
-Release:       2
+Release:       3
 License:       New BSD
 Group:         Development/Languages/PHP
 Source0:       http://pear.php.net/get/%{_pearname}-%{version}.tgz
@@ -19,8 +17,11 @@ URL:         http://pear.php.net/package/PHP_CompatInfo/
 BuildRequires: php-pear-PEAR
 BuildRequires: rpm-php-pearprov >= 4.4.2-11
 BuildRequires: rpmbuild(macros) >= 1.300
-Requires:      php(tokenizer)
 Requires:      php-pear
+Requires:      php-pear-Event_Dispatcher >= 1.0.0
+Requires:      php-pear-File_Find >= 1.3.0
+Requires:      php-pear-PEAR-core >= 1:1.5.4
+Requires:      php(tokenizer)
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -56,12 +57,23 @@ CLI for PHP_CompatInfo.
 %description cli -l pl.UTF-8
 Interfejs linii poleceń dla PHP_CompatInfo.
 
+# could make subpkg for each, but that's imho overkill, just want base package
+# being minimal for rpm-php-pearprov.
+%package Renderers
+Summary:       Additional format Renderers for PHP_CompatInfo
+Group:         Development/Languages/PHP
+Requires:      %{name} = %{version}-%{release}
+
+%description Renderers
+Additional format Renderers for PHP_CompatInfo
+
 %package tests
 Summary:       Tests for PEAR::%{_pearname}
 Summary(pl.UTF-8):     Testy dla PEAR::%{_pearname}
 Group:         Development
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      %{name} = %{version}-%{release}
 AutoReq:       no
+AutoProv:      no
 
 %description tests
 Tests for PEAR::%{_pearname}.
@@ -91,16 +103,36 @@ cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+if [ -f %{_docdir}/%{name}-%{version}/optional-packages.txt ]; then
+       cat %{_docdir}/%{name}-%{version}/optional-packages.txt
+fi
+
 %files
 %defattr(644,root,root,755)
-%doc install.log
+%doc install.log optional-packages.txt
 %{php_pear_dir}/.registry/*.reg
 %{php_pear_dir}/%{_class}/CompatInfo.php
+%{php_pear_dir}/%{_class}/%{_subclass}/Parser.php
+%{php_pear_dir}/%{_class}/%{_subclass}/Renderer.php
+%{php_pear_dir}/%{_class}/%{_subclass}/const_array.php
+%{php_pear_dir}/%{_class}/%{_subclass}/func_array.php
 %dir %{php_pear_dir}/%{_class}/%{_subclass}
-%{php_pear_dir}/%{_class}/%{_subclass}/Renderer
-%{php_pear_dir}/%{_class}/%{_subclass}/*.php
+%dir %{php_pear_dir}/%{_class}/%{_subclass}/Renderer
+%{php_pear_dir}/%{_class}/%{_subclass}/Renderer/Null.php
+
+%files Renderers
+%defattr(644,root,root,755)
+%{php_pear_dir}/%{_class}/%{_subclass}/Renderer/Array.php
+%{php_pear_dir}/%{_class}/%{_subclass}/Renderer/Csv.php
+%{php_pear_dir}/%{_class}/%{_subclass}/Renderer/Html.php
+%{php_pear_dir}/%{_class}/%{_subclass}/Renderer/Text.php
+%{php_pear_dir}/%{_class}/%{_subclass}/Renderer/Xml.php
+
+# CSS for HTML Renderer
 %{php_pear_dir}/data/%{_pearname}
 
+# examples use other Renderers than null, so packaged here
 %{_examplesdir}/%{name}-%{version}
 
 %files cli