[php-symfony2-EventDispatcher] Updated to upstream version 2.1.2 + added tests
Shawn Iwinski
siwinski at fedoraproject.org
Fri Oct 26 00:59:20 UTC 2012
commit 4e620cd88b4babe898e1a37a6d421fb5beb20b3b
Author: Shawn Iwinski <shawn.iwinski at gmail.com>
Date: Sat Sep 22 18:15:15 2012 -0400
Updated to upstream version 2.1.2 + added tests
.gitignore | 1 +
php-symfony2-EventDispatcher-tests-bootstrap.patch | 24 +++++++
php-symfony2-EventDispatcher.spec | 65 +++++++++++++++++---
sources | 1 +
4 files changed, 83 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b8bc403..21384df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/EventDispatcher-2.0.15.tgz
/EventDispatcher-2.0.16.tgz
/EventDispatcher-2.0.17.tgz
+/EventDispatcher-2.1.2.tgz
diff --git a/php-symfony2-EventDispatcher-tests-bootstrap.patch b/php-symfony2-EventDispatcher-tests-bootstrap.patch
new file mode 100644
index 0000000..a06ad0c
--- /dev/null
+++ b/php-symfony2-EventDispatcher-tests-bootstrap.patch
@@ -0,0 +1,24 @@
+--- Symfony/Component/EventDispatcher/Tests/bootstrap.php 2012-09-20 03:42:09.000000000 -0400
++++ Symfony/Component/EventDispatcher/Tests/bootstrap.php 2012-10-25 20:47:18.078169060 -0400
+@@ -10,9 +10,18 @@
+ */
+
+ spl_autoload_register(function ($class) {
+- if (0 === strpos(ltrim($class, '/'), 'Symfony\Component\EventDispatcher')) {
+- if (file_exists($file = __DIR__.'/../'.substr(str_replace('\\', '/', $class), strlen('Symfony\Component\EventDispatcher')).'.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-EventDispatcher.spec b/php-symfony2-EventDispatcher.spec
index 896d400..0fa27a5 100644
--- a/php-symfony2-EventDispatcher.spec
+++ b/php-symfony2-EventDispatcher.spec
@@ -1,10 +1,12 @@
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
%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-EventDispatcher
-Version: 2.0.17
+Version: 2.1.2
Release: 1%{?dist}
Summary: Symfony2 %{pear_name} Component
@@ -12,17 +14,29 @@ Group: Development/Libraries
License: MIT
URL: http://symfony.com/doc/current/components/event_dispatcher/index.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)
+BuildRequires: php-pear(%{pear_channel}/DependencyInjection) >= 2.1.0
+# Test requires: phpci
+BuildRequires: php-spl
+
+Requires: php-common >= %{php_min_ver}
Requires: php-pear(PEAR)
Requires: php-channel(%{pear_channel})
Requires(post): %{__pear}
Requires(postun): %{__pear}
-# No phpci requires
+# phpci requires
+Requires: php-spl
+# Optional requires
+Requires: php-pear(%{pear_channel}/DependencyInjection) >= 2.1.0
+Requires: php-pear(%{pear_channel}/HttpKernel) >= 2.1.0
Provides: php-pear(%{pear_channel}/%{pear_name}) = %{version}
@@ -50,6 +64,24 @@ how it works:
%prep
%setup -q -c
+
+# Patches
+cd %{pear_name}-%{version}
+%patch0 -p0
+cd ..
+
+# Modify PEAR package.xml file:
+# - Remove .gitignore 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 '/.gitignore/d' \
+ -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
@@ -60,14 +92,19 @@ mv package.xml %{pear_name}-%{version}/%{name}.xml
%install
cd %{pear_name}-%{version}
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
+%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
# Clean up unnecessary files
-rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
+rm -rf %{buildroot}%{pear_metadir}/.??*
# Install XML package description
-mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+mkdir -p %{buildroot}%{pear_xmldir}
+install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+
+
+%check
+cd %{pear_name}-%{version}/Symfony/Component/%{pear_name}
+%{_bindir}/phpunit
%post
@@ -88,9 +125,21 @@ fi
%dir %{pear_phpdir}/Symfony
%dir %{pear_phpdir}/Symfony/Component
%{pear_phpdir}/Symfony/Component/%{pear_name}
+%{pear_testdir}/%{pear_name}
%changelog
+* Thu Oct 25 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
+- Require other components ">= 2.1.0" instead of "= %%{version}"
+- Added php-spl, DependencyInjection and HttpKernel requires
+- Added PEAR package.xml modifications
+- Added patch for tests' bootstrap.php
+- Added tests (%%check)
+- Changed RPM_BUILD_ROOT to %%{buildroot}
+- Added %%global pear_metadir
+
* 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 7db2b66..ddd52d9 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
e3581522c989cfddd79dede72c961984 EventDispatcher-2.0.15.tgz
a31b5cbb6cb3b2f471c3aa82f25c0751 EventDispatcher-2.0.16.tgz
8d2a9ec59ca92cf12aa7779f179c2105 EventDispatcher-2.0.17.tgz
+0546241fc860977e4a0afa8f5da81e5b EventDispatcher-2.1.2.tgz
More information about the scm-commits
mailing list