X-Git-Url: https://git.pld-linux.org/?p=packages%2Fphp-pear-Services_Weather.git;a=blobdiff_plain;f=php-pear-Services_Weather.spec;h=faa48817deea806dfb0079eb5493f6a596dc89ff;hp=82afa761502b1de612bedbe3ea9cbf6f7faa85c6;hb=HEAD;hpb=33db099cfc38b69b9c07c232908128c7ffa46593

diff --git a/php-pear-Services_Weather.spec b/php-pear-Services_Weather.spec
index 82afa76..faa4881 100644
--- a/php-pear-Services_Weather.spec
+++ b/php-pear-Services_Weather.spec
@@ -1,29 +1,34 @@
-%include	/usr/lib/rpm/macros.php
 %define		_class		Services
 %define		_subclass	Weather
 %define		_status		stable
-%define		_pearname	%{_class}_%{_subclass}
-
+%define		_pearname	Services_Weather
 Summary:	%{_pearname} - an interface to various online weather-services
 Summary(pl.UTF-8):	%{_pearname} - interfejs do różnych serwisów pogodowych
 Name:		php-pear-%{_pearname}
-Version:	1.4.4
+Version:	1.4.7
 Release:	1
 License:	PHP 2.02
 Group:		Development/Languages/PHP
 Source0:	http://pear.php.net/get/%{_pearname}-%{version}.tgz
-# Source0-md5:	ec7bdacd39d4eaef2f0073981d177cde
+# Source0-md5:	34d1e75a99a1ece7446ae8567fef5a92
 URL:		http://pear.php.net/package/Services_Wheather/
-BuildRequires:	php-pear-PEAR
+BuildRequires:	php-pear-PEAR >= 1:1.4.0
 BuildRequires:	rpm-php-pearprov >= 4.4.2-11
-BuildRequires:	rpmbuild(macros) >= 1.300
+BuildRequires:	rpmbuild(macros) >= 1.654
+Requires:	php(ctype)
+Requires:	php(pcre)
 Requires:	php-pear
 Requires:	php-pear-HTTP_Request >= 1.2.0
+Suggests:	php-pear-Cache
+Suggests:	php-pear-DB
+Suggests:	php-pear-Net_FTP
+Suggests:	php-pear-SOAP
+Suggests:	php-pear-XML_Serializer
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # exclude optional dependencies
-%define		_noautoreq	'pear(Cache.*)' 'pear(DB.*)' 'pear(HTTP/Request.*)' 'pear(SOAP.*)' 'pear(XML/Serializer.*)' 'pear(Net/FTP.*)'
+%define	_noautoreq_pear DB.php HTTP/Request.php SOAP/.* XML/Serializer.* Net/FTP.php
 
 %description
 Services_Weather searches for given locations and retrieves current
@@ -69,7 +74,7 @@ fi
 %doc install.log
 %doc docs/%{_pearname}/*
 %{php_pear_dir}/.registry/*.reg
-%{php_pear_dir}/%{_class}/*.php
-%{php_pear_dir}/%{_class}/%{_subclass}
+%{php_pear_dir}/Services/*.php
+%{php_pear_dir}/Services/Weather
 
 %{php_pear_dir}/data/%{_pearname}