[php-pear-HTTP-Client] fix metadata location

Remi Collet remi at fedoraproject.org
Tue Feb 19 14:47:34 UTC 2013


commit 1c6926f7766ee9c805dfc1f25c9aba8f2d533121
Author: Remi Collet <rcollet at redhat.com>
Date:   Tue Feb 19 15:47:28 2013 +0100

    fix metadata location

 php-pear-HTTP-Client.spec |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/php-pear-HTTP-Client.spec b/php-pear-HTTP-Client.spec
index 86e170c..80dd9ac 100644
--- a/php-pear-HTTP-Client.spec
+++ b/php-pear-HTTP-Client.spec
@@ -1,9 +1,10 @@
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %global pear_name HTTP_Client
 
 Name:           php-pear-HTTP-Client
 Version:        1.2.1
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Easy way to perform multiple HTTP requests and process their results
 
 Group:          Development/Languages
@@ -28,10 +29,6 @@ interface for performing multiple HTTP requests.
 
 %prep
 %setup -qc
-# Create a "localized" php.ini to avoid build warning
-cp /etc/php.ini .
-echo "date.timezone=UTC" >>php.ini
-
 cd %{pear_name}-%{version}
 # Package.xml is V2
 mv ../package.xml %{name}.xml
@@ -49,10 +46,10 @@ cd %{pear_name}-%{version}
 %install
 rm -rf $RPM_BUILD_ROOT
 cd %{pear_name}-%{version}
-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
 install -d $RPM_BUILD_ROOT%{pear_xmldir}
@@ -82,6 +79,9 @@ fi
 
 
 %changelog
+* Tue Feb 19 2013 Remi Collet <remi at fedoraproject.org> - 1.2.1-10
+- fix metadata location
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list