From ce1b1a59bbc674fe2a6630d0d27acf04ec9887a9 Mon Sep 17 00:00:00 2001
From: Shawn Iwinski <siwinski@redhat.com>
Date: Jul 15 2014 20:33:51 +0000
Subject: Updated to 1.2.0 (BZ #1116887)


---

diff --git a/.gitignore b/.gitignore
index ab24c34..dc6ca85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /php-doctrine-annotations-1.1.2-a11349d39d85bef75a71bd69bd604ac4fb993f03.tar.gz
+/php-doctrine-annotations-1.2.0-d9b1a37e9351ddde1f19f09a02e3d6ee92e82efd.tar.gz
diff --git a/php-doctrine-annotations.spec b/php-doctrine-annotations.spec
index 0b59aa1..c564f31 100644
--- a/php-doctrine-annotations.spec
+++ b/php-doctrine-annotations.spec
@@ -11,10 +11,8 @@
 
 %global github_owner     doctrine
 %global github_name      annotations
-%global github_version   1.1.2
-%global github_commit    a11349d39d85bef75a71bd69bd604ac4fb993f03
-# Additional commits after v1.1.2 tag
-%global github_release   .20131220git%(c=%{github_commit}; echo ${c:0:7})
+%global github_version   1.2.0
+%global github_commit    d9b1a37e9351ddde1f19f09a02e3d6ee92e82efd
 
 %global composer_vendor  doctrine
 %global composer_project annotations
@@ -33,7 +31,7 @@
 
 Name:          php-%{composer_vendor}-%{composer_project}
 Version:       %{github_version}
-Release:       5%{?github_release}%{?dist}
+Release:       1%{?github_release}%{?dist}
 Summary:       PHP docblock annotations parser library
 
 Group:         Development/Libraries
@@ -50,7 +48,7 @@ BuildRequires: php-composer(doctrine/cache) <  %{cache_max_ver}
 BuildRequires: php-composer(doctrine/lexer) >= %{lexer_min_ver}
 BuildRequires: php-composer(doctrine/lexer) <  %{lexer_max_ver}
 BuildRequires: php-phpunit-PHPUnit
-# For tests: phpcompatinfo (computed from v1.1.2 git commit a11349d39d85bef75a71bd69bd604ac4fb993f03)
+# For tests: phpcompatinfo (computed from version 1.2.0)
 BuildRequires: php-ctype
 BuildRequires: php-date
 BuildRequires: php-json
@@ -63,7 +61,7 @@ BuildRequires: php-tokenizer
 Requires:      php(language)                >= %{php_min_ver}
 Requires:      php-composer(doctrine/lexer) >= %{lexer_min_ver}
 Requires:      php-composer(doctrine/lexer) <  %{lexer_max_ver}
-# phpcompatinfo (computed from v1.1.2 git commit a11349d39d85bef75a71bd69bd604ac4fb993f03)
+# phpcompatinfo (computed from version 1.2.0)
 Requires:      php-ctype
 Requires:      php-date
 Requires:      php-json
@@ -97,25 +95,27 @@ cp -rp lib/* %{buildroot}/%{_datadir}/php/
 
 %check
 %if %{with_tests}
-# Create tests' init
-cat > tests/Doctrine/Tests/TestInit.php <<'TESTINIT'
+# Create autoloader
+mkdir vendor
+cat > vendor/autoload.php <<'AUTOLOAD'
 <?php
-namespace Doctrine\Tests;
 
 spl_autoload_register(function ($class) {
-    $src = str_replace('\\', '/', str_replace('_', '/', $class)).'.php';
+    $src = str_replace('\\', '/', $class).'.php';
     @include_once $src;
 });
+AUTOLOAD
 
-\Doctrine\Common\Annotations\AnnotationRegistry::registerAutoloadNamespace(
-    'Doctrine\Tests\Common\Annotations\Fixtures', __DIR__ . '/../../'
-);
-TESTINIT
+# Skip test that casues the following exception:
+#     ReflectionException: Class Mock_ReflectionClass_* is an internal class
+#     that cannot be instantiated without invoking its constructor"
+sed 's/function testClassFileDoesNotExist/function SKIP_testClassFileDoesNotExist/' \
+    -i tests/Doctrine/Tests/Common/Annotations/PhpParserTest.php
 
 # Create PHPUnit config w/ colors turned off
 sed 's/colors="true"/colors="false"/' phpunit.xml.dist > phpunit.xml
 
-%{_bindir}/phpunit --include-path ./lib:./tests -d date.timezone="UTC"
+%{_bindir}/phpunit --include-path ./lib -d date.timezone="UTC"
 %else
 : Tests skipped
 %endif
@@ -127,6 +127,9 @@ sed 's/colors="true"/colors="false"/' phpunit.xml.dist > phpunit.xml
 
 
 %changelog
+* Tue Jul 15 2014 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.2.0-1
+- Updated to 1.2.0 (BZ #1116887)
+
 * Fri Jun 20 2014 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.1.2-5.20131220gita11349d
 - Added php-composer(%%{composer_vendor}/%%{composer_project}) virtual provide
 - Added option to build without tests ("--without tests")
diff --git a/sources b/sources
index f576736..e9846df 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fd556799794cd394c2eec253ceacd1f3  php-doctrine-annotations-1.1.2-a11349d39d85bef75a71bd69bd604ac4fb993f03.tar.gz
+3dc151ed353663b078020a12ed027810  php-doctrine-annotations-1.2.0-d9b1a37e9351ddde1f19f09a02e3d6ee92e82efd.tar.gz