[php-phpunit-PHP-CodeBrowser] fix metadata location, FTBFS #914370

Remi Collet remi at fedoraproject.org
Fri Feb 22 10:47:18 UTC 2013


commit 39d7512e78c41354a41cfbbe0a07366615c56511
Author: Remi Collet <rcollet at redhat.com>
Date:   Fri Feb 22 11:47:12 2013 +0100

    fix metadata location, FTBFS #914370

 php-phpunit-PHP-CodeBrowser.spec |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/php-phpunit-PHP-CodeBrowser.spec b/php-phpunit-PHP-CodeBrowser.spec
index 63012e2..1a07944 100644
--- a/php-phpunit-PHP-CodeBrowser.spec
+++ b/php-phpunit-PHP-CodeBrowser.spec
@@ -1,10 +1,11 @@
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %global pear_name PHP_CodeBrowser
 %global channel pear.phpunit.de
 
 Name:           php-phpunit-PHP-CodeBrowser
 Version:        1.0.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        PHP_CodeBrowser for integration in Hudson and CruiseControl
 
 Group:          Development/Libraries
@@ -41,9 +42,6 @@ phpunit.
 %{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml
 cd %{pear_name}-%{version}
 
-# Create a "localized" php.ini to avoid build warning
-cp /etc/php.ini .
-echo "date.timezone=UTC" >>php.ini
 
 %build
 cd %{pear_name}-%{version}
@@ -53,10 +51,10 @@ 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}
@@ -89,6 +87,9 @@ fi
 
 
 %changelog
+* Fri Feb 22 2013 Remi Collet <remi at fedoraproject.org> - 1.0.2-5
+- fix metadata location, FTBFS #914370
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list