[php-symfony2-Yaml] Updated to upstream version 2.1.2 + added tests

[Shawn Iwinski]

commit 22cdb6a79a71461b0fef12106eef00284d8c24e3
Author: Shawn Iwinski <shawn.iwinski at gmail.com>
Date:   Sun Sep 23 20:34:56 2012 -0400

    Updated to upstream version 2.1.2 + added tests

 .gitignore                              |    1 +
 php-symfony2-Yaml-tests-bootstrap.patch |   26 ++++++++++++++++
 php-symfony2-Yaml.spec                  |   48 +++++++++++++++++++++++++++++--
 sources                                 |    1 +
 4 files changed, 73 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e2b379a..8d9dd7d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /Yaml-2.0.15.tgz
 /Yaml-2.0.16.tgz
 /Yaml-2.0.17.tgz
+/Yaml-2.1.2.tgz
diff --git a/php-symfony2-Yaml-tests-bootstrap.patch b/php-symfony2-Yaml-tests-bootstrap.patch
new file mode 100644
index 0000000..9d44a18
--- /dev/null
+++ b/php-symfony2-Yaml-tests-bootstrap.patch
@@ -0,0 +1,26 @@
+--- Symfony/Component/Yaml/Tests/bootstrap.php	2012-09-20 03:42:20.000000000 -0400
++++ Symfony/Component/Yaml/Tests/bootstrap.php	2012-10-20 21:28:00.503147342 -0400
+@@ -9,10 +9,20 @@
+  * file that was distributed with this source code.
+  */
+ 
++date_default_timezone_set('UTC');
+ spl_autoload_register(function ($class) {
+-    if (0 === strpos(ltrim($class, '/'), 'Symfony\Component\Yaml')) {
+-        if (file_exists($file = __DIR__.'/../'.substr(str_replace('\\', '/', $class), strlen('Symfony\Component\Yaml')).'.php')) {
+-            require_once $file;
++    if (0 === strpos(ltrim($class, '/'), 'Symfony\Component')) {
++        $file = substr(str_replace('\\', '/', $class), strlen('Symfony\Component')).'.php';
++        if (file_exists(__DIR__.'/../..'.$file)) {
++            // Load from source tree
++            require_once __DIR__.'/../..'.$file;
++        } else {
++            try {
++                // Try loading from incude path
++                require_once 'Symfony/Component'.$file;
++            } catch (Exception $e) {
++                // Fail silently so class not found fatal error still raised
++            }
+         }
+     }
+ });
diff --git a/php-symfony2-Yaml.spec b/php-symfony2-Yaml.spec
index 5d8f2de..5fbd38f 100644
--- a/php-symfony2-Yaml.spec
+++ b/php-symfony2-Yaml.spec
@@ -2,9 +2,10 @@
 
 %global pear_channel pear.symfony.com
 %global pear_name    %(echo %{name} | sed -e 's/^php-symfony2-//' -e 's/-/_/g')
+%global php_min_ver  5.3.3
 
 Name:             php-symfony2-Yaml
-Version:          2.0.17
+Version:          2.1.2
 Release:          1%{?dist}
 Summary:          Symfony2 %{pear_name} Component
 
@@ -12,12 +13,24 @@ Group:            Development/Libraries
 License:          MIT
 URL:              http://symfony.com/doc/current/components/yaml.html
 Source0:          http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
+Patch0:           %{name}-tests-bootstrap.patch
 
 BuildArch:        noarch
 BuildRequires:    php-pear(PEAR)
 BuildRequires:    php-channel(%{pear_channel})
-
-Requires:         php-common >= 5.3.2
+# Test requires
+BuildRequires:    php-common >= %{php_min_ver}
+BuildRequires:    php-pear(pear.phpunit.de/PHPUnit)
+# Test requires: phpci
+BuildRequires:    php-ctype
+BuildRequires:    php-date
+BuildRequires:    php-iconv
+BuildRequires:    php-json
+BuildRequires:    php-mbstring
+BuildRequires:    php-pcre
+BuildRequires:    php-spl
+
+Requires:         php-common >= %{php_min_ver}
 Requires:         php-pear(PEAR)
 Requires:         php-channel(%{pear_channel})
 Requires(post):   %{__pear}
@@ -48,6 +61,22 @@ specification.
 
 %prep
 %setup -q -c
+
+# Patches
+cd %{pear_name}-%{version}
+%patch0 -p0
+cd ..
+
+# Modify PEAR package.xml file:
+# - Change role from "php" to "doc" for CHANGELOG.md file
+# - Change role from "php" to "test" for all test files
+# - Remove md5sum from bootsrap.php file since it was patched
+sed -e '/CHANGELOG.md/s/role="php"/role="doc"/' \
+    -e '/phpunit.xml.dist/s/role="php"/role="test"/' \
+    -e '/Tests/s/role="php"/role="test"/' \
+    -e '/bootstrap.php/s/md5sum="[^"]*"\s*//' \
+    -i package.xml
+
 # package.xml is version 2.0
 mv package.xml %{pear_name}-%{version}/%{name}.xml
 
@@ -68,6 +97,11 @@ mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
 install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 
+%check
+cd %{pear_name}-%{version}/Symfony/Component/%{pear_name}
+%{_bindir}/phpunit
+
+
 %post
 %{__pear} install --nodeps --soft --force --register-only \
     %{pear_xmldir}/%{name}.xml >/dev/null || :
@@ -86,9 +120,17 @@ fi
 %dir %{pear_phpdir}/Symfony
 %dir %{pear_phpdir}/Symfony/Component
      %{pear_phpdir}/Symfony/Component/%{pear_name}
+%{pear_testdir}/%{pear_name}
 
 
 %changelog
+* Sat Oct 20 2012 Shawn Iwinski <shawn.iwinski at gmail.com> 2.1.2-1
+- Updated to upstream version 2.1.2
+- PHP minimum version 5.3.3 instead of 5.3.2
+- Added PEAR package.xml modifications
+- Added patch for tests' bootstrap.php
+- Added tests (%%check)
+
 * Sat Sep 15 2012 Shawn Iwinski <shawn.iwinski at gmail.com> 2.0.17-1
 - Updated to upstream version 2.0.17
 - Added php-spl require
diff --git a/sources b/sources
index 7f467ad..43049ae 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 281e7f32903bafe509cb4b5a68b3dec3  Yaml-2.0.15.tgz
 8e6e862fbc6bde6326372961b78b42fd  Yaml-2.0.16.tgz
 fc3e46f4d5c50eef9c157926486ff431  Yaml-2.0.17.tgz
+85b7c9272413501386a468cf0dc09a70  Yaml-2.1.2.tgz