[php-pear-XML-Parser] fix metadata location

Remi Collet remi at fedoraproject.org
Tue Feb 19 15:55:34 UTC 2013


commit 6bf39bc1bcbdd187d2f183b2286ade5f20a2748d
Author: Remi Collet <rcollet at redhat.com>
Date:   Tue Feb 19 16:55:25 2013 +0100

    fix metadata location

 php-pear-XML-Parser.spec |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/php-pear-XML-Parser.spec b/php-pear-XML-Parser.spec
index f4f76df..16e4fcc 100644
--- a/php-pear-XML-Parser.spec
+++ b/php-pear-XML-Parser.spec
@@ -1,9 +1,10 @@
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %global pear_name XML_Parser
 
 Name:         php-pear-XML-Parser
 Version:      1.3.4
-Release:      7%{?dist}
+Release:      8%{?dist}
 Summary:      XML parsing class based on PHP's bundled expat
 Summary(fr):  Une classe d'analyse XML utilisant l'extension expat de PHP
 License:      BSD
@@ -15,7 +16,7 @@ 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
 # For tests
 BuildRequires:    php-mbstring
 BuildRequires:    php-pear(XML_RSS)
@@ -23,8 +24,10 @@ BuildRequires:    php-pear(XML_RSS)
 Requires(post):   %{__pear}
 Requires(postun): %{__pear}
 Requires:         php-pear(PEAR) >= 1.4.9
+
 Provides:         php-pear(%{pear_name}) = %{version}
 
+
 %description
 This is an XML parser based on PHPs built-in xml extension.
 It supports two basic modes of operation: "func" and "event".  
@@ -57,10 +60,6 @@ XML_Parser pour analyser un document.
 %setup -q -c
 %{_bindir}/php -n %{SOURCE2} package.xml | tee CHANGELOG | head -n 10
 
-# 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
@@ -74,10 +73,10 @@ mv ../package.xml %{name}.xml
 rm -rf %{buildroot}
 cd %{pear_name}-%{version}
 
-PHPRC=../php.ini %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
+%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Clean up unnecessary files
-rm -rf %{buildroot}%{pear_phpdir}/.??*
+rm -rf %{buildroot}%{pear_metadir}/.??*
 
 # Install XML package description
 %{__mkdir_p} %{buildroot}%{pear_xmldir}
@@ -123,6 +122,9 @@ fi
 
 
 %changelog
+* Tue Feb 19 2013 Remi Collet <remi at fedoraproject.org> - 1.3.4-8
+- fix metadata location
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list