From c0893eec4146bcc247e6836f0d428612c08b5fe9 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Jun 15 2015 08:21:48 +0000
Subject: - update to 1.0.5

- improve test suite during the build

---

diff --git a/.gitignore b/.gitignore
index c77c2c1..cbb1713 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 clog
 /instantiator-1.0.4.tar.gz
+/instantiator-1.0.5-8e884e7.tar.gz
diff --git a/php-doctrine-instantiator.spec b/php-doctrine-instantiator.spec
index 2f13cfb..33c10ca 100644
--- a/php-doctrine-instantiator.spec
+++ b/php-doctrine-instantiator.spec
@@ -1,15 +1,15 @@
-# spec file for php-doctrine-instantiator
+# remirepo/fedora spec file for php-doctrine-instantiator
 #
 # Copyright (c) 2014-2015 Remi Collet
 # License: CC-BY-SA
-# http://creativecommons.org/licenses/by-sa/3.0/
+# http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
 
 # bootstrap needed when rebuilding PHPUnit for new major version
 %global bootstrap    0
-%global gh_commit    f976e5de371104877ebc89bd8fecb0019ed9c119
+%global gh_commit    8e884e78f9f0eb1329e445619e04456e64d8051d
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     doctrine
 %global gh_project   instantiator
@@ -20,14 +20,14 @@
 %endif
 
 Name:           php-doctrine-instantiator
-Version:        1.0.4
+Version:        1.0.5
 Release:        1%{?dist}
 Summary:        Instantiate objects in PHP without invoking their constructors
 
 Group:          Development/Libraries
 License:        MIT
 URL:            https://github.com/%{gh_owner}/%{gh_project}
-Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}.tar.gz
+Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz
 
 BuildArch:      noarch
 BuildRequires:  %{_bindir}/phpab
@@ -40,9 +40,9 @@ BuildRequires:  %{_bindir}/phpunit
 %endif
 
 # From composer.json
-#        "php": "~5.3"
+#        "php": ">=5.3,<8.0-DEV"
 Requires:       php(language) >= 5.3
-# From phpcompatinfo report for version 1.0.0
+# From phpcompatinfo report for version 1.0.5
 Requires:       php-reflection
 
 Provides:       php-composer(doctrine/instantiator) = %{version}
@@ -71,28 +71,23 @@ cp -pr src/* %{buildroot}%{_datadir}/php
 
 %check
 %if %{with_tests}
+# "src" directory only needed for EPEL-6
 : Generate autoloader
 %{_bindir}/phpab \
     --basedir $PWD \
     --output autoload.php \
     src tests
 
-if [ -d /usr/share/php/PHPUnit ] \
-   && grep -q Doctrine /usr/share/php/PHPUnit/Autoload.php
-then
-  # Hack PHPUnit >= 4.3 autoloader to not use system Instantiator
-  mkdir PHPUnit
-  sed -e '/Doctrine\\\\Instantiator/d' \
-    -e 's:dirname(__FILE__):"/usr/share/php/PHPUnit":' \
-    /usr/share/php/PHPUnit/Autoload.php \
-    >PHPUnit/Autoload.php
-fi
-
 sed -e '/log/d' phpunit.xml.dist >phpunit.xml
 
+# "pear" directory only needed for EPEL-6
 : Run test suite
-%{_bindir}/phpunit \
-    --bootstrap autoload.php
+%{_bindir}/php \
+    -d include_path=".:%{buildroot}%{_datadir}/php:%{_datadir}/pear:%{_datadir}/php" \
+    %{_bindir}/phpunit \
+        --include-path=%{buildroot}%{_datadir}/php \
+        --bootstrap autoload.php \
+        --verbose
 %else
 : Test suite disabled
 %endif
@@ -103,10 +98,14 @@ sed -e '/log/d' phpunit.xml.dist >phpunit.xml
 %license LICENSE
 %doc *.md composer.json
 %dir %{_datadir}/php/Doctrine
-%{_datadir}/php/Doctrine/Instantiator
+     %{_datadir}/php/Doctrine/Instantiator
 
 
 %changelog
+* Mon Jun 15 2015 Remi Collet <remi@fedoraproject.org> - 1.0.5-1
+- update to 1.0.5
+- improve test suite during the build
+
 * Fri Feb 13 2015 Remi Collet <remi@fedoraproject.org> - 1.0.4-1
 - update to 1.0.4 (no change)
 - add autoloader
diff --git a/sources b/sources
index 44f15e4..7c3556b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d18899c449e39fe88aa5a22540178149  instantiator-1.0.4.tar.gz
+3cfcd289485d451b696aa4799c38f7a1  instantiator-1.0.5-8e884e7.tar.gz