[php-PhpOption] Updated to 1.4.0 (BZ #1055299)

[Shawn Iwinski]

commit ef81b56c9818aeeac6bba6effc9cb1d8caaacc21
Author: Shawn Iwinski <shawn.iwinski at gmail.com>
Date:   Wed Feb 12 12:24:28 2014 -0500

    Updated to 1.4.0 (BZ #1055299)

 .gitignore         |    1 +
 php-PhpOption.spec |   40 ++++++++++++++++++++++------------------
 sources            |    1 +
 3 files changed, 24 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 917b3d2..a15ce38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /php-PhpOption-1.1.0-617bd84bf0d918da79b06ac6765b5390b83b1321.tar.gz
 /php-PhpOption-1.2.0-24e55357ced5bb041da1416711737b9e144505b4.tar.gz
 /php-PhpOption-1.3.0-1c7e8016289d17d83ced49c56d0f266fd0568941.tar.gz
+/php-PhpOption-1.4.0-5d099bcf0393908bf4ad69cc47dafb785d51f7f5.tar.gz
diff --git a/php-PhpOption.spec b/php-PhpOption.spec
index eab8132..a90110c 100644
--- a/php-PhpOption.spec
+++ b/php-PhpOption.spec
@@ -1,7 +1,7 @@
 %global github_owner   schmittjoh
 %global github_name    php-option
-%global github_version 1.3.0
-%global github_commit  1c7e8016289d17d83ced49c56d0f266fd0568941
+%global github_version 1.4.0
+%global github_commit  5d099bcf0393908bf4ad69cc47dafb785d51f7f5
 
 %global lib_name       PhpOption
 %global php_min_ver    5.3.0
@@ -20,11 +20,11 @@ BuildArch:     noarch
 # For tests
 BuildRequires: php(language) >= %{php_min_ver}
 BuildRequires: php-pear(pear.phpunit.de/PHPUnit)
-# For tests: phpcompatinfo
+# For tests: phpcompatinfo (computed from 1.4.0)
 BuildRequires: php-spl
 
 Requires:      php(language) >= %{php_min_ver}
-# phpcompatinfo
+# phpcompatinfo (computed from 1.4.0)
 Requires:      php-spl
 
 %description
@@ -50,18 +50,7 @@ how he consumes these methods.
 
 
 %prep
-%setup -q -n %{github_name}-%{github_commit}
-
-# Rewrite tests' bootstrap (which uses Composer autoloader)
-# with simple autoloader that uses include path
-( cat <<'AUTOLOAD'
-<?php
-spl_autoload_register(function ($class) {
-    $src = str_replace('\\', '/', str_replace('_', '/', $class)).'.php';
-    @include_once $src;
-});
-AUTOLOAD
-) > tests/bootstrap.php
+%setup -qn %{github_name}-%{github_commit}
 
 
 %build
@@ -69,12 +58,24 @@ AUTOLOAD
 
 
 %install
-mkdir -p -m 755 %{buildroot}%{_datadir}/php
+mkdir -pm 0755 %{buildroot}%{_datadir}/php
 cp -rp src/%{lib_name} %{buildroot}%{_datadir}/php/
 
 
 %check
-%{_bindir}/phpunit -d include_path="./src:./tests:.:%{pear_phpdir}"
+# Rewrite tests' bootstrap
+cat > tests/bootstrap.php <<'BOOTSTRAP'
+<?php
+spl_autoload_register(function ($class) {
+    $src = str_replace(array('\\', '_'), '/', $class).'.php';
+    @include_once $src;
+});
+BOOTSTRAP
+
+# Create PHPUnit config w/ colors turned off
+sed 's/colors="true"/colors="false"/' phpunit.xml.dist > phpunit.xml
+
+%{_bindir}/phpunit --include-path ./src:./tests -d date.timezone="UTC"
 
 
 %files
@@ -83,6 +84,9 @@ cp -rp src/%{lib_name} %{buildroot}%{_datadir}/php/
 
 
 %changelog
+* Wed Feb 12 2014 Shawn Iwinski <shawn.iwinski at gmail.com> 1.4.0-1
+- Updated to 1.4.0 (BZ #1055299)
+
 * Sat Sep 28 2013 Shawn Iwinski <shawn.iwinski at gmail.com> 1.3.0-1
 - Updated to 1.3.0
 - Other minor updates
diff --git a/sources b/sources
index 8ebfb3b..31a63ec 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 80b1e36db833658b02f57950c22d2841  php-PhpOption-1.1.0-617bd84bf0d918da79b06ac6765b5390b83b1321.tar.gz
 e6da5c730829064b49de51ad6bbca337  php-PhpOption-1.2.0-24e55357ced5bb041da1416711737b9e144505b4.tar.gz
 8bfe31439ba4a34f45c42fbc8f50fb7f  php-PhpOption-1.3.0-1c7e8016289d17d83ced49c56d0f266fd0568941.tar.gz
+4a673d2a1124628add103b043d1500ec  php-PhpOption-1.4.0-5d099bcf0393908bf4ad69cc47dafb785d51f7f5.tar.gz