[php-symfony2-Templating] Updated to upstream version 2.1.2 + added tests
Shawn Iwinski
siwinski at fedoraproject.org
Sun Oct 21 01:19:02 UTC 2012
commit 38d3088e74ba844a1068f11566bc62a506dabe1b
Author: Shawn Iwinski <shawn.iwinski at gmail.com>
Date: Sun Sep 23 20:26:43 2012 -0400
Updated to upstream version 2.1.2 + added tests
.gitignore | 1 +
php-symfony2-Templating-tests-bootstrap.patch | 24 +++++++++++++
php-symfony2-Templating.spec | 47 +++++++++++++++++++++++--
sources | 1 +
4 files changed, 70 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9f94aca..840dfa0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/Templating-2.0.15.tgz
/Templating-2.0.16.tgz
/Templating-2.0.17.tgz
+/Templating-2.1.2.tgz
diff --git a/php-symfony2-Templating-tests-bootstrap.patch b/php-symfony2-Templating-tests-bootstrap.patch
new file mode 100644
index 0000000..b8b00d3
--- /dev/null
+++ b/php-symfony2-Templating-tests-bootstrap.patch
@@ -0,0 +1,24 @@
+--- Symfony/Component/Templating/Tests/bootstrap.php 2012-09-20 03:42:18.000000000 -0400
++++ Symfony/Component/Templating/Tests/bootstrap.php 2012-10-20 19:42:13.871438548 -0400
+@@ -10,9 +10,18 @@
+ */
+
+ spl_autoload_register(function ($class) {
+- if (0 === strpos(ltrim($class, '/'), 'Symfony\Component\Templating')) {
+- if (file_exists($file = __DIR__.'/../'.substr(str_replace('\\', '/', $class), strlen('Symfony\Component\Templating')).'.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-Templating.spec b/php-symfony2-Templating.spec
index 7ddf28b..99519af 100644
--- a/php-symfony2-Templating.spec
+++ b/php-symfony2-Templating.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-Templating
-Version: 2.0.17
+Version: 2.1.2
Release: 1%{?dist}
Summary: Symfony2 %{pear_name} Component
@@ -12,12 +13,23 @@ Group: Development/Libraries
License: MIT
URL: http://symfony.com/doc/current/components/templating.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-iconv
+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}
@@ -42,6 +54,22 @@ blocks and layouts.
%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
@@ -62,6 +90,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 || :
@@ -80,9 +113,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
diff --git a/sources b/sources
index 59fb31b..6cc4d96 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
5649ea7d5c9f06120a0cfe1a1dbec30d Templating-2.0.15.tgz
4c3f56e950140fbe6ea3085f22a25c9c Templating-2.0.16.tgz
0fd58d5cc442d0b957d6a3e9e3d3235f Templating-2.0.17.tgz
+086b6cb80723d8dee37ad7dd7d26560c Templating-2.1.2.tgz
More information about the scm-commits
mailing list