From d41f272153cba586b36fe885bec3cf6ab8e0cad7 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Tue, 16 Jul 2013 08:23:41 +0200
Subject: php-phpunit-PHP-Invoker: sync with rawhide

---
 Makefile                     |  2 +-
 php-phpunit-PHP-Invoker.spec | 36 ++++++++++++++++++++++++++++++------
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 1e65467..13af741 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
 SRCDIR := $(shell pwd)
 NAME := $(shell basename $(SRCDIR))
-include ../common/Makefile
+include ../../../common/Makefile
 
diff --git a/php-phpunit-PHP-Invoker.spec b/php-phpunit-PHP-Invoker.spec
index 5679da3..aa001a3 100644
--- a/php-phpunit-PHP-Invoker.spec
+++ b/php-phpunit-PHP-Invoker.spec
@@ -1,11 +1,12 @@
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 
 %global channel   pear.phpunit.de
 %global pear_name PHP_Invoker
 
 Name:           php-phpunit-PHP-Invoker
-Version:        1.0.0
-Release:        3%{?dist}
+Version:        1.1.2
+Release:        2%{?dist}
 Summary:        Utility class for invoking callables with a timeout
 
 Group:          Development/Libraries
@@ -21,9 +22,10 @@ BuildRequires:  php-channel(%{channel})
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Requires:       php-pear(PEAR) >= 1.9.4
-Requires:       php-channel(%{channel})
-# merge php-cntl + php >= 5.2.7, php-cli provides php-pcntl
-Requires:       php-cli >= 5.2.7
+Requires:       php-pear(%{channel}/PHP_Timer) >= 1.0.1
+Requires:       php-common >= 5.2.7
+Requires:       php-pcntl
+Requires:       php-spl
 
 Provides:       php-pear(%{channel}/%{pear_name}) = %{version}
 
@@ -49,7 +51,7 @@ rm -rf %{buildroot}
 %{__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
 install -Dpm 644 %{name}.xml %{buildroot}%{pear_xmldir}/%{name}.xml
@@ -79,6 +81,28 @@ fi
 
 
 %changelog
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Sat Oct  6 2012 Remi Collet <remi@fedoraproject.org> - 1.1.2-1
+- Update to 1.1.2 (stable) - API 1.1.0
+
+* Mon Sep 24 2012 Remi Collet <remi@fedoraproject.org> - 1.1.1-1
+- Update to 1.1.1 (stable) - API 1.1.0
+
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Tue Jan 24 2012 Remi Collet <remi@fedoraproject.org> - 1.1.0-1
+- Update to 1.1.0 (stable) - API 1.1.0
+- now requires PHP_Timer
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Sat Nov 26 2011 Remi Collet <remi@fedoraproject.org> - 1.0.1-1
+- Update to 1.0.1 (stable) - API 1.0.0
+
 * Tue Nov 01 2011 Remi Collet <remi@fedoraproject.org> - 1.0.0-3
 - fix provides
 
-- 
cgit