From 9bc229e4dcdf4c613bb1b9b8f5e43d0fa3a92a00 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 11 May 2020 08:47:41 +0200 Subject: update to 2.13.0 raise dependency on Symfony 4.4 --- composer.json | 4 ++-- php-bartlett-php-compatinfo-db-2.0-rpm.patch | 25 +++++++++++----------- php-bartlett-php-compatinfo-db.spec | 32 ++++++++++++++++------------ 3 files changed, 32 insertions(+), 29 deletions(-) diff --git a/composer.json b/composer.json index cc1ff90..c3510c7 100644 --- a/composer.json +++ b/composer.json @@ -20,8 +20,8 @@ "ext-spl": "*", "ext-json": "*", "ext-pdo_sqlite": "*", - "symfony/console": "^3.0||^4.0", - "jean85/pretty-package-versions": "^1.2", + "symfony/console": "^4.4|^5.0", + "jean85/pretty-package-versions": "~1.3", "league/tactician": "^1.0", "laminas/laminas-diagnostics": "^1.3" }, diff --git a/php-bartlett-php-compatinfo-db-2.0-rpm.patch b/php-bartlett-php-compatinfo-db-2.0-rpm.patch index 9912fb1..57a29db 100644 --- a/php-bartlett-php-compatinfo-db-2.0-rpm.patch +++ b/php-bartlett-php-compatinfo-db-2.0-rpm.patch @@ -1,6 +1,6 @@ diff -up ./bin/compatinfo-db.rpm ./bin/compatinfo-db ---- ./bin/compatinfo-db.rpm 2018-12-31 15:15:21.000000000 +0100 -+++ ./bin/compatinfo-db 2019-01-04 08:23:55.037657122 +0100 +--- ./bin/compatinfo-db.rpm 2020-05-10 13:26:48.000000000 +0200 ++++ ./bin/compatinfo-db 2020-05-11 08:25:46.977559291 +0200 @@ -7,10 +7,7 @@ declare(strict_types=1); gc_disable(); // performance boost @@ -14,8 +14,8 @@ diff -up ./bin/compatinfo-db.rpm ./bin/compatinfo-db $isAutoloadFound = false; diff -up ./src/DatabaseFactory.php.rpm ./src/DatabaseFactory.php ---- ./src/DatabaseFactory.php.rpm 2018-12-31 15:15:21.000000000 +0100 -+++ ./src/DatabaseFactory.php 2019-01-04 08:24:55.740977613 +0100 +--- ./src/DatabaseFactory.php.rpm 2020-05-10 13:26:48.000000000 +0200 ++++ ./src/DatabaseFactory.php 2020-05-11 08:25:46.977559291 +0200 @@ -35,14 +35,13 @@ class DatabaseFactory private static function getSqliteDsn() : array @@ -60,19 +60,18 @@ diff -up ./src/DatabaseFactory.php.rpm ./src/DatabaseFactory.php \ Pas de fin de ligne à la fin du fichier +} diff -up ./src/Presentation/Console/Application.php.rpm ./src/Presentation/Console/Application.php ---- ./src/Presentation/Console/Application.php.rpm 2018-12-31 15:15:21.000000000 +0100 -+++ ./src/Presentation/Console/Application.php 2019-01-04 08:23:55.040657137 +0100 -@@ -47,12 +47,7 @@ class Application extends \Symfony\Compo +--- ./src/Presentation/Console/Application.php.rpm 2020-05-11 08:25:46.977559291 +0200 ++++ ./src/Presentation/Console/Application.php 2020-05-11 08:27:10.705045605 +0200 +@@ -38,11 +38,7 @@ class Application extends \Symfony\Compo - public function __construct(string $name = 'UNKNOWN') + public function __construct(ContainerInterface $container) { - try { - $version = \Jean85\PrettyVersions::getVersion('bartlett/php-compatinfo-db')->getPrettyVersion(); - } catch (\OutOfBoundsException $e) { -- $version = 'UNKNOWN'; +- $version = self::VERSION; - } -- parent::__construct($name, $version); -+ parent::__construct($name, '@VERSION@'); ++ $version = self::VERSION; + parent::__construct(self::NAME, $version); - $this->baseDir = dirname(dirname(dirname(__DIR__))); - } + $this->container = $container; diff --git a/php-bartlett-php-compatinfo-db.spec b/php-bartlett-php-compatinfo-db.spec index 3f14111..cc9160f 100644 --- a/php-bartlett-php-compatinfo-db.spec +++ b/php-bartlett-php-compatinfo-db.spec @@ -7,12 +7,12 @@ # Please, preserve the changelog entries # # See https://github.com/llaville/php-compatinfo-db/releases -%global gh_commit 9ee4ff81bd2093741e056d25e4b7735113439fcc +%global gh_commit 1228c9face076504d6898493c2e77a4bc5c75335 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151031 %global gh_owner llaville %global gh_project php-compatinfo-db -%global upstream_version 2.12.0 +%global upstream_version 2.13.0 #global upstream_prever RC1 # Namespace %global ns_vendor Bartlett @@ -47,15 +47,14 @@ BuildRequires: php(language) >= 7.1 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-composer(composer/semver) >= 1.0 with php-composer(composer/semver) < 2) -BuildRequires: (php-composer(symfony/console) >= 3.0 with php-composer(symfony/console) < 5) +BuildRequires: (php-composer(symfony/console) >= 4.4 with php-composer(symfony/console) < 6) BuildRequires: (php-composer(league/tactician) >= 1.0 with php-composer(league/tactician) < 2) BuildRequires: (php-composer(laminas/laminas-diagnostics) >= 1.3 with php-composer(laminas/laminas-diagnostics) < 2) -# remirepo:10 +# remirepo:9 %else BuildRequires: php-composer(composer/semver) < 2 BuildRequires: php-composer(composer/semver) >= 1.0 -BuildRequires: php-composer(symfony/console) < 5 -BuildRequires: php-composer(symfony/console) >= 3.0 +BuildRequires: php-symfony-console4 >= 4.4 BuildRequires: php-composer(league/tactician) < 2 BuildRequires: php-composer(league/tactician) >= 1.0 BuildRequires: php-composer(laminas/laminas-diagnostics) < 2 @@ -94,23 +93,22 @@ BuildRequires: php-composer(phpunit/phpunit) # "ext-spl": "*", # "ext-json": "*", # "ext-pdo_sqlite": "*", -# "symfony/console": "^3.0||^4.0", -# "jean85/pretty-package-versions": "^1.2", +# "symfony/console": "^4.4||^5.0", +# "jean85/pretty-package-versions": "^1.3", # "league/tactician": "^1.0", # "laminas/laminas-diagnostics": "^1.3" Requires: php(language) >= 7.1 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-composer(composer/semver) >= 1.0 with php-composer(composer/semver) < 2) -Requires: (php-composer(symfony/console) >= 3.0 with php-composer(symfony/console) < 5) +Requires: (php-composer(symfony/console) >= 4.4 with php-composer(symfony/console) < 6) Requires: (php-composer(league/tactician) >= 1.0 with php-composer(league/tactician) < 2) Requires: (php-composer(laminas/laminas-diagnostics) >= 1.3 with php-composer(laminas/laminas-diagnostics) < 2) -# remirepo:10 +# remirepo:9 %else Requires: php-composer(composer/semver) < 2 Requires: php-composer(composer/semver) >= 1.0 -Requires: php-composer(symfony/console) < 5 -Requires: php-composer(symfony/console) >= 3.0 +Requires: php-symfony-console4 >= 4.4 Requires: php-composer(league/tactician) < 2 Requires: php-composer(league/tactician) >= 1.0 Requires: php-composer(laminas/laminas-diagnostics) < 2 @@ -157,8 +155,8 @@ require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Dependencies::required(array( '%{_datadir}/php/Composer/Semver/autoload.php', [ + '%{_datadir}/php/Symfony5/Component/Console/autoload.php', '%{_datadir}/php/Symfony4/Component/Console/autoload.php', - '%{_datadir}/php/Symfony3/Component/Console/autoload.php', ], '%{_datadir}/php/League/Tactician/autoload.php', '%{_datadir}/php/Laminas/Diagnostics/autoload.php', @@ -219,7 +217,9 @@ fi grep " LATEST" src/ExtensionFactory.php : Create command using local sources -sed -e "s:%{_datadir}/php/%{ns_vendor}/%{ns_project}:$PWD/src:" bin/compatinfo-db >compatinfo-db +sed -e "s:%{_datadir}/php/%{ns_vendor}/%{ns_project}:$PWD/src:" \ + -e 's:../data:data:' \ + bin/compatinfo-db >compatinfo-db : Diag %{_bindir}/php -d date.timezone=Europe/Paris compatinfo-db bartlett:diagnose @@ -270,6 +270,10 @@ exit $ret %changelog +* Mon May 11 2020 Remi Collet - 2.13.0-1 +- update to 2.13.0 +- raise dependency on Symfony 4.4 + * Sun Mar 22 2020 Remi Collet - 2.12.0-1 - update to 2.12.0 -- cgit