[php-symfony-psr-http-message-bridge] Fixes

- Fixed dependency versions
- Added php-composer(zendframework/zend-diactoros) build dependency for tests
  (excluding el6)
- Autoloader update
- Fixed %files

php-symfony-psr-http-message-bridge/php-symfony-psr-http-message-bridge.spec

@@ -18,22 +18,24 @@
 %global composer_project psr-http-message-bridge
 
 # "php": ">=5.3.3",
-%global php_min_ver 5.4.0
+%global php_min_ver 5.3.3
 # "psr/http-message": "~1.0"
 %global psr_http_message_min_ver 1.0
 %global psr_http_message_max_ver 2.0
 # "symfony/http-foundation": "~2.3|~3.0"
-%global symfony_min_ver 2.3
+%global symfony_min_ver %{?el6:2.3.31}%{!?el6:2.7.3}
 %global symfony_max_ver 4.0
 
+%global with_zend_diactoros 0%{!?el6:1}
+
 # Build using "--without tests" to disable tests
 %global with_tests 0%{!?_without_tests:1}
 
 %{!?phpdir:  %global phpdir  %{_datadir}/php}
 
 Name:          php-%{composer_vendor}-%{composer_project}
 Version:       %{github_version}
-Release:       1%{?github_release}%{?dist}
+Release:       2%{?github_release}%{?dist}
 Summary:       Symfony PSR HTTP message bridge
 
 Group:         Development/Libraries
@@ -44,9 +46,12 @@ Source0:       %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{githu
 BuildArch:     noarch
 # Tests
 %if %{with_tests}
+%if %{with_zend_diactoros}
+BuildRequires: php-composer(zendframework/zend-diactoros)
+%endif
+BuildRequires: %{_bindir}/phpunit
 ## composer.json
 BuildRequires: php(language)                         >= %{php_min_ver}
-BuildRequires: php-composer(phpunit/phpunit)
 BuildRequires: php-composer(psr/http-message)        >= %{psr_http_message_min_ver}
 BuildRequires: php-composer(symfony/http-foundation) >= %{symfony_min_ver}
 ## phpcompatinfo (computed from version 0.2)
@@ -74,9 +79,10 @@ Provides:      php-composer(%{composer_vendor}/%{composer_project}) = %{version}
 
 %description
 Provides integration for PSR7.
-
+%if %{with_zend_diactoros}
 Optional:
 * php-zendframework-zend-diactoros: To use the Zend Diactoros factory
+%endif
 
 
 %prep
@@ -93,15 +99,9 @@ cat <<'AUTOLOAD' | tee autoload.php
  * @return \Symfony\Component\ClassLoader\ClassLoader
  */
 
-require_once '%{phpdir}/Psr/Http/Message/autoload.php';
-
-if (file_exists('%{phpdir}/Zend/Diactoros/autoload.php')) {
-    require_once '%{phpdir}/Zend/Diactoros/autoload.php';
-}
-
 if (!isset($fedoraClassLoader) || !($fedoraClassLoader instanceof \Symfony\Component\ClassLoader\ClassLoader)) {
     if (!class_exists('Symfony\\Component\\ClassLoader\\ClassLoader', false)) {
-        require_once 'Symfony/Component/ClassLoader/ClassLoader.php';
+        require_once '%{phpdir}/Symfony/Component/ClassLoader/ClassLoader.php';
     }
 
     $fedoraClassLoader = new \Symfony\Component\ClassLoader\ClassLoader();
@@ -110,8 +110,14 @@ if (!isset($fedoraClassLoader) || !($fedoraClassLoader instanceof \Symfony\Compo
 
 $fedoraClassLoader->addPrefix('Symfony\\Bridge\\PsrHttpMessage\\', dirname(dirname(dirname(__DIR__))));
 
-// Fall back to include path for all other dependencies for now
-$fedoraClassLoader->setUseIncludePath(true);
+require_once '%{phpdir}/Psr/Http/Message/autoload.php';
+require_once '%{phpdir}/Symfony/Component/HttpFoundation/autoload.php';
+%if %{with_zend_diactoros}
+
+if (file_exists('%{phpdir}/Zend/Diactoros/autoload.php')) {
+    require_once '%{phpdir}/Zend/Diactoros/autoload.php';
+}
+%endif
 
 return $fedoraClassLoader;
 AUTOLOAD
@@ -141,11 +147,17 @@ cp -rp *.php Factory Tests %{buildroot}%{phpdir}/Symfony/Bridge/PsrHttpMessage/
 %license LICENSE
 %doc *.md
 %doc composer.json
-%dir %{phpdir}/Symfony/Bridge
-     %{phpdir}/Symfony/Bridge/PsrHttpMessage
+%{phpdir}/Symfony/Bridge/PsrHttpMessage
 %exclude %{phpdir}/Symfony/Bridge/PsrHttpMessage/Tests
 
 
 %changelog
+* Sun Aug 02 2015 Shawn Iwinski <shawn.iwinski@gmail.com> - 0.2-2
+- Fixed dependency versions
+- Added php-composer(zendframework/zend-diactoros) build dependency for tests
+  (excluding el6)
+- Autoloader update
+- Fixed %%files
+
 * Wed Jul 08 2015 Shawn Iwinski <shawn.iwinski@gmail.com> - 0.2-1
 - Initial package