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

Shawn Iwinski siwinski at fedoraproject.org
Sat Oct 20 22:34:38 UTC 2012


commit c6c5c6eb16330ebdca910f894347f7fb96737e1a
Author: Shawn Iwinski <shawn.iwinski at gmail.com>
Date:   Sun Sep 23 17:58:08 2012 -0400

    Updated to upstream version 2.1.2 + added tests

 .gitignore                                 |    1 +
 php-symfony2-Process-tests-bootstrap.patch |   24 +++++++++++++
 php-symfony2-Process.spec                  |   49 ++++++++++++++++++++++++++--
 sources                                    |    1 +
 4 files changed, 72 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9c6469d..a6bec67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /Process-2.0.15.tgz
 /Process-2.0.16.tgz
 /Process-2.0.17.tgz
+/Process-2.1.2.tgz
diff --git a/php-symfony2-Process-tests-bootstrap.patch b/php-symfony2-Process-tests-bootstrap.patch
new file mode 100644
index 0000000..482d533
--- /dev/null
+++ b/php-symfony2-Process-tests-bootstrap.patch
@@ -0,0 +1,24 @@
+--- Symfony/Component/Process/Tests/bootstrap.php	2012-09-20 03:42:16.000000000 -0400
++++ Symfony/Component/Process/Tests/bootstrap.php	2012-10-20 18:05:44.955617865 -0400
+@@ -10,9 +10,18 @@
+  */
+ 
+ spl_autoload_register(function ($class) {
+-    if (0 === strpos(ltrim($class, '/'), 'Symfony\Component\Process')) {
+-        if (file_exists($file = __DIR__.'/../'.substr(str_replace('\\', '/', $class), strlen('Symfony\Component\Process')).'.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-Process.spec b/php-symfony2-Process.spec
index 0c6f6c8..e93f3a6 100644
--- a/php-symfony2-Process.spec
+++ b/php-symfony2-Process.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-Process
-Version:          2.0.17
+Version:          2.1.2
 Release:          1%{?dist}
 Summary:          Symfony2 %{pear_name} Component
 
@@ -12,17 +13,29 @@ Group:            Development/Libraries
 License:          MIT
 URL:              http://symfony.com/doc/current/components/process.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-pcntl
+BuildRequires:    php-pcre
+BuildRequires:    php-reflection
+BuildRequires:    php-spl
+
+Requires:         php-common >= 5.3.3
 Requires:         php-pear(PEAR)
 Requires:         php-channel(%{pear_channel})
 Requires(post):   %{__pear}
 Requires(postun): %{__pear}
 # phpci requires
+Requires:         php-pcntl
+Requires:         php-pcre
+Requires:         php-reflection
 Requires:         php-spl
 
 Provides:         php-pear(%{pear_channel}/%{pear_name}) = %{version}
@@ -33,6 +46,22 @@ The Process Component executes commands in sub-processes.
 
 %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
 
@@ -53,6 +82,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 || :
@@ -71,9 +105,18 @@ 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 php-pcntl, php-pcre and php-reflection requires
+- 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 e94705a..077cc3c 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 37a52979f35de791b3521d0a38c07816  Process-2.0.15.tgz
 b6535b112989292b429459cc7eade831  Process-2.0.16.tgz
 b48af7635bb46e3e2a279d2b154aab2d  Process-2.0.17.tgz
+103b697692ba211e8ff34c89a5a249fc  Process-2.1.2.tgz


More information about the scm-commits mailing list