v2.5.1 from Fedora

1 files changed, 11 insertions, 10 deletions

diff --git a/php-doctrine-orm-bin.patch b/php-doctrine-orm-bin.patch
index 31772bb..08c7645 100644
--- a/php-doctrine-orm-bin.patch
+++ b/php-doctrine-orm-bin.patch
@@ -1,5 +1,5 @@
 diff --git a/bin/doctrine.php b/bin/doctrine.php
-index c735562..99014f4 100755
+index 842c5493f..e1ccb7506 100755
 --- a/bin/doctrine.php
 +++ b/bin/doctrine.php
 @@ -1,3 +1,4 @@
@@ -7,18 +7,19 @@ index c735562..99014f4 100755
  <?php
  /*
   * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-@@ -20,7 +21,13 @@
+@@ -20,14 +21,7 @@
  use Symfony\Component\Console\Helper\HelperSet;
  use Doctrine\ORM\Tools\Console\ConsoleRunner;
  
--(@include_once __DIR__ . '/../vendor/autoload.php') || @include_once __DIR__ . '/../../../autoload.php';
-+require_once '/usr/share/php/Doctrine/Common/ClassLoader.php';
-+
-+$classLoader = new \Doctrine\Common\ClassLoader('Doctrine');
-+$classLoader->register();
-+
-+$classLoader = new \Doctrine\Common\ClassLoader('Symfony');
-+$classLoader->register();
+-$autoloadFiles = array(__DIR__ . '/../vendor/autoload.php',
+-                       __DIR__ . '/../../../autoload.php');
+-
+-foreach ($autoloadFiles as $autoloadFile) {
+-    if (file_exists($autoloadFile)) {
+-        require_once $autoloadFile;
+-    }
+-}
++require_once '__PHPDIR__/Doctrine/ORM/autoload.php';
  
  $directories = array(getcwd(), getcwd() . DIRECTORY_SEPARATOR . 'config');