[php-symfony] Updated to 2.5.7 (BZ #1166396)
Shawn Iwinski
siwinski at fedoraproject.org
Fri Nov 21 00:02:49 UTC 2014
commit 7394cf7b4cdaa698ae230a1b1db8ad478794d77d
Author: Shawn Iwinski <shawn.iwinski at gmail.com>
Date: Thu Nov 20 19:02:18 2014 -0500
Updated to 2.5.7 (BZ #1166396)
- Added php-composer(egulias/email-validator) dependency
.gitignore | 1 +
php-symfony.spec | 75 ++++++++++++++++++++++++++++--------------------------
sources | 2 +-
3 files changed, 41 insertions(+), 37 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d55d5ec..9f65093 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ clog
/php-symfony-2.5.4-3a369dddea56596df91977d8c2083e70784852f2.tar.gz
/php-symfony-2.5.5-2aef97bbc95d0c4ae63537cca81bd6d984427d81.tar.gz
/php-symfony-2.5.6-1a1b1e528935f15dd76169f8b1dc3ef97f0d6210.tar.gz
+/php-symfony-2.5.7-dd4254fc39a702af22cd886a6790769541469da1.tar.gz
diff --git a/php-symfony.spec b/php-symfony.spec
index f0870f2..c2464fb 100644
--- a/php-symfony.spec
+++ b/php-symfony.spec
@@ -12,8 +12,8 @@
%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
@@ -39,6 +39,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
@@ -66,7 +69,7 @@
Name: php-%{composer_project}
Version: %{github_version}
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: PHP framework for web projects
Group: Development/Libraries
@@ -84,31 +87,32 @@ Source2: autoloader-2.5.0BETA2.tgz
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)
@@ -1378,11 +1382,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
@@ -1506,9 +1511,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/' \
@@ -1528,8 +1530,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%{?el6}
sed 's/function testForm/function SKIP_testForm/' \
-i src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php
@@ -1546,7 +1546,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
@@ -2152,6 +2151,10 @@ exit $RET
# ##############################################################################
%changelog
+* Thu Nov 20 2014 Shawn Iwinski <shawn.iwinski at gmail.com> - 2.5.7-1
+- Updated to 2.5.7 (BZ #1166396)
+- Added php-composer(egulias/email-validator) dependency
+
* Sun Nov 02 2014 Shawn Iwinski <shawn.iwinski at gmail.com> - 2.5.6-2
- Exclude "intl-data" test group instead of removing test files
diff --git a/sources b/sources
index 3af906e..5290574 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-b5e1a84854165d69f0328d275e8fee5c php-symfony-2.5.6-1a1b1e528935f15dd76169f8b1dc3ef97f0d6210.tar.gz
0833352e53346cd98a479b3b2d693333 autoloader-2.5.0BETA2.tgz
+23afa53078a9602bf900de0765d532af php-symfony-2.5.7-dd4254fc39a702af22cd886a6790769541469da1.tar.gz
More information about the scm-commits
mailing list