- drop obsolete and outdated manual inclusion of rpm macros

[packages/php-pear-Validate.git] / php-pear-Validate.spec

diff --git a/php-pear-Validate.spec b/php-pear-Validate.spec
index 6a0a14e04a3e4d61c2dd4721d442d352ccb448f4..b407a7d8ee333d70be87dc5fcc8afdf25fed5dec 100644 (file)
--- a/php-pear-Validate.spec
+++ b/php-pear-Validate.spec
@@ -1,32 +1,30 @@
-# TODO
-# - conflicts with php-pear-Validate_Finance.
-#   Validate_Finance is split since Validate 0.5.0
-%include       /usr/lib/rpm/macros.php
-%define                _class          Validate
-%define                _status         alpha
-%define                _pearname       %{_class}
-
+%define                _status         beta
+%define                _pearname       Validate
 Summary:       %{_pearname} - Validation class
-Summary(pl):   %{_pearname} - klasa validuj±ca
+Summary(pl.UTF-8):     %{_pearname} - klasa sprawdzająca poprawność danych
 Name:          php-pear-%{_pearname}
-Version:       0.4.1
-Release:       4
+Version:       0.8.5
+Release:       2
 License:       PHP
 Group:         Development/Languages/PHP
 Source0:       http://pear.php.net/get/%{_pearname}-%{version}.tgz
-# Source0-md5: 6203c4285dc8ff0736b823fa6e991de4
+# Source0-md5: 3007fbf7debbb7c0fc20622f90096eb9
 URL:           http://pear.php.net/package/Validate/
+BuildRequires: php-pear-PEAR
 BuildRequires: rpm-php-pearprov >= 4.4.2-11
-Requires:      php-common >= 3:4.1.0
+BuildRequires: rpmbuild(macros) >= 1.654
+Requires:      php(core) >= 4.2.0
 Requires:      php-pear
+Suggests:      php-pear-Date
+Suggests:      php-pear-Net_IDNA
+Obsoletes:     php-pear-Validate-tests
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# It's in a comment block
-%define                _noautoreq      'pear(FR_insee_country_codes.php)'
+%define                _noautoreq_pear Date.* Net/IDNA.*
 
 %description
-Package to validate various datas. It includes :
+Package to validate various data. It includes:
 - numbers (min/max, decimal or not),
 - email (syntax, domain check),
 - string (predifined type alpha upper and/or lowercase, numeric,...),
@@ -37,32 +35,19 @@ Package to validate various datas. It includes :
 
 In PEAR status of this package is: %{_status}.
 
-%description -l pl
-Pakiet do sprawdzania poprawno¶ci ró¿nych danych:
-- liczby (min/max, dziesiêtne czy nie),
-- email (sk³adnia, sprawdzanie domeny),
-- stringi (predefiniowane typy alfanumeryczne z du¿ymi i ma³ymi
-  literami, numeryczne,...),
-- daty (min, max),
+%description -l pl.UTF-8
+Pakiet do sprawdzania poprawności różnych danych:
+- liczb (minimalna/maksymalna, dziesiętne czy nie),
+- adresy e-mail (składnia, sprawdzanie domeny),
+- łańcuchy znaków (predefiniowane typy alfanumeryczne z dużymi i
+  małymi literami, numeryczne...),
+- daty (minimalna, maksymalna),
 - karty kredytowe,
-- mo¿liwe sprawdzenie wiêkszej ilo¶ci danych wywo³aniem pojedynczej
+- możliwe sprawdzenie większej ilości danych wywołaniem pojedynczej
   metody (::multiple).
 
 Ta klasa ma w PEAR status: %{_status}.
 
-%package tests
-Summary:       Tests for PEAR::%{_pearname}
-Summary(pl):   Testy dla PEAR::%{_pearname}
-Group:         Development
-Requires:      %{name} = %{epoch}:%{version}-%{release}
-AutoReq:       no
-
-%description tests
-Tests for PEAR::%{_pearname}.
-
-%description tests -l pl
-Testy dla PEAR::%{_pearname}.
-
 %prep
 %pear_package_setup
 
@@ -74,18 +59,14 @@ install -d $RPM_BUILD_ROOT%{php_pear_dir}
 %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
 %doc docs/%{_pearname}/docs/*
-%dir %{php_pear_dir}/%{_class}/Finance
 %{php_pear_dir}/.registry/*.reg
 %{php_pear_dir}/*.php
-%{php_pear_dir}/%{_class}/*.php
-%{php_pear_dir}/%{_class}/Finance/*.php
-
-%{php_pear_dir}/data/%{_pearname}
-
-%files tests
-%defattr(644,root,root,755)
-%{php_pear_dir}/tests/*