[php-pear-PHP-CompatInfo] fix metadata location

Remi Collet remi at fedoraproject.org
Tue Feb 19 15:49:32 UTC 2013


commit ab7f9685e88e883bcf9d1e3eb970e26cbcbff783
Author: Remi Collet <rcollet at redhat.com>
Date:   Tue Feb 19 16:49:23 2013 +0100

    fix metadata location

 php-pear-PHP-CompatInfo.spec |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/php-pear-PHP-CompatInfo.spec b/php-pear-PHP-CompatInfo.spec
index f7e6edb..2dd56fe 100644
--- a/php-pear-PHP-CompatInfo.spec
+++ b/php-pear-PHP-CompatInfo.spec
@@ -1,3 +1,4 @@
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %global pear_name PHP_CompatInfo
 
@@ -5,7 +6,7 @@
 
 Name:           php-pear-PHP-CompatInfo
 Version:        1.9.0
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Find out version and extensions required for a piece of code to run
 Summary(fr):    Trouver version et extensions nécessaires à l'exécution d'un code
 
@@ -57,10 +58,6 @@ une version. Un script permet la production de rapport en ligne de commande.
 %setup -q -c
 %{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
 
-# Create a "localized" php.ini to avoid build warning
-cp /etc/php.ini .
-echo "date.timezone=UTC" >>php.ini
-
 cd %{pear_name}-%{version}%{?beta}
 # package.xml is V2
 mv ../package.xml %{name}.xml
@@ -76,10 +73,10 @@ cd %{pear_name}-%{version}%{?beta}
 %install
 rm -rf $RPM_BUILD_ROOT
 cd %{pear_name}-%{version}%{?beta}
-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}
@@ -133,6 +130,9 @@ fi
 
 
 %changelog
+* Tue Feb 19 2013 Remi Collet <remi at fedoraproject.org> - 1.9.0-11
+- fix metadata location
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.0-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list