From aa459b5c0becf24753c18e3752f5fed9970f18c4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 14 Jan 2021 08:46:12 +0100 Subject: add upstream patch for Symfony 4 --- php-bartlett-php-compatinfo-db.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'php-bartlett-php-compatinfo-db.spec') diff --git a/php-bartlett-php-compatinfo-db.spec b/php-bartlett-php-compatinfo-db.spec index 3ea1bf1..218c963 100644 --- a/php-bartlett-php-compatinfo-db.spec +++ b/php-bartlett-php-compatinfo-db.spec @@ -30,7 +30,7 @@ Name: php-%{c_vendor}-%{c_project} Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -%global specrel 1 +%global specrel 2 Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} Summary: Reference Database to be used with php-compatinfo library @@ -44,6 +44,8 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit Patch0: %{name}-3-rpm.patch # CURL_SSLVERSION constants have been backported Patch1: %{name}-curltls.patch +# Upstream +Patch2: %{name}-upstream.patch # upstream patches @@ -141,9 +143,7 @@ Conflicts: php-bartlett-PHP-CompatInfo < 5 %patch0 -p1 -b .rpm %patch1 -p0 -b .curltls - -# https://github.com/llaville/php-compatinfo-db/issues/61 -sed -e 's/Command::SUCCESS/0/' -i src/Presentation/Console/Command/*.php +%patch2 -p1 -b .up : relocate mv config src/config @@ -167,6 +167,7 @@ require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php'; '%{_datadir}/php/Symfony4/Component/Stopwatch/autoload.php', '%{_datadir}/php/Symfony/Requirements/autoload.php', '%{_datadir}/php/Doctrine/ORM/autoload.php', + __DIR__ . '/Infrastructure/Framework/Symfony/Polyfill.php', )); EOF @@ -271,6 +272,9 @@ exit $ret %changelog +* Thu Jan 14 2021 Remi Collet - 3.1.0-2 +- add upstream patch for Symfony 4 + * Wed Jan 13 2021 Remi Collet - 3.1.0-1 - update to 3.1.0 - drop dependency on league/tactician -- cgit