X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=php-pear-Net_DNSBL.spec;h=5f77dd53f2540dac4d296a8ecf7717fcd4041b9f;hb=737a590121348a24028588c25905ed3215da8e6e;hp=9bd7ad6d186c45b248c574a155ae06a88e0d7100;hpb=088feaa04c3fdc9e978472adff322064af342106;p=packages%2Fphp-pear-Net_DNSBL.git

diff --git a/php-pear-Net_DNSBL.spec b/php-pear-Net_DNSBL.spec
index 9bd7ad6..5f77dd5 100644
--- a/php-pear-Net_DNSBL.spec
+++ b/php-pear-Net_DNSBL.spec
@@ -1,34 +1,33 @@
 %include	/usr/lib/rpm/macros.php
-%define		_class		Net
-%define		_subclass	DNSBL
 %define		_status		stable
-%define		_pearname	%{_class}_%{_subclass}
+%define		_pearname	Net_DNSBL
 Summary:	%{_pearname} - DNSBL Checker
 Summary(pl.UTF-8):	%{_pearname} - Odpytywanie DNSBL
 Name:		php-pear-%{_pearname}
-Version:	1.3.3
-Release:	2
-Epoch:		0
+Version:	1.3.7
+Release:	1
 License:	PHP 2.02
 Group:		Development/Languages/PHP
 Source0:	http://pear.php.net/get/%{_pearname}-%{version}.tgz
-# Source0-md5:	0d9faf8feeaf4f8528d88a4a32f3ca44
+# Source0-md5:	6e15d7802ea8dfa61acc2691411ac29b
 URL:		http://pear.php.net/package/Net_DNSBL/
 BuildRequires:	php-pear-PEAR >= 1:1.4.0-0.b1
 BuildRequires:	rpm-php-pearprov >= 4.4.2-11
 BuildRequires:	rpmbuild(macros) >= 1.300
-Requires:	php-common >= 3:4.3.11
+Requires:	php(core) >= 4.3.11
 Requires:	php-pear
 Requires:	php-pear-Net_CheckIP >= 1.1
 Requires:	php-pear-Net_DNS >= 1.0.0
 Requires:	php-pear-PEAR-core >= 1:1.4.0
+# should be suggests, not requires: http://pear.php.net/bugs/bug.php?id=17789
 Suggests:	php-pear-Cache_Lite >= 1.4.1
-Suggests:	php-pear-HTTP_Request >= 1.2.3
+Suggests:	php-pear-HTTP_Request2 >= 2.0.0
+Obsoletes:	php-pear-Net_DNSBL-tests
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # exclude optional dependencies
-%define		_noautoreq	'pear(Cache/Lite.php)' 'pear(HTTP/Request.php)'
+%define		_noautoreq	pear(Cache/Lite.php) pear(HTTP/Request.php)
 
 %description
 Checks if a given Host or URL is listed on an DNSBL or SURBL.
@@ -41,25 +40,11 @@ na listy DNSBL lub SURBL.
 
 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
-mv ./%{php_pear_dir}/tests/%{_pearname}/{tests/*,}
-rmdir ./%{php_pear_dir}/tests/%{_pearname}/tests
-rm -rf .%{php_pear_dir}/tests/Net_DNSBL/Tests
+
+# phing build file
+rm .%{php_pear_dir}/data/Net_DNSBL/build.xml
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -73,9 +58,5 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc install.log
 %{php_pear_dir}/.registry/*.reg
-%{php_pear_dir}/%{_class}/*.php
-%{php_pear_dir}/%{_class}/%{_subclass}
-
-%files tests
-%defattr(644,root,root,755)
-%{php_pear_dir}/tests/*
+%{php_pear_dir}/Net/DNSBL.php
+%{php_pear_dir}/Net/DNSBL