- drop -tests

Changed files:
    php-pear-MDB2.spec -> 1.37

diff --git a/php-pear-MDB2.spec b/php-pear-MDB2.spec
index c07ca30ef7c4192c4d512a6118ed7dd79b69ba57..54d2c2867e1c0fd360914f85bef3165d76fbcf2a 100644 (file)
--- a/php-pear-MDB2.spec
+++ b/php-pear-MDB2.spec
@@ -1,9 +1,8 @@
 %include       /usr/lib/rpm/macros.php
-%define                _class          MDB2
-%define                _pearname       %{_class}
+%define                _pearname       MDB2
 %define                _status         beta
 %define                subver  b3
-%define                rel             1
+%define                rel             2
 Summary:       %{_pearname} - unified database API
 Summary(pl.UTF-8):     %{_pearname} - zunifikowane API baz danych
 Name:          php-pear-%{_pearname}
@@ -22,11 +21,12 @@ Requires:   php-common >= 3:4.3.0
 Requires:      php-pear
 Requires:      php-pear-PEAR-core >= 1:1.3.6
 Requires:      php-pear-XML_Parser
+Obsoletes:     php-pear-MDB2-tests
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # (probably) included in tests
-%define                _noautoreq 'pear(Console_TestListener.php)' 'pear(HTML_TestListener.php)' 'pear(XML/DTD/XmlValidator.php)' 'pear(testUtils.php)' 'pear(test_setup.php)'
+%define                _noautoreq pear(Console_TestListener.php) pear(HTML_TestListener.php) pear(XML/DTD/XmlValidator.php) pear(testUtils.php) pear(test_setup.php)
 
 %description
 MDB2 is a merge of PEAR's DB and Metabases that provides a unified DB
@@ -44,20 +44,6 @@ danych zarządca schematów XML.
 
 Ta klasa ma w PEAR status: %{_status}.
 
-%package tests
-Summary:       Tests for PEAR::%{_pearname}
-Summary(pl.UTF-8):     Testy dla PEAR::%{_pearname}
-Group:         Development/Languages/PHP
-Requires:      %{name} = %{epoch}:%{version}-%{release}
-AutoProv:      no
-AutoReq:       no
-
-%description tests
-Tests for PEAR::%{_pearname}.
-
-%description tests -l pl.UTF-8
-Testy dla PEAR::%{_pearname}.
-
 %prep
 %pear_package_setup
 
@@ -66,7 +52,7 @@ mv docs/%{_pearname}/docs/examples .
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{php_pear_dir},%{_examplesdir}/%{name}-%{version}}
-install -d $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/Driver/Native
+install -d $RPM_BUILD_ROOT%{php_pear_dir}/MDB2/Driver/Native
 %pear_package_install
 
 rm -f $RPM_BUILD_ROOT%{php_pear_dir}/data/MDB2/LICENSE
@@ -80,10 +66,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/%{_pearname}/docs/*
 %{php_pear_dir}/.registry/*.reg
 %{php_pear_dir}/*.php
-%{php_pear_dir}/%{_class}
+%{php_pear_dir}/MDB2
 
 %{_examplesdir}/%{name}-%{version}
-
-%files tests
-%defattr(644,root,root,755)
-%{php_pear_dir}/tests/*