[php-pear-Services-Weather] update to 1.4.7 (QA release)

[Remi Collet]

commit 00e1e6a765f80824b61e15c9c935c81bb46f0a44
Author: Remi Collet <remi at fedoraproject.org>
Date:   Mon Oct 22 18:28:09 2012 +0200

    update to 1.4.7 (QA release)

 .gitignore                     |    1 +
 php-pear-Services-Weather.spec |   17 ++++++++++++-----
 sources                        |    2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b6ff120..3bfa419 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ package-*.xml
 *spec~
 Services_Weather-1.4.5.tgz
 /Services_Weather-1.4.6.tgz
+/Services_Weather-1.4.7.tgz
diff --git a/php-pear-Services-Weather.spec b/php-pear-Services-Weather.spec
index 23f7bb9..479ffaa 100644
--- a/php-pear-Services-Weather.spec
+++ b/php-pear-Services-Weather.spec
@@ -1,20 +1,24 @@
-%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
+%{!?__pear:       %global __pear %{_bindir}/pear}
 %global pear_name Services_Weather
 
 Name:           php-pear-Services-Weather
-Version:        1.4.6
-Release:        4%{?dist}
+Version:        1.4.7
+Release:        1%{?dist}
 Summary:        This class acts as an interface to various online weather-services
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://pear.php.net/package/Services_Weather
+# Fix corrupted archive
+# tar xif Services_Weather-1.4.7.tgz
+# tar czf Services_Weather-1.4.7.tgz package.xml Services_Weather-1.4.7
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
 Source2:        xml2changelog
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  php-pear >= 1:1.4.9-1.2
+BuildRequires:  php-pear
 
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
@@ -56,7 +60,7 @@ cd %{pear_name}-%{version}
 %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 # Clean up unnecessary files
-rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
+rm -rf $RPM_BUILD_ROOT%{pear_metadir}/.??*
 
 # Install XML package description
 mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
@@ -92,6 +96,9 @@ fi
 
 
 %changelog
+* Mon Aug 22 2012 Remi Collet <remi at fedoraproject.org> - 1.4.7-1
+- update to 1.4.7 (QA release)
+
 * Sun Aug 19 2012 Remi Collet <remi at fedoraproject.org> - 1.4.6-4
 - rebuilt for new pear_datadir
 
diff --git a/sources b/sources
index e408ebe..ee76388 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-302e17299f03128d24470c418956d3b4  Services_Weather-1.4.6.tgz
+fcd2e325ca8804ecdea0604eb3062e0c  Services_Weather-1.4.7.tgz