summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2012-10-06 10:38:07 +0200
committerRemi Collet <fedora@famillecollet.com>2012-10-06 10:38:07 +0200
commitd84f16574636c1a9aa8346ee0e5e322b956288ef (patch)
treea250adb3d88c14bfecc38071a9d5e9c51d43cf3b
parent9679491ad8f1fa5bab61a03a7ab0d85aa248b899 (diff)
php-phpunit-PHP-Timer-1.0.4
-rw-r--r--php-phpunit-PHP-Timer.spec24
1 files changed, 11 insertions, 13 deletions
diff --git a/php-phpunit-PHP-Timer.spec b/php-phpunit-PHP-Timer.spec
index c31731a..5e8ae89 100644
--- a/php-phpunit-PHP-Timer.spec
+++ b/php-phpunit-PHP-Timer.spec
@@ -1,9 +1,10 @@
+%{!?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.3
+Version: 1.0.4
Release: 1%{?dist}
Summary: PHP Utility class for timing
@@ -29,14 +30,9 @@ PHP Utility class for timing
%prep
%setup -q -c
-[ -f package2.xml ] || mv package.xml package2.xml
-%{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml
-
cd %{pear_name}-%{version}
+mv ../package.xml %{name}.xml
-# Create a "localized" php.ini to avoid build warning
-cp /etc/php.ini .
-echo "date.timezone=UTC" >>php.ini
%build
cd %{pear_name}-%{version}
@@ -46,19 +42,18 @@ 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}
-%{__install} -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
+install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
%clean
-
-%{__rm} -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
%post
@@ -80,6 +75,9 @@ fi
%{pear_phpdir}/PHP
%changelog
+* Sat Oct 6 2012 Remi Collet <rpms@famillecollet.com> 1.0.4-1
+- update to 1.0.4
+
* Mon Sep 24 2012 Remi Collet <rpms@famillecollet.com> 1.0.3-1
- update to 1.0.3