diff options
| author | Remi Collet <remi@remirepo.net> | 2017-08-23 10:30:07 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2017-08-23 10:30:07 +0200 |
| commit | eb7c3b5f4345d0e4596a6ad216dca2835d5beaae (patch) | |
| tree | 44d12390e44fa5c085f49499be149161bc733740 | |
| parent | 72c1a0177d421712c1bc2856a9563a35714b5d92 (diff) | |
- fix missing dependency
- fix dev autoloader with patch from https://github.com/symfony/symfony/pull/23934
| -rw-r--r-- | php-symfony3-pr23934.patch | 21 | ||||
| -rw-r--r-- | php-symfony3.spec | 14 |
2 files changed, 33 insertions, 2 deletions
diff --git a/php-symfony3-pr23934.patch b/php-symfony3-pr23934.patch new file mode 100644 index 0000000..fd9fa83 --- /dev/null +++ b/php-symfony3-pr23934.patch @@ -0,0 +1,21 @@ +From ace9db6f6e2d1f1deda19b301352b85da930bec7 Mon Sep 17 00:00:00 2001 +From: Shawn Iwinski <siwinski@redhat.com> +Date: Fri, 18 Aug 2017 13:54:20 -0400 +Subject: [PATCH] [Console] Add "symfony/polyfill-php70" to require-dev + +--- + src/Symfony/Component/Console/composer.json | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/Symfony/Component/Console/composer.json b/src/Symfony/Component/Console/composer.json +index 415b9e096d2..4b8d9f20fa9 100644 +--- a/src/Symfony/Component/Console/composer.json ++++ b/src/Symfony/Component/Console/composer.json +@@ -26,6 +26,7 @@ + "symfony/event-dispatcher": "~2.8|~3.0", + "symfony/dependency-injection": "~3.3", + "symfony/filesystem": "~2.8|~3.0", ++ "symfony/polyfill-php70": "~1.0", + "symfony/process": "~2.8|~3.0", + "psr/log": "~1.0" + }, diff --git a/php-symfony3.spec b/php-symfony3.spec index 05ff17c..1562491 100644 --- a/php-symfony3.spec +++ b/php-symfony3.spec @@ -120,7 +120,7 @@ Name: php-%{composer_project}3 Version: %{github_version} -Release: 4%{?dist} +Release: 5%{?dist} Summary: Symfony PHP framework (version 3) Group: Development/Libraries @@ -133,6 +133,9 @@ URL: http://symfony.com Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz Source1: %{name}-generate-autoloaders.php +# https://github.com/symfony/symfony/pull/23934 +Patch0: %{name}-pr23934.patch + BuildArch: noarch # Tests %if %{with_tests} @@ -376,7 +379,7 @@ Autoloader: %{symfony3_dir}/Bridge/Monolog/autoload.php Summary: Symfony PHPUnit Bridge (version 3) -Requires: php(language) >= 5.3.3 +Requires: %{name}-common = %{version}-%{release} # composer.json: optional %if 0%{?fedora} Suggests: php-composer(%{composer_vendor}/debug) @@ -1808,6 +1811,8 @@ Autoloader: %{symfony3_dir}/Component/Yaml/autoload.php %prep %setup -qn %{github_name}-%{github_commit} +%patch0 -p1 + cp %{SOURCE1} . : Remove unnecessary files @@ -2817,6 +2822,11 @@ exit $RET # ############################################################################## %changelog +* Wed Aug 23 2017 Remi Collet <remi@remirepo.net> - 3.3.6-5 +- fix missing dependency +- fix dev autoloader with patch from + https://github.com/symfony/symfony/pull/23934 + * Sat Aug 19 2017 Shawn Iwinski <shawn@iwin.ski> - 3.3.6-4 - Dynamically generate dev autoloaders - Add build conditionals to make backporting to remirepo easier |