From d4f2ce7ea17377fc2315074a2e7607b33d3b65fb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 29 Aug 2018 10:28:18 +0200 Subject: revert symfony 3 --- php-bartlett-php-compatinfo-db-1.19.0-rpm.patch | 2 +- php-bartlett-php-compatinfo-db.spec | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/php-bartlett-php-compatinfo-db-1.19.0-rpm.patch b/php-bartlett-php-compatinfo-db-1.19.0-rpm.patch index 4aca8b8..4a256a8 100644 --- a/php-bartlett-php-compatinfo-db-1.19.0-rpm.patch +++ b/php-bartlett-php-compatinfo-db-1.19.0-rpm.patch @@ -6,7 +6,7 @@ diff -up ./data/handleDB.php.rpm ./data/handleDB.php */ -require_once dirname(__DIR__) . '/vendor/autoload.php'; -+require_once '/usr/share/php/Symfony3/Component/autoload.php'; ++require_once '/usr/share/php/Symfony/Component/autoload.php'; +require_once dirname(__DIR__) . '/src/Bartlett/CompatInfoDb/autoload.php'; require_once __DIR__ . '/ReferenceCollection.php'; diff --git a/php-bartlett-php-compatinfo-db.spec b/php-bartlett-php-compatinfo-db.spec index d65e86c..a1127a8 100644 --- a/php-bartlett-php-compatinfo-db.spec +++ b/php-bartlett-php-compatinfo-db.spec @@ -28,7 +28,7 @@ Name: php-%{c_vendor}-%{c_project} Version: 1.35.0 -%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 @@ -69,7 +69,8 @@ BuildRequires: php-composer(fedora/autoloader) # "monolog/monolog": "~1.10", # "bartlett/phpunit-loggertestlistener": "~1.5" BuildRequires: php-cli -BuildRequires: php-symfony3-console +# Keep symfony v2 because v3 pull some bad dependencies (php-symfony-polyfill) +BuildRequires: php-symfony-console %if %{with_tests} BuildRequires: php-composer(phpunit/phpunit) %endif @@ -87,7 +88,7 @@ BuildRequires: php-composer(phpunit/phpunit) # "ext-pdo_sqlite": "*" Requires: php(language) >= 5.4.0 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(composer/semver) >= 1.0 with php-composer(composer/semver) < 2) +Requires: (php-composer(composer/semver) >= 1.0 with php-composer(composer/semver) < 2) %else Requires: php-composer(composer/semver) < 2 Requires: php-composer(composer/semver) >= 1.0 @@ -199,7 +200,7 @@ export BARTLETT_COMPATINFO_DB=%{buildroot}%{_datadir}/%{name}/compatinfo.sqlite %changelog -* Wed Aug 29 2018 Remi Collet - 1.35.0-1 +* Wed Aug 29 2018 Remi Collet - 1.35.0-2 - update to 1.35.0 * Mon Jul 23 2018 Remi Collet - 1.34.0-1 -- cgit