[php-phpunit-PHP-Timer] fix metadata location, FTBFS #914371

Remi Collet remi at fedoraproject.org
Fri Feb 22 10:51:16 UTC 2013


commit 2971cbdb28801d275065147cfa8bda9105a3e941
Author: Remi Collet <rcollet at redhat.com>
Date:   Fri Feb 22 11:51:09 2013 +0100

    fix metadata location, FTBFS #914371

 php-phpunit-PHP-Timer.spec |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/php-phpunit-PHP-Timer.spec b/php-phpunit-PHP-Timer.spec
index 6cbe47c..44895cd 100644
--- a/php-phpunit-PHP-Timer.spec
+++ b/php-phpunit-PHP-Timer.spec
@@ -1,10 +1,11 @@
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %global pear_name PHP_Timer
 %global channel pear.phpunit.de
 
 Name:           php-phpunit-PHP-Timer
 Version:        1.0.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        PHP Utility class for timing
 
 Group:          Development/Libraries
@@ -34,9 +35,6 @@ PHP Utility class for timing
 
 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}
@@ -45,8 +43,8 @@ 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
+%{__rm} -rf $RPM_BUILD_ROOT
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 # Clean up unnecessary files
 %{__rm} -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -81,6 +79,9 @@ fi
 %doc %{pear_docdir}/%{pear_name}
 
 %changelog
+* Fri Feb 22 2013 Remi Collet <remi at fedoraproject.org> - 1.3.3-3
+- fix metadata location, FTBFS #914371
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list