summaryrefslogtreecommitdiffstats
path: root/php-symfony.spec
diff options
context:
space:
mode:
Diffstat (limited to 'php-symfony.spec')
-rw-r--r--php-symfony.spec21
1 files changed, 18 insertions, 3 deletions
diff --git a/php-symfony.spec b/php-symfony.spec
index 174d0e4..3dde0f1 100644
--- a/php-symfony.spec
+++ b/php-symfony.spec
@@ -13,8 +13,8 @@
%global github_owner symfony
%global github_name symfony
-%global github_version 2.8.20
-%global github_commit bbe1eae0c213e45da9fb0c6abb43aff415a3dcdd
+%global github_version 2.8.21
+%global github_commit 17002cbb4be8b3b0d6516defe4ed839ad459994b
%global github_short %(c=%{github_commit}; echo ${c:0:7})
%global composer_vendor symfony
@@ -196,7 +196,10 @@ BuildRequires: php-xml
# Bridges
Requires: php-composer(%{composer_vendor}/doctrine-bridge) = %{version}
Requires: php-composer(%{composer_vendor}/monolog-bridge) = %{version}
-#Requires: php-composer(%%{composer_vendor}/proxy-manager-bridge) = %%{version}
+%if 0%{?fedora} >= 26
+# this requires ZF and thus PHP 7
+Requires: php-composer(%{composer_vendor}/proxy-manager-bridge) = %{version}
+%endif
Requires: php-composer(%{composer_vendor}/swiftmailer-bridge) = %{version}
Requires: php-composer(%{composer_vendor}/twig-bridge) = %{version}
# Bundles
@@ -502,6 +505,7 @@ Summary: Symfony Framework Bundle
Group: Development/Libraries
# composer.json
+Requires: php-xml
Requires: php-composer(%{composer_vendor}/asset) = %{version}
Requires: php-composer(%{composer_vendor}/class-loader) = %{version}
Requires: php-composer(%{composer_vendor}/config) = %{version}
@@ -1903,6 +1907,8 @@ sed -e 's#function getScript#function SKIP_getScript#' \
-i src/Symfony/Component/HttpKernel/Tests/Fixtures/TestClient.php
sed -e 's#function testFormatWithTimezoneFromEnvironmentVariable#function SKIP_testFormatWithTimezoneFromEnvironmentVariable#' \
-i src/Symfony/Component/Intl/Tests/DateFormatter/Verification/IntlDateFormatterTest.php
+sed -e 's#function testFormat[^A-Z]#function SKIP_testFormat(#' \
+ -i src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php
sed -e 's#function testTTYCommand#function SKIP_testTTYCommand#' \
-e 's#function testTTYCommandExitCode#function SKIP_testTTYCommandExitCode#' \
-i src/Symfony/Component/Process/Tests/ProcessTest.php
@@ -1970,6 +1976,12 @@ ln -s %{name}-common-%{version} %{buildroot}%{_docdir}/%{name}-%{version}
%check
%if %{with_tests}
+: Ensure TZ is set
+cp -pf %{_sysconfdir}/php.ini .
+echo "date.timezone=Europe/Paris" >> php.ini
+export PHPRC=$PWD/php.ini
+export RPM_SYMFONY_TREE=%{buildroot}%{phpdir}/Symfony
+
: Modify PHPUnit config
sed 's#./src#%{buildroot}%{phpdir}#' phpunit.xml.dist > phpunit.xml
@@ -2682,6 +2694,9 @@ exit $RET
# ##############################################################################
%changelog
+* Tue May 30 2017 Remi Collet <remi@remirepo.net> - 2.8.21-1
+- Update to 2.8.21
+
* Tue May 2 2017 Remi Collet <remi@remirepo.net> - 2.8.20-1
- Update to 2.8.20