From 5d2f831b9321633a58eed06330f3ea9711378b5f Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Fri, 1 Jul 2016 09:48:36 +0200
Subject: php-symfony: 2.8.8
---
composer.json | 2 +-
php-symfony.spec | 20 +++++++++++++++-----
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/composer.json b/composer.json
index ee035f2..97e4c5e 100644
--- a/composer.json
+++ b/composer.json
@@ -85,7 +85,7 @@
"doctrine/doctrine-bundle": "~1.2",
"monolog/monolog": "~1.11",
"ocramius/proxy-manager": "~0.4|~1.0|~2.0",
- "egulias/email-validator": "~1.2",
+ "egulias/email-validator": "~1.2,>=1.2.1",
"phpdocumentor/reflection": "^1.0.7"
},
"conflict": {
diff --git a/php-symfony.spec b/php-symfony.spec
index 05c4981..1450cc5 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.7
-%global github_commit 663b2d6202c3149515b39cfe50a174a130acb8e2
+%global github_version 2.8.8
+%global github_commit 038d13264f732f9bba850c423e374dc72874d1a6
%global github_short %(c=%{github_commit}; echo ${c:0:7})
%global composer_vendor symfony
@@ -52,8 +52,8 @@
# "doctrine/orm": "~2.4,>=2.4.5"
%global doctrine_orm_min_ver 2.4.5
%global doctrine_orm_max_ver 3.0
-# "egulias/email-validator": "~1.2"
-%global email_validator_min_ver 1.2
+# "egulias/email-validator": "~1.2,>=1.2.1"
+%global email_validator_min_ver 1.2.1
%global email_validator_max_ver 2.0
# "monolog/monolog": "~1.11"
# NOTE: Min version not 1.11 because autoloader required
@@ -106,7 +106,7 @@
Name: php-%{composer_project}
Version: %{github_version}
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: PHP framework for web projects
Group: Development/Libraries
@@ -114,6 +114,9 @@ License: MIT
URL: http://symfony.com
Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{name}-%{github_version}-%{github_short}.tar.gz
+# https://github.com/symfony/symfony/pull/19255
+Patch0: %{name}-pr19255.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
# Tests
@@ -1753,6 +1756,8 @@ The YAML Component loads and dumps YAML files.
%prep
%setup -qn %{github_name}-%{github_commit}
+%patch0 -p1
+
: Remove unnecessary files
find src -name '.git*' -delete
@@ -2678,6 +2683,11 @@ exit $RET
# ##############################################################################
%changelog
+* Fri Jul 1 2016 Remi Collet <remi@fedoraproject.org> - 2.8.8-1
+- Update to 2.8.8
+- add patch for test suite with phpunit-bridge 2.8
+ open https://github.com/symfony/symfony/pull/19255
+
* Mon Jun 6 2016 Remi Collet <remi@fedoraproject.org> - 2.8.7-1
- Update to 2.8.7
--
cgit