[php-symfony2-Routing] Updated to 2.2.0
Shawn Iwinski
siwinski at fedoraproject.org
Sat Mar 23 15:03:59 UTC 2013
commit cde492a7770625f2924eee485f14ae30576047ca
Author: Shawn Iwinski <shawn.iwinski at gmail.com>
Date: Wed Mar 13 22:30:16 2013 -0400
Updated to 2.2.0
- Removed tests' bootstrap patch
- Added php-PsrLog build require
- Added php-pear(pear.doctrine-project.org/DoctrineCommon) require
- Removed php-libxml require
.gitignore | 1 +
php-symfony2-Routing-tests-bootstrap.patch | 24 -------
php-symfony2-Routing.spec | 92 ++++++++++++++++++++--------
sources | 1 +
4 files changed, 69 insertions(+), 49 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c355ca1..67fe7b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
/Routing-2.1.6.tgz
/Routing-2.1.7.tgz
/Routing-2.1.8.tgz
+/Routing-2.2.0.tgz
diff --git a/php-symfony2-Routing.spec b/php-symfony2-Routing.spec
index 41b86bc..f6c93bc 100644
--- a/php-symfony2-Routing.spec
+++ b/php-symfony2-Routing.spec
@@ -2,33 +2,36 @@
%{!?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 pear_name Routing
%global php_min_ver 5.3.3
-Name: php-symfony2-Routing
-Version: 2.1.8
+Name: php-symfony2-%{pear_name}
+Version: 2.2.0
Release: 1%{?dist}
Summary: Symfony2 %{pear_name} Component
Group: Development/Libraries
License: MIT
-URL: http://symfony.com/doc/current/components/routing.html
+URL: http://symfony.com/doc/current/components/routing/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})
-# Test requires
+# For tests
BuildRequires: php-common >= %{php_min_ver}
BuildRequires: php-pear(pear.phpunit.de/PHPUnit)
-BuildRequires: php-pear(%{pear_channel}/Config) >= 2.1.0
-BuildRequires: php-pear(%{pear_channel}/HttpKernel) >= 2.1.0
-BuildRequires: php-pear(%{pear_channel}/Yaml) >= 2.1.0
-# Test requires: phpci
+BuildRequires: php-pear(%{pear_channel}/Config) >= 2.2.0
+BuildRequires: php-pear(%{pear_channel}/Config) < 2.3.0
+BuildRequires: php-pear(%{pear_channel}/Yaml) >= 2.2.0
+BuildRequires: php-pear(%{pear_channel}/Yaml) < 2.3.0
+BuildRequires: php-pear(pear.doctrine-project.org/DoctrineCommon) >= 2.2.0
+BuildRequires: php-pear(pear.doctrine-project.org/DoctrineCommon) < 3.0.0
+BuildRequires: php-PsrLog >= 1.0
+BuildRequires: php-PsrLog < 2.0
+# For tests: phpci
BuildRequires: php-dom
-BuildRequires: php-libxml
BuildRequires: php-pcre
BuildRequires: php-reflection
BuildRequires: php-spl
@@ -39,17 +42,19 @@ Requires: php-pear(PEAR)
Requires: php-channel(%{pear_channel})
Requires(post): %{__pear}
Requires(postun): %{__pear}
-# phpci requires
+# phpci
Requires: php-dom
-Requires: php-libxml
Requires: php-pcre
Requires: php-reflection
Requires: php-spl
Requires: php-tokenizer
-# Optional requires
-Requires: php-pear(%{pear_channel}/Config) >= 2.1.0
-Requires: php-pear(%{pear_channel}/Yaml) >= 2.1.0
-# TODO: Add DoctrineCommon (>=2.2,<2.4-dev) when available
+# Optional
+Requires: php-pear(%{pear_channel}/Config) >= 2.2.0
+Requires: php-pear(%{pear_channel}/Config) < 2.3.0
+Requires: php-pear(%{pear_channel}/Yaml) >= 2.2.0
+Requires: php-pear(%{pear_channel}/Yaml) < 2.3.0
+Requires: php-pear(pear.doctrine-project.org/DoctrineCommon) >= 2.2.0
+Requires: php-pear(pear.doctrine-project.org/DoctrineCommon) < 3.0.0
Provides: php-pear(%{pear_channel}/%{pear_name}) = %{version}
@@ -62,23 +67,46 @@ Optional dependency: DoctrineCommon
%prep
%setup -q -c
-# Patches
-cd %{pear_name}-%{version}
-%patch0 -p0
-cd ..
+# Create PHPUnit autoloader
+( cat <<'PHPUNIT_AUTOLOADER'
+<?php
+
+# This file was created by RPM packaging and is not part of the original
+# Symfony2 %{pear_name} PEAR package.
+
+set_include_path(
+ '%{pear_phpdir}'.PATH_SEPARATOR.
+ '%{pear_testdir}/%{pear_name}'.PATH_SEPARATOR.
+ get_include_path()
+);
+
+spl_autoload_register(function ($class) {
+ if ('\\' == $class[0]) {
+ $class = substr($class, 1);
+ }
+
+ $file = str_replace('\\', '/', $class).'.php';
+ @include $file;
+});
+PHPUNIT_AUTOLOADER
+) > phpunit.autoloader.php
+
+# Update PHPUnit config
+sed -e 's#vendor/autoload.php#./phpunit.autoloader.php#' \
+ -i %{pear_name}-%{version}/Symfony/Component/%{pear_name}/phpunit.xml.dist
# Modify PEAR package.xml file:
# - Remove .gitattributes 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
+# - Remove md5sum from phpunit.xml.dist file since it was updated
sed -e '/\.gitattributes/d' \
-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*//' \
+ -e '/phpunit.xml.dist/s/role="php"/role="test"/' \
+ -e '/phpunit.xml.dist/s/md5sum="[^"]*"\s*//' \
-i package.xml
# package.xml is version 2.0
@@ -100,10 +128,17 @@ rm -rf %{buildroot}%{pear_metadir}/.??*
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+# Install PHPUnit autoloader
+install -pm 0644 ../phpunit.autoloader.php \
+ %{buildroot}/%{pear_testdir}/%{pear_name}/Symfony/Component/%{pear_name}/
+
%check
cd %{pear_name}-%{version}/Symfony/Component/%{pear_name}
-%{_bindir}/phpunit
+
+sed 's#./phpunit.autoloader.php#./autoloader.php#' -i phpunit.xml.dist
+
+%{_bindir}/phpunit -d date.timezone="UTC"
%post
@@ -126,6 +161,13 @@ fi
%changelog
+* Wed Mar 13 2013 Shawn Iwinski <shawn.iwinski at gmail.com> 2.2.0-1
+- Updated to 2.2.0
+- Removed tests' bootstrap patch
+- Added php-PsrLog build require
+- Added php-pear(pear.doctrine-project.org/DoctrineCommon) require
+- Removed php-libxml require
+
* Sun Mar 03 2013 Shawn Iwinski <shawn.iwinski at gmail.com> 2.1.8-1
- Updated to upstream version 2.1.8
- Run tests by default (i.e. without "--with tests")
diff --git a/sources b/sources
index db74eb0..95cea01 100644
--- a/sources
+++ b/sources
@@ -8,3 +8,4 @@ a290834c9efb2c46e37b845f0980cd11 Routing-2.1.5.tgz
972f6c200189a9b6ff7a906d0e018e49 Routing-2.1.6.tgz
f6566613081dbacea2517a81f82d9792 Routing-2.1.7.tgz
e6d822cc21318689f31ec06f29342a5d Routing-2.1.8.tgz
+f32fde8b356525d6c937734800b6f3e6 Routing-2.2.0.tgz
More information about the scm-commits
mailing list