[php-pear-Services-Twitter] fix metadata location

[Remi Collet]

commit 4333fad996042da0b194f5da95254221f62390d7
Author: Remi Collet <rcollet at redhat.com>
Date:   Tue Feb 19 17:43:57 2013 +0100

    fix metadata location

 php-pear-Services-Twitter.spec |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/php-pear-Services-Twitter.spec b/php-pear-Services-Twitter.spec
index 51c0429..b7d385d 100644
--- a/php-pear-Services-Twitter.spec
+++ b/php-pear-Services-Twitter.spec
@@ -1,9 +1,10 @@
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %global pear_name Services_Twitter
 
 Name:           php-pear-Services-Twitter
 Version:        0.6.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        PHP interface to Twitter's API
 
 Group:          Development/Libraries
@@ -13,17 +14,18 @@ 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}
-Provides:       php-pear(%{pear_name}) = %{version}
 Requires:       php-pear(PEAR)
 Requires:       php-xml php-mbstring >= 5.2.0
 # Optional (but which requires mandatory HTTP_Request2)
 Requires:       php-pear(HTTP_OAuth) >= 0.1.7
 
+Provides:       php-pear(%{pear_name}) = %{version}
+
 
 %description
 An interface for communicating with Twitter's public API.
@@ -31,12 +33,9 @@ Send status updates, fetch information, add friends, etc.
 
 %prep
 %setup -q -c
-# Create a "localized" php.ini to avoid build warning
-cp /etc/php.ini .
-echo "date.timezone=UTC" >>php.ini
 
 # Generate Changelog
-%{_bindir}/php -n %{SOURCE2} package.xml | tee CHANGELOG | head -n 5
+%{_bindir}/php %{SOURCE2} package.xml | tee CHANGELOG | head -n 5
 
 cd %{pear_name}-%{version}
 # package.xml is V2
@@ -51,12 +50,12 @@ cd %{pear_name}-%{version}
 %install
 cd %{pear_name}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
-PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
+%{__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}
@@ -88,6 +87,9 @@ fi
 
 
 %changelog
+* Tue Feb 19 2013 Remi Collet <remi at fedoraproject.org> - 0.6.3-8
+- fix metadata location
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild