[php-symfony] Updated to 2.5.6 (BZ #1157502)

Shawn Iwinski siwinski at fedoraproject.org
Sun Nov 2 06:01:30 UTC 2014


commit cc152e435506406237c2e4438ec6da39daa0c202
Author: Shawn Iwinski <shawn.iwinski at gmail.com>
Date:   Sun Nov 2 01:01:06 2014 -0500

    Updated to 2.5.6 (BZ #1157502)
    
    - "php-twig-Twig" dependency updated to "php-composer(twig/twig)"
    - Obsoleted php-symfony-icu (data now in intl component)

 .gitignore       |    1 +
 php-symfony.spec |  151 ++++++++++++++++++++++++++++-------------------------
 sources          |    2 +-
 3 files changed, 82 insertions(+), 72 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 573c679..d55d5ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ clog
 /php-symfony-2.5.3-f077a238c781f845487a7c81fea8033ccd0e6a02.tar.gz
 /php-symfony-2.5.4-3a369dddea56596df91977d8c2083e70784852f2.tar.gz
 /php-symfony-2.5.5-2aef97bbc95d0c4ae63537cca81bd6d984427d81.tar.gz
+/php-symfony-2.5.6-1a1b1e528935f15dd76169f8b1dc3ef97f0d6210.tar.gz
diff --git a/php-symfony.spec b/php-symfony.spec
index d640865..3d5f24f 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.5
-%global github_commit    2aef97bbc95d0c4ae63537cca81bd6d984427d81
+%global github_version   2.5.6
+%global github_commit    1a1b1e528935f15dd76169f8b1dc3ef97f0d6210
 
 %global composer_vendor  symfony
 %global composer_project symfony
@@ -48,22 +48,22 @@
 # "psr/log": "~1.0" (composer.json)
 %global psrlog_min_ver 1.0
 %global psrlog_max_ver 2.0
-# "swiftmailer/swiftmailer": ">=4.2.0,<5.1-dev" (src/Symfony/Bridge/Swiftmailer/composer.json)
+# "swiftmailer/swiftmailer": ">=4.2.0,<6.0-dev" (src/Symfony/Bridge/Swiftmailer/composer.json)
 #     NOTE: Max version ignored on purpose
 %global swift_min_ver 4.2.0
-# "symfony/icu": "~1.0" (composer.json)
-%global symfony_icu_min_ver 1.0
-%global symfony_icu_max_ver 2.0
 # "twig/twig": "~1.12" (composer.json)
 %global twig_min_ver 1.12
 %global twig_max_ver 2.0
 
-%global symfony_dir  %{_datadir}/php/Symfony
-%global pear_channel pear.symfony.com
-
 # Build using "--without tests" to disable tests
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 
+%{!?phpdir:     %global phpdir     %{_datadir}/php}
+%{!?__phpunit:  %global __phpunit  %{_bindir}/phpunit}
+
+%global symfony_dir  %{phpdir}/Symfony
+%global pear_channel pear.symfony.com
+
 Name:          php-%{composer_project}
 Version:       %{github_version}
 Release:       1%{?dist}
@@ -85,8 +85,6 @@ BuildArch:     noarch
 %if %{with_tests}
 # For tests
 BuildRequires: php(language)                        >= %{php_min_ver}
-BuildRequires: php-composer(%{composer_vendor}/icu) >= %{symfony_icu_min_ver}
-BuildRequires: php-composer(%{composer_vendor}/icu) <  %{symfony_icu_max_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}
@@ -103,9 +101,9 @@ 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
-BuildRequires: php-twig-Twig                        >= %{twig_min_ver}
-BuildRequires: php-twig-Twig                        <  %{twig_max_ver}
 %if "%{php_version}" < "5.5"
 BuildRequires: php-password-compat                  >= %{password_compat_min_ver}
 BuildRequires: php-password-compat                  <  %{password_compat_max_ver}
@@ -113,7 +111,7 @@ BuildRequires: php-password-compat                  <  %{password_compat_max_ver
 ## TODO: "egulias/email-validator"
 ## TODO: "propel/propel1"
 ## TODO: "ocramius/proxy-manager"
-# For tests: phpcompatinfo (computed from version 2.5.2)
+# For tests: phpcompatinfo (computed from version 2.5.6)
 BuildRequires: php-ctype
 BuildRequires: php-date
 BuildRequires: php-dom
@@ -163,6 +161,7 @@ Requires:      php-composer(%{composer_vendor}/debug)                = %{version
 Requires:      php-composer(%{composer_vendor}/dependency-injection) = %{version}
 Requires:      php-composer(%{composer_vendor}/dom-crawler)          = %{version}
 Requires:      php-composer(%{composer_vendor}/event-dispatcher)     = %{version}
+Requires:      php-composer(%{composer_vendor}/expression-language)  = %{version}
 Requires:      php-composer(%{composer_vendor}/filesystem)           = %{version}
 Requires:      php-composer(%{composer_vendor}/finder)               = %{version}
 Requires:      php-composer(%{composer_vendor}/form)                 = %{version}
@@ -219,7 +218,7 @@ Requires: php-composer(doctrine/dbal)                >= %{doctrine_dbal_min_ver}
 Requires: php-composer(doctrine/dbal)                <  %{doctrine_dbal_max_ver}
 Requires: php-composer(doctrine/orm)                 >= %{doctrine_orm_min_ver}
 Requires: php-composer(doctrine/orm)                 <  %{doctrine_orm_max_ver}
-# phpcompatinfo (computed from version 2.5.4)
+# phpcompatinfo (computed from version 2.5.6)
 Requires: php-date
 Requires: php-hash
 Requires: php-json
@@ -257,7 +256,7 @@ Requires: php-composer(monolog/monolog) <  %{monolog_max_ver}
 Requires: php-composer(%{composer_vendor}/console)          = %{version}
 Requires: php-composer(%{composer_vendor}/event-dispatcher) = %{version}
 Requires: php-composer(%{composer_vendor}/http-kernel)      = %{version}
-# phpcompatinfo (computed from version 2.5.4)
+# phpcompatinfo (computed from version 2.5.6)
 Requires: php-pcre
 
 # Composer
@@ -319,7 +318,7 @@ Summary:  Symfony Swiftmailer Bridge
 Requires: php-swift-Swift >= %{swift_min_ver}
 # composer.json: optional
 Requires: php-composer(%{composer_vendor}/http-kernel) = %{version}
-# phpcompatinfo (computed from version 2.5.4)
+# phpcompatinfo (computed from version 2.5.6)
 # <none>
 
 # Composer
@@ -345,20 +344,20 @@ instead.
 Summary:  Symfony Twig Bridge
 
 # composer.json
-Requires: php-composer(%{composer_vendor}/security-csrf)       = %{version}
-Requires: php-twig-Twig >= %{twig_min_ver}
-Requires: php-twig-Twig <  %{twig_max_ver}
+Requires: php-composer(%{composer_vendor}/security-csrf)       =  %{version}
+Requires: php-composer(twig/twig)                              >= %{twig_min_ver}
+Requires: php-composer(twig/twig)                              <  %{twig_max_ver}
 # composer.json: optional
-Requires: php-composer(%{composer_vendor}/expression-language) = %{version}
-Requires: php-composer(%{composer_vendor}/form)                = %{version}
-Requires: php-composer(%{composer_vendor}/http-kernel)         = %{version}
-Requires: php-composer(%{composer_vendor}/routing)             = %{version}
-Requires: php-composer(%{composer_vendor}/security)            = %{version}
-Requires: php-composer(%{composer_vendor}/stopwatch)           = %{version}
-Requires: php-composer(%{composer_vendor}/templating)          = %{version}
-Requires: php-composer(%{composer_vendor}/translation)         = %{version}
-Requires: php-composer(%{composer_vendor}/yaml)                = %{version}
-# phpcompatinfo (computed from version 2.5.4)
+Requires: php-composer(%{composer_vendor}/expression-language) =  %{version}
+Requires: php-composer(%{composer_vendor}/form)                =  %{version}
+Requires: php-composer(%{composer_vendor}/http-kernel)         =  %{version}
+Requires: php-composer(%{composer_vendor}/routing)             =  %{version}
+Requires: php-composer(%{composer_vendor}/security)            =  %{version}
+Requires: php-composer(%{composer_vendor}/stopwatch)           =  %{version}
+Requires: php-composer(%{composer_vendor}/templating)          =  %{version}
+Requires: php-composer(%{composer_vendor}/translation)         =  %{version}
+Requires: php-composer(%{composer_vendor}/yaml)                =  %{version}
+# phpcompatinfo (computed from version 2.5.6)
 Requires: php-json
 Requires: php-pcre
 Requires: php-spl
@@ -403,7 +402,7 @@ Requires: php-composer(%{composer_vendor}/form)                 =  %{version}
 Requires: php-composer(%{composer_vendor}/validator)            =  %{version}
 Requires: php-composer(%{composer_vendor}/yaml)                 =  %{version}
 Requires: php-composer(doctrine/cache)
-# phpcompatinfo (computed from version 2.5.4)
+# phpcompatinfo (computed from version 2.5.6)
 Requires: php-dom
 Requires: php-fileinfo
 Requires: php-filter
@@ -439,7 +438,7 @@ Summary:  Symfony Security Bundle
 # composer.json
 Requires: php-composer(%{composer_vendor}/http-kernel) = %{version}
 Requires: php-composer(%{composer_vendor}/security)    = %{version}
-# phpcompatinfo (computed from version 2.5.4)
+# phpcompatinfo (computed from version 2.5.6)
 Requires: php-pcre
 Requires: php-spl
 
@@ -462,7 +461,7 @@ Summary:  Symfony Twig Bundle
 Requires: php-composer(%{composer_vendor}/http-foundation) = %{version}
 Requires: php-composer(%{composer_vendor}/http-kernel)     = %{version}
 Requires: php-composer(%{composer_vendor}/twig-bridge)     = %{version}
-# phpcompatinfo (computed from version 2.5.4)
+# phpcompatinfo (computed from version 2.5.6)
 Requires: php-ctype
 Requires: php-json
 Requires: php-pcre
@@ -491,7 +490,7 @@ Summary:  Symfony WebProfiler Bundle
 Requires: php-composer(%{composer_vendor}/http-kernel) = %{version}
 Requires: php-composer(%{composer_vendor}/routing)     = %{version}
 Requires: php-composer(%{composer_vendor}/twig-bridge) = %{version}
-# phpcompatinfo (computed from version 2.5.4)
+# phpcompatinfo (computed from version 2.5.6)
 Requires: php-pcre
 Requires: php-spl
 
@@ -517,7 +516,7 @@ Summary:   Symfony BrowserKit Component
 Requires:  php-composer(%{composer_vendor}/dom-crawler) = %{version}
 # composer.json: optional
 Requires:  php-composer(%{composer_vendor}/process)     = %{version}
-# phpcompatinfo (computed from version 2.5.4)
+# phpcompatinfo (computed from version 2.5.6)
 Requires:  php-date
 Requires:  php-pcre
 Requires:  php-spl
@@ -546,7 +545,7 @@ Summary:   Symfony ClassLoader Component
 URL:       http://symfony.com/doc/current/components/class_loader/index.html
 
 Requires:  %{name}-common = %{version}-%{release}
-# phpcompatinfo (computed from version 2.5.4)
+# phpcompatinfo (computed from version 2.5.6)
 Requires:  php-hash
 Requires:  php-pcre
 Requires:  php-reflection
@@ -595,7 +594,7 @@ URL:       http://symfony.com/doc/current/components/config/index.html
 
 # composer.json
 Requires:  php-composer(%{composer_vendor}/filesystem) = %{version}
-# phpcompatinfo (computed from version 2.5.4)
+# phpcompatinfo (computed from version 2.5.6)
 Requires:  php-ctype
 Requires:  php-dom
 Requires:  php-json
@@ -627,7 +626,7 @@ URL:       http://symfony.com/doc/current/components/console/index.html
 Requires:  php-composer(%{composer_vendor}/event-dispatcher) = %{version}
 Requires:  php-composer(psr/log) >= %{psrlog_min_ver}
 Requires:  php-composer(psr/log) <  %{psrlog_max_ver}
-# phpcompatinfo (computed from version 2.5.4)
+# phpcompatinfo (computed from version 2.5.6)
 Requires:  php-date
 Requires:  php-dom
 Requires:  php-json
@@ -662,7 +661,7 @@ Summary:   Symfony CssSelector Component
 URL:       http://symfony.com/doc/current/components/css_selector.html
 
 Requires:  %{name}-common = %{version}-%{release}
-# phpcompatinfo (computed from version 2.5.4)
+# phpcompatinfo (computed from version 2.5.6)
 Requires:  php-pcre
 
 # Composer
@@ -688,7 +687,7 @@ URL:      http://symfony.com/doc/current/components/debug/index.html
 # composer.json: optional
 Requires: php-composer(%{composer_vendor}/http-foundation) = %{version}
 Requires: php-composer(%{composer_vendor}/http-kernel)     = %{version}
-# phpcompatinfo (computed from version 2.5.4)
+# phpcompatinfo (computed from version 2.5.6)
 Requires: php-pcre
 Requires: php-reflection
 Requires: php-spl
@@ -715,7 +714,7 @@ URL:       http://symfony.com/doc/current/components/dependency_injection/index.
 Requires:  php-composer(%{composer_vendor}/config) = %{version}
 #Requires:  php-composer(%%{composer_vendor}/proxy-manager-bridge) = %%{version}
 Requires:  php-composer(%{composer_vendor}/yaml)   = %{version}
-# phpcompatinfo (computed from version 2.5.4)
+# phpcompatinfo (computed from version 2.5.6)
 Requires:  php-dom
 Requires:  php-hash
 Requires:  php-pcre
@@ -746,7 +745,7 @@ URL:       http://symfony.com/doc/current/components/dom_crawler.html
 
 # composer.json: optional
 Requires:  php-composer(%{composer_vendor}/css-selector) = %{version}
-# phpcompatinfo (computed from version 2.5.4)
+# phpcompatinfo (computed from version 2.5.6)
 Requires:  php-dom
 Requires:  php-libxml
 Requires:  php-mbstring
@@ -776,7 +775,7 @@ URL:       http://symfony.com/doc/current/components/event_dispatcher/index.html
 # composer.json: optional
 Requires:  php-composer(%{composer_vendor}/dependency-injection) = %{version}
 Requires:  php-composer(%{composer_vendor}/http-kernel)          = %{version}
-# phpcompatinfo (computed from version 2.5.4)
+# phpcompatinfo (computed from version 2.5.6)
 Requires:  php-pcre
 Requires:  php-reflection
 Requires:  php-spl
@@ -806,7 +805,7 @@ Summary:   Symfony ExpressionLanguage Component
 URL:       http://symfony.com/doc/current/components/expression_language/index.html
 
 Requires:  %{name}-common = %{version}-%{release}
-# phpcompatinfo (computed from version 2.5.4)
+# phpcompatinfo (computed from version 2.5.6)
 Requires:  php-ctype
 Requires:  php-pcre
 Requires:  php-spl
@@ -832,7 +831,7 @@ Summary:   Symfony Filesystem Component
 URL:       http://symfony.com/doc/current/components/filesystem.html
 
 Requires:  %{name}-common = %{version}-%{release}
-# phpcompatinfo (computed from version 2.5.4)
+# phpcompatinfo (computed from version 2.5.6)
 Requires:  php-ctype
 Requires:  php-spl
 
@@ -855,7 +854,7 @@ Summary:   Symfony Finder Component
 URL:       http://symfony.com/doc/current/components/finder.html
 
 Requires:  %{name}-common = %{version}-%{release}
-# phpcompatinfo (computed from version 2.5.4)
+# phpcompatinfo (computed from version 2.5.6)
 Requires:  php-date
 Requires:  php-pcre
 Requires:  php-spl
@@ -888,7 +887,7 @@ Requires:  php-composer(%{composer_vendor}/framework-bundle) = %{version}
 Requires:  php-composer(%{composer_vendor}/security-csrf)    = %{version}
 Requires:  php-composer(%{composer_vendor}/twig-bridge)      = %{version}
 Requires:  php-composer(%{composer_vendor}/validator)        = %{version}
-# phpcompatinfo (computed from version 2.5.4)
+# phpcompatinfo (computed from version 2.5.6)
 Requires:  php-ctype
 Requires:  php-date
 Requires:  php-hash
@@ -919,7 +918,7 @@ Summary:   Symfony HttpFoundation Component
 URL:       http://symfony.com/doc/current/components/http_foundation/index.html
 
 Requires:  %{name}-common = %{version}-%{release}
-# phpcompatinfo (computed from version 2.5.4)
+# phpcompatinfo (computed from version 2.5.6)
 Requires:  php-date
 Requires:  php-fileinfo
 Requires:  php-filter
@@ -977,7 +976,7 @@ Requires:  php-composer(%{composer_vendor}/config)               = %{version}
 Requires:  php-composer(%{composer_vendor}/console)              = %{version}
 Requires:  php-composer(%{composer_vendor}/dependency-injection) = %{version}
 Requires:  php-composer(%{composer_vendor}/finder)               = %{version}
-# phpcompatinfo (computed from version 2.5.4)
+# phpcompatinfo (computed from version 2.5.6)
 Requires:  php-date
 Requires:  php-hash
 Requires:  php-json
@@ -1027,13 +1026,12 @@ Summary:   Symfony Intl Component
 URL:       http://symfony.com/doc/current/components/intl.html
 
 Requires:  %{name}-common = %{version}-%{release}
-# composer.json
-Requires:  php-composer(%{composer_vendor}/icu) >= %{symfony_icu_min_ver}
-Requires:  php-composer(%{composer_vendor}/icu) <  %{symfony_icu_max_ver}
 # composer.json: optional
 Requires:  php-intl
-# phpcompatinfo (computed from version 2.5.4)
+# phpcompatinfo (computed from version 2.5.6)
+Requires:  php-ctype
 Requires:  php-date
+Requires:  php-json
 Requires:  php-pcre
 Requires:  php-reflection
 Requires:  php-simplexml
@@ -1046,6 +1044,8 @@ Provides:  php-pear(%{pear_channel}/Intl) = %{version}
 # Rename
 Obsoletes: %{name}2-Intl < %{version}
 Provides:  %{name}2-Intl = %{version}
+# ICU
+Obsoletes: php-symfony-icu
 
 %description intl
 A PHP replacement layer for the C intl extension [1] that also provides access
@@ -1062,7 +1062,7 @@ Summary:   Symfony Locale Component
 
 # composer.json
 Requires:  php-composer(%{composer_vendor}/intl) = %{version}
-# phpcompatinfo (computed from version 2.5.4)
+# phpcompatinfo (computed from version 2.5.6)
 Requires:  php-intl
 
 # Composer
@@ -1088,7 +1088,7 @@ Summary:   Symfony OptionsResolver Component
 URL:       http://symfony.com/doc/current/components/options_resolver.html
 
 Requires:  %{name}-common = %{version}-%{release}
-# phpcompatinfo (computed from version 2.5.4)
+# phpcompatinfo (computed from version 2.5.6)
 Requires:  php-reflection
 Requires:  php-spl
 
@@ -1114,7 +1114,7 @@ Summary:   Symfony Process Component
 URL:       http://symfony.com/doc/current/components/process.html
 
 Requires:  %{name}-common = %{version}-%{release}
-# phpcompatinfo (computed from version 2.5.4)
+# phpcompatinfo (computed from version 2.5.6)
 Requires:  php-pcntl
 Requires:  php-pcre
 Requires:  php-spl
@@ -1138,7 +1138,7 @@ Summary:   Symfony PropertyAccess Component
 URL:       http://symfony.com/doc/current/components/property_access/introduction.html
 
 Requires:  %{name}-common = %{version}-%{release}
-# phpcompatinfo (computed from version 2.5.4)
+# phpcompatinfo (computed from version 2.5.6)
 Requires:  php-ctype
 Requires:  php-pcre
 Requires:  php-reflection
@@ -1171,7 +1171,7 @@ Requires:  php-composer(%{composer_vendor}/expression-language) =  %{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}
-# phpcompatinfo (computed from version 2.5.4)
+# phpcompatinfo (computed from version 2.5.6)
 Requires:  php-dom
 Requires:  php-pcre
 Requires:  php-reflection
@@ -1212,7 +1212,7 @@ Requires:  php-composer(doctrine/dbal) <  %{doctrine_dbal_max_ver}
 Requires:  php-password-compat >= %{password_compat_min_ver}
 Requires:  php-password-compat <  %{password_compat_max_ver}
 %endif
-# phpcompatinfo (computed from version 2.5.4)
+# phpcompatinfo (computed from version 2.5.6)
 Requires:  php-ctype
 Requires:  php-date
 Requires:  php-hash
@@ -1256,7 +1256,7 @@ Summary:   Symfony Serializer Component
 URL:       http://symfony.com/doc/current/components/serializer.html
 
 Requires:  %{name}-common = %{version}-%{release}
-# phpcompatinfo (computed from version 2.5.4)
+# phpcompatinfo (computed from version 2.5.6)
 Requires:  php-ctype
 Requires:  php-dom
 Requires:  php-json
@@ -1285,7 +1285,7 @@ Summary:  Symfony Stopwatch Component
 URL:      http://symfony.com/doc/current/components/stopwatch.html
 
 Requires: %{name}-common = %{version}-%{release}
-# phpcompatinfo (computed from version 2.5.4)
+# phpcompatinfo (computed from version 2.5.6)
 Requires: php-spl
 
 # Composer
@@ -1307,7 +1307,7 @@ Requires:  %{name}-common        =  %{version}-%{release}
 # composer.json: optional
 Requires:  php-composer(psr/log) >= %{psrlog_min_ver}
 Requires:  php-composer(psr/log) <  %{psrlog_max_ver}
-# phpcompatinfo (computed from version 2.5.4)
+# phpcompatinfo (computed from version 2.5.6)
 Requires:  php-ctype
 Requires:  php-hash
 Requires:  php-iconv
@@ -1340,7 +1340,7 @@ Summary:   Symfony Translation Component
 # composer.json: optional
 Requires:  php-composer(%{composer_vendor}/config) = %{version}
 Requires:  php-composer(%{composer_vendor}/yaml)   = %{version}
-# phpcompatinfo (computed from version 2.5.4)
+# phpcompatinfo (computed from version 2.5.6)
 Requires:  php-dom
 Requires:  php-iconv
 Requires:  php-intl
@@ -1383,7 +1383,7 @@ 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"
-# phpcompatinfo (computed from version 2.5.4)
+# phpcompatinfo (computed from version 2.5.6)
 Requires:  php-ctype
 Requires:  php-date
 Requires:  php-filter
@@ -1418,7 +1418,7 @@ Summary:   Symfony Yaml Component
 URL:       http://symfony.com/doc/current/components/yaml/index.html
 
 Requires:  %{name}-common = %{version}-%{release}
-# phpcompatinfo (computed from version 2.5.4)
+# phpcompatinfo (computed from version 2.5.6)
 Requires:  php-ctype
 Requires:  php-date
 Requires:  php-json
@@ -1491,19 +1491,19 @@ if (version_compare(PHP_VERSION, '5.4.0', '<')) {
     require __DIR__.'/../src/Symfony/Component/HttpFoundation/Resources/stubs/SessionHandlerInterface.php';
 }
 
-if (file_exists('%{_datadir}/php/password_compat/password.php')) {
-    require '%{_datadir}/php/password_compat/password.php';
+if (file_exists('%{phpdir}/password_compat/password.php')) {
+    require '%{phpdir}/password_compat/password.php';
 }
 
 return $loader;
 AUTOLOADER
 
 # Hack PHPUnit Autoloader (use current symfony instead of system one)
-if [ -d /usr/share/php/PHPUnit ]; then
+if [ -d %{phpdir}/PHPUnit ]; then
   mkdir PHPUnit
   sed -e '/Symfony/s:\$vendorDir:"./src/":' \
-      -e 's:path = dirname(__FILE__):path = "/usr/share/php/PHPUnit":' \
-      /usr/share/php/PHPUnit/Autoload.php >PHPUnit/Autoload.php
+      -e 's:path = dirname(__FILE__):path = "%{phpdir}/PHPUnit":' \
+      %{phpdir}/PHPUnit/Autoload.php > PHPUnit/Autoload.php
 fi
 
 # Create PHPUnit config w/ colors turned off
@@ -1530,6 +1530,10 @@ 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
+rm -f \
+    src/Symfony/Component/Intl/Tests/Data/Provider/Json/JsonLocaleDataProviderTest.php \
+    src/Symfony/Component/Intl/Tests/Data/Provider/Json/JsonRegionDataProviderTest.php \
+    src/Symfony/Component/Intl/Tests/Data/Provider/Json/JsonScriptDataProviderTest.php
 %if 0%{?el6}
 sed 's/function testForm/function SKIP_testForm/' \
     -i src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php
@@ -1543,7 +1547,7 @@ rm -f src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeF
 RET=0
 for PKG in src/Symfony/*/*; do
     echo -e "\n>>>>>>>>>>>>>>>>>>>>>>> ${PKG}\n"
-    %{_bindir}/phpunit \
+    %{__phpunit} \
         --include-path ./src \
         --exclude-group tty,benchmark \
         -d date.timezone="UTC" \
@@ -2152,6 +2156,11 @@ exit $RET
 # ##############################################################################
 
 %changelog
+* Sun Nov 02 2014 Shawn Iwinski <shawn.iwinski at gmail.com> - 2.5.6-1
+- Updated to 2.5.6 (BZ #1157502)
+- "php-twig-Twig" dependency updated to "php-composer(twig/twig)"
+- Obsoleted php-symfony-icu (data now in intl component)
+
 * Mon Sep 29 2014 Remi Collet <remi at fedoraproject.org> - 2.5.5-1
 - update to 2.5.5
 - hack PHPUnit autoloader to not use old system symfony
diff --git a/sources b/sources
index c592dfc..3af906e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
+b5e1a84854165d69f0328d275e8fee5c  php-symfony-2.5.6-1a1b1e528935f15dd76169f8b1dc3ef97f0d6210.tar.gz
 0833352e53346cd98a479b3b2d693333  autoloader-2.5.0BETA2.tgz
-7bceb26aa6c8fe2229996266fe56617e  php-symfony-2.5.5-2aef97bbc95d0c4ae63537cca81bd6d984427d81.tar.gz


More information about the scm-commits mailing list