From 03d43e9b3c1da855b1bb9b78bbaa2b6367a0f183 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 21 Nov 2014 10:26:09 +0100 Subject: php-symfony: 2.5.7 (backport) --- php-symfony.spec | 75 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 36 deletions(-) diff --git a/php-symfony.spec b/php-symfony.spec index 9b09fcc..077e3b7 100644 --- a/php-symfony.spec +++ b/php-symfony.spec @@ -13,8 +13,8 @@ %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} %global github_owner symfony %global github_name symfony -%global github_version 2.5.6 -%global github_commit 1a1b1e528935f15dd76169f8b1dc3ef97f0d6210 +%global github_version 2.5.7 +%global github_commit dd4254fc39a702af22cd886a6790769541469da1 %global composer_vendor symfony %global composer_project symfony @@ -40,6 +40,9 @@ # "doctrine/orm": "~2.2,>=2.2.3" (composer.json) %global doctrine_orm_min_ver 2.2.3 %global doctrine_orm_max_ver 3.0 +# "egulias/email-validator": "~1.2" +%global email_validator_min_ver 1.2 +%global email_validator_max_ver 2.0 # "ircmaxell/password-compat": "1.0.*" (composer.json) %global password_compat_min_ver 1.0.0 %global password_compat_max_ver 1.1.0 @@ -71,7 +74,7 @@ Name: php-%{composer_project} Version: %{github_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: PHP framework for web projects Group: Development/Libraries @@ -90,31 +93,32 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %if %{with_tests} # For tests -BuildRequires: php(language) >= %{php_min_ver} -BuildRequires: php-composer(doctrine/annotations) >= %{doctrine_annotations_min_ver} -BuildRequires: php-composer(doctrine/annotations) < %{doctrine_annotations_max_ver} -BuildRequires: php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} -BuildRequires: php-composer(doctrine/cache) < %{doctrine_cache_max_ver} -BuildRequires: php-composer(doctrine/common) >= %{doctrine_common_min_ver} -BuildRequires: php-composer(doctrine/common) < %{doctrine_common_max_ver} -BuildRequires: php-composer(doctrine/data-fixtures) >= %{doctrine_datafixtures_min_ver} -BuildRequires: php-composer(doctrine/data-fixtures) < %{doctrine_datafixtures_max_ver} -BuildRequires: php-composer(doctrine/dbal) >= %{doctrine_dbal_min_ver} -BuildRequires: php-composer(doctrine/dbal) < %{doctrine_dbal_max_ver} -BuildRequires: php-composer(doctrine/orm) >= %{doctrine_orm_min_ver} -BuildRequires: php-composer(doctrine/orm) < %{doctrine_orm_max_ver} -BuildRequires: php-composer(monolog/monolog) >= %{monolog_min_ver} -BuildRequires: php-composer(monolog/monolog) < %{monolog_max_ver} -BuildRequires: php-composer(psr/log) >= %{psrlog_min_ver} -BuildRequires: php-composer(psr/log) < %{psrlog_max_ver} -BuildRequires: php-composer(twig/twig) >= %{twig_min_ver} -BuildRequires: php-composer(twig/twig) < %{twig_max_ver} +BuildRequires: php(language) >= %{php_min_ver} +BuildRequires: php-composer(doctrine/annotations) >= %{doctrine_annotations_min_ver} +BuildRequires: php-composer(doctrine/annotations) < %{doctrine_annotations_max_ver} +BuildRequires: php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} +BuildRequires: php-composer(doctrine/cache) < %{doctrine_cache_max_ver} +BuildRequires: php-composer(doctrine/common) >= %{doctrine_common_min_ver} +BuildRequires: php-composer(doctrine/common) < %{doctrine_common_max_ver} +BuildRequires: php-composer(doctrine/data-fixtures) >= %{doctrine_datafixtures_min_ver} +BuildRequires: php-composer(doctrine/data-fixtures) < %{doctrine_datafixtures_max_ver} +BuildRequires: php-composer(doctrine/dbal) >= %{doctrine_dbal_min_ver} +BuildRequires: php-composer(doctrine/dbal) < %{doctrine_dbal_max_ver} +BuildRequires: php-composer(doctrine/orm) >= %{doctrine_orm_min_ver} +BuildRequires: php-composer(doctrine/orm) < %{doctrine_orm_max_ver} +BuildRequires: php-composer(egulias/email-validator) >= %{email_validator_min_ver} +BuildRequires: php-composer(egulias/email-validator) < %{email_validator_max_ver} +BuildRequires: php-composer(monolog/monolog) >= %{monolog_min_ver} +BuildRequires: php-composer(monolog/monolog) < %{monolog_max_ver} +BuildRequires: php-composer(psr/log) >= %{psrlog_min_ver} +BuildRequires: php-composer(psr/log) < %{psrlog_max_ver} +BuildRequires: php-composer(twig/twig) >= %{twig_min_ver} +BuildRequires: php-composer(twig/twig) < %{twig_max_ver} BuildRequires: php-phpunit-PHPUnit %if "%{php_version}" < "5.5" -BuildRequires: php-password-compat >= %{password_compat_min_ver} -BuildRequires: php-password-compat < %{password_compat_max_ver} +BuildRequires: php-password-compat >= %{password_compat_min_ver} +BuildRequires: php-password-compat < %{password_compat_max_ver} %endif -## TODO: "egulias/email-validator" ## TODO: "propel/propel1" ## TODO: "ocramius/proxy-manager" # For tests: phpcompatinfo (computed from version 2.5.6) @@ -1424,11 +1428,12 @@ Requires: php-composer(%{composer_vendor}/http-foundation) = %{version} Requires: php-composer(%{composer_vendor}/intl) = %{version} Requires: php-composer(%{composer_vendor}/property-access) = %{version} Requires: php-composer(%{composer_vendor}/yaml) = %{version} -Requires: php-composer(doctrine/annotations) >= %{doctrine_annotations_min_ver} -Requires: php-composer(doctrine/annotations) < %{doctrine_annotations_max_ver} -Requires: php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} -Requires: php-composer(doctrine/cache) < %{doctrine_cache_max_ver} -## TODO: "egulias/email-validator" +Requires: php-composer(doctrine/annotations) >= %{doctrine_annotations_min_ver} +Requires: php-composer(doctrine/annotations) < %{doctrine_annotations_max_ver} +Requires: php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} +Requires: php-composer(doctrine/cache) < %{doctrine_cache_max_ver} +Requires: php-composer(egulias/email-validator) >= %{email_validator_min_ver} +Requires: php-composer(egulias/email-validator) < %{email_validator_max_ver} # phpcompatinfo (computed from version 2.5.6) Requires: php-ctype Requires: php-date @@ -1553,9 +1558,6 @@ if [ -d %{phpdir}/PHPUnit ]; then %{phpdir}/PHPUnit/Autoload.php > PHPUnit/Autoload.php fi -# Create PHPUnit config w/ colors turned off -sed 's/colors="true"/colors="false"/' phpunit.xml.dist > phpunit.xml - # Skip tests that rely on external resources rm -f src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php sed 's/function testNonSeekableStream/function SKIP_testNonSeekableStream/' \ @@ -1575,8 +1577,6 @@ sed 's/function testTTYCommand/function SKIP_testTTYCommand/' \ -i src/Symfony/Component/Process/Tests/AbstractProcessTest.php sed 's/function testTTYCommandExitCode/function SKIP_testTTYCommandExitCode/' \ -i src/Symfony/Component/Process/Tests/SigchildDisabledProcessTest.php -sed 's/function testStrict/function SKIP_testStrict/' \ - -i src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php %if 0%{?rhel} sed 's/function testForm/function SKIP_testForm/' \ -i src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php @@ -1596,7 +1596,6 @@ for PKG in src/Symfony/*/*; do %{__phpunit} \ --include-path ./src \ --exclude-group tty,benchmark,intl-data \ - -d date.timezone="UTC" \ $PKG || RET=1 done exit $RET @@ -2202,6 +2201,10 @@ exit $RET # ############################################################################## %changelog +* Thu Nov 20 2014 Shawn Iwinski - 2.5.7-1 +- Updated to 2.5.7 (BZ #1166396) +- Added php-composer(egulias/email-validator) dependency + * Sun Nov 02 2014 Shawn Iwinski - 2.5.6-2 - Exclude "intl-data" test group instead of removing test files -- cgit