[php-doctrine-dbal/2.5] Updated to 2.5.1 (BZ #1153987)

[Shawn Iwinski]

commit c0ce3da752a06413cb66d27e9d3f918c45a6a0ca
Author: Shawn Iwinski <siwinski at redhat.com>
Date:   Wed Jan 14 19:21:20 2015 -0500

    Updated to 2.5.1 (BZ #1153987)
    
    - Added missing patch

 php-doctrine-dbal-bin.patch |   45 +++++++++++++++++++++++++++++++++++++++++++
 php-doctrine-dbal.spec      |   14 ++++++------
 2 files changed, 52 insertions(+), 7 deletions(-)
---
diff --git a/php-doctrine-dbal-bin.patch b/php-doctrine-dbal-bin.patch
new file mode 100644
index 0000000..993e20e
--- /dev/null
+++ b/php-doctrine-dbal-bin.patch
@@ -0,0 +1,45 @@
+diff --git a/bin/doctrine-dbal.php b/bin/doctrine-dbal.php
+index 3d1131f..f99b2da 100644
+--- a/bin/doctrine-dbal.php
++++ b/bin/doctrine-dbal.php
+@@ -1,3 +1,4 @@
++#!/usr/bin/php
+ <?php
+ /*
+  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+@@ -17,27 +18,21 @@
+  * <http://www.doctrine-project.org>.
+  */
+ 
++require_once '/usr/share/php/Doctrine/Common/ClassLoader.php';
++
++$classLoaderDoctrine = new \Doctrine\Common\ClassLoader('Doctrine');
++$classLoaderDoctrine->register();
++
++$classLoaderSymfony = new \Doctrine\Common\ClassLoader('Symfony');
++$classLoaderSymfony->register();
++
+ use Symfony\Component\Console\Helper\HelperSet;
+ use Doctrine\DBAL\Tools\Console\ConsoleRunner;
+ 
+-$files       = array(__DIR__ . '/../vendor/autoload.php', __DIR__ . '/../../../autoload.php');
+-$loader      = null;
+ $cwd         = getcwd();
+ $directories = array($cwd, $cwd . DIRECTORY_SEPARATOR . 'config');
+ $configFile  = null;
+ 
+-foreach ($files as $file) {
+-    if (file_exists($file)) {
+-        $loader = require $file;
+-
+-        break;
+-    }
+-}
+-
+-if ( ! $loader) {
+-    throw new RuntimeException('vendor/autoload.php could not be found. Did you run `php composer.phar install`?');
+-}
+-
+ foreach ($directories as $directory) {
+     $configFile = $directory . DIRECTORY_SEPARATOR . 'cli-config.php';
+ 
diff --git a/php-doctrine-dbal.spec b/php-doctrine-dbal.spec
index 8f4a006..f4d9310 100644
--- a/php-doctrine-dbal.spec
+++ b/php-doctrine-dbal.spec
@@ -12,11 +12,8 @@
 
 %global github_owner     doctrine
 %global github_name      dbal
-# Additional commits after v2.5.0 tag. Using version 2.5.1 pre-release because
-#   lib/Doctrine/DBAL/Version.php::VERSION = 2.5.1-DEV
 %global github_version   2.5.1
-%global github_commit    185b886e57e9557c4fad7a39d118000f652b72de
-%global github_release   .20150101git%(c=%{github_commit}; echo ${c:0:7})
+%global github_commit    628c2256b646ae2417d44e063bce8aec5199d48d
 
 %global composer_vendor  doctrine
 %global composer_project dbal
@@ -38,7 +35,7 @@
 
 Name:          php-%{composer_vendor}-%{composer_project}
 Version:       %{github_version}
-Release:       0.2%{?github_release}%{?dist}
+Release:       1%{?github_release}%{?dist}
 Summary:       Doctrine Database Abstraction Layer (DBAL)
 
 Group:         Development/Libraries
@@ -64,7 +61,7 @@ BuildRequires: php-composer(doctrine/common) <  %{doctrine_common_max_ver}
 # composer.json (optional)
 BuildRequires: php-symfony-console           >= %{symfony_console_min_ver}
 BuildRequires: php-symfony-console           <  %{symfony_console_max_ver}
-# phpcompatinfo (computed from version 2.5.1 commit 185b886e57e9557c4fad7a39d118000f652b72de)
+# phpcompatinfo (computed from version 2.5.1)
 BuildRequires: php-date
 BuildRequires: php-json
 BuildRequires: php-pcre
@@ -80,7 +77,7 @@ Requires:      php-composer(doctrine/common) <  %{doctrine_common_max_ver}
 # composer.json (optional)
 Requires:      php-symfony-console           >= %{symfony_console_min_ver}
 Requires:      php-symfony-console           <  %{symfony_console_max_ver}
-# phpcompatinfo (computed from version 2.5.1 commit 185b886e57e9557c4fad7a39d118000f652b72de)
+# phpcompatinfo (computed from version 2.5.1)
 Requires:      php-date
 Requires:      php-json
 Requires:      php-pcre
@@ -158,6 +155,9 @@ TEST_INIT
 
 
 %changelog
+* Wed Jan 14 2015 Shawn Iwinski <shawn.iwinski at gmail.com> - 2.5.1-1
+- Updated to 2.5.1 (BZ #1153987)
+
 * Fri Jan 02 2015 Shawn Iwinski <shawn.iwinski at gmail.com> - 2.5.1-0.2.20150101git185b886
 - Updated to latest snapshot
 - Fixed bin script