[php-guzzlehttp-guzzle] Fix test suite when previous version installed

[Shawn Iwinski]

commit 5f5a116aa769c7244dd7fb5bc247ccfac1c14467
Author: Shawn Iwinski <shawn.iwinski at gmail.com>
Date:   Tue Aug 26 15:08:25 2014 -0400

    Fix test suite when previous version installed

 php-guzzlehttp-guzzle.spec |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/php-guzzlehttp-guzzle.spec b/php-guzzlehttp-guzzle.spec
index 55b4a51..21ef725 100644
--- a/php-guzzlehttp-guzzle.spec
+++ b/php-guzzlehttp-guzzle.spec
@@ -31,7 +31,7 @@
 
 Name:          php-%{composer_vendor}-%{composer_project}
 Version:       %{github_version}
-Release:       1%{?github_release}%{?dist}
+Release:       2%{?github_release}%{?dist}
 Summary:       PHP HTTP client and webservice framework
 
 Group:         Development/Libraries
@@ -135,11 +135,7 @@ cat > vendor/autoload.php <<'AUTOLOAD'
 
 spl_autoload_register(function ($class) {
     $src = str_replace(array('\\', '_'), '/', $class).'.php';
-    if (!@include_once $src) {
-        $psr4_class = preg_replace('#^GuzzleHttp\\\?#', '', $class);
-        $psr4_src = str_replace(array('\\', '_'), '/', $psr4_class).'.php';
-        @include_once $psr4_src;
-    }
+    @include_once $src;
 });
 
 require_once '%{_datadir}/php/GuzzleHttp/Stream/functions.php';
@@ -149,7 +145,7 @@ AUTOLOAD
 # Create PHPUnit config w/ colors turned off
 sed 's/colors\s*=\s*"true"/colors="false"/' phpunit.xml.dist > phpunit.xml
 
-%{_bindir}/phpunit --include-path="./src:./tests" -d date.timezone="UTC"
+%{_bindir}/phpunit --include-path="%{buildroot}%{_datadir}/php" -d date.timezone="UTC"
 %else
 : Tests skipped
 %endif
@@ -163,6 +159,9 @@ sed 's/colors\s*=\s*"true"/colors="false"/' phpunit.xml.dist > phpunit.xml
 
 
 %changelog
+* Tue Aug 26 2014 Shawn Iwinski <shawn.iwinski at gmail.com> - 4.1.8-2
+- Fix test suite when previous version installed
+
 * Sat Aug 23 2014 Shawn Iwinski <shawn.iwinski at gmail.com> - 4.1.8-1
 - Updated to 4.1.8 (BZ #1126611)