From 4a7a1204f57f43adc861df964fd09ad1f9c437ec Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 29 Apr 2020 10:55:21 +0200 Subject: update to 5.2.3 drop patch merged upstream --- php-bartlett-PHP-CompatInfo-5.2.2-rpm.patch | 75 ----------------------------- php-bartlett-PHP-CompatInfo-5.2.3-rpm.patch | 75 +++++++++++++++++++++++++++++ php-bartlett-PHP-CompatInfo.spec | 13 ++--- 3 files changed, 82 insertions(+), 81 deletions(-) delete mode 100644 php-bartlett-PHP-CompatInfo-5.2.2-rpm.patch create mode 100644 php-bartlett-PHP-CompatInfo-5.2.3-rpm.patch diff --git a/php-bartlett-PHP-CompatInfo-5.2.2-rpm.patch b/php-bartlett-PHP-CompatInfo-5.2.2-rpm.patch deleted file mode 100644 index 2c9d19d..0000000 --- a/php-bartlett-PHP-CompatInfo-5.2.2-rpm.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff -up ./bin/phpcompatinfo.json.dist.rpm ./bin/phpcompatinfo.json.dist ---- ./bin/phpcompatinfo.json.dist.rpm 2018-11-27 22:03:39.000000000 +0100 -+++ ./bin/phpcompatinfo.json.dist 2018-11-28 08:53:47.258278539 +0100 -@@ -6,6 +6,19 @@ - } - ], - "plugins": [ -+ { -+ "name": "Cache", -+ "class": "Bartlett\\Reflect\\Plugin\\CachePlugin", -+ "options": { -+ "adapter": "DoctrineCacheAdapter", -+ "backend": { -+ "class": "Doctrine\\Common\\Cache\\FilesystemCache", -+ "args": [ -+ "%{HOME}/.cache/php-reflect" -+ ] -+ } -+ } -+ } - ], - "analysers" : [ - ], -diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo ---- ./bin/phpcompatinfo.rpm 2018-11-28 08:53:47.258278539 +0100 -+++ ./bin/phpcompatinfo 2018-11-28 08:55:38.807878501 +0100 -@@ -1,42 +1,22 @@ - #!/usr/bin/env php - setUseIncludePath(true); - - if (PHP_SAPI !== 'cli') { - return; - } - --$compatInfoDbV1 = class_exists(Bartlett\CompatInfoDb\Environment::class); -- --if (\Phar::running() && $compatInfoDbV1) { -- try { -- Bartlett\CompatInfoDb\Environment::checkRequirements(); -- } catch (\RuntimeException $e) { -- die ($e->getMessage()); -- } --} -- - use Bartlett\Reflect\Environment; - use Bartlett\CompatInfo\Console\Application; - - Environment::setScanDir(); - --$application = new Application($appName, '5.2.2'); -+$application = new Application($appName, '@package_version@'); - $application->run(); diff --git a/php-bartlett-PHP-CompatInfo-5.2.3-rpm.patch b/php-bartlett-PHP-CompatInfo-5.2.3-rpm.patch new file mode 100644 index 0000000..5b6798e --- /dev/null +++ b/php-bartlett-PHP-CompatInfo-5.2.3-rpm.patch @@ -0,0 +1,75 @@ +diff -up ./bin/phpcompatinfo.json.dist.rpm ./bin/phpcompatinfo.json.dist +--- ./bin/phpcompatinfo.json.dist.rpm 2018-11-27 22:03:39.000000000 +0100 ++++ ./bin/phpcompatinfo.json.dist 2018-11-28 08:53:47.258278539 +0100 +@@ -6,6 +6,19 @@ + } + ], + "plugins": [ ++ { ++ "name": "Cache", ++ "class": "Bartlett\\Reflect\\Plugin\\CachePlugin", ++ "options": { ++ "adapter": "DoctrineCacheAdapter", ++ "backend": { ++ "class": "Doctrine\\Common\\Cache\\FilesystemCache", ++ "args": [ ++ "%{HOME}/.cache/php-reflect" ++ ] ++ } ++ } ++ } + ], + "analysers" : [ + ], +diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo +--- ./bin/phpcompatinfo.rpm 2018-11-28 08:53:47.258278539 +0100 ++++ ./bin/phpcompatinfo 2018-11-28 08:55:38.807878501 +0100 +@@ -1,42 +1,22 @@ + #!/usr/bin/env php + setUseIncludePath(true); + + if (PHP_SAPI !== 'cli') { + return; + } + +-$compatInfoDbV1 = class_exists(Bartlett\CompatInfoDb\Environment::class); +- +-if (\Phar::running() && $compatInfoDbV1) { +- try { +- Bartlett\CompatInfoDb\Environment::checkRequirements(); +- } catch (\RuntimeException $e) { +- die ($e->getMessage()); +- } +-} +- + use Bartlett\Reflect\Environment; + use Bartlett\CompatInfo\Console\Application; + + Environment::setScanDir(); + +-$application = new Application($appName, '5.2.3'); ++$application = new Application($appName, '@package_version@'); + $application->run(); diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 5ccfaa0..fbfd82e 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -11,7 +11,7 @@ %undefine __brp_mangle_shebangs %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit de5add0eae4774e5832259ebef3f6223ca23a5e1 +%global gh_commit ec29a4eea541d3bfdbf00b6ff85700dd926bf6b6 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville @@ -26,7 +26,7 @@ %endif Name: php-bartlett-PHP-CompatInfo -Version: 5.2.2 +Version: 5.2.3 %global specrel 1 Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} Summary: Find out version and the extensions required for a piece of code to run @@ -42,9 +42,7 @@ Source1: fedora-review-check Source2: %{name}-5.1.0-autoload.php # Autoload and sqlite database path -Patch0: %{name}-5.2.2-rpm.patch - -Patch1: https://patch-diff.githubusercontent.com/raw/llaville/php-compat-info/pull/261.patch +Patch0: %{name}-5.2.3-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 5.5 @@ -152,7 +150,6 @@ Documentation: http://php5.laurent-laville.org/compatinfo/manual/current/en/ %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch1 -p1 %patch0 -p1 -b .rpm cp %{SOURCE2} src/Bartlett/CompatInfo/autoload.php @@ -218,6 +215,10 @@ fi %changelog +* Wed Apr 29 2020 Remi Collet - 5.2.3-1 +- update to 5.2.3 +- drop patch merged upstream + * Wed Apr 29 2020 Remi Collet - 5.2.2-1 - update to 5.2.2 - fix test suite for PHP 7.4 using patch from -- cgit