From 13d6b95e5b8019f91c3b0d2c3676f66e296553d8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 18 Oct 2013 09:43:45 +0200 Subject: [PATCH 001/111] update to 2.24.0 --- .gitignore | 1 + php-bartlett-PHP-CompatInfo.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 2b657d6..f3abc87 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ package-*.xml /PHP_CompatInfo-2.21.0.tgz /PHP_CompatInfo-2.22.0.tgz /PHP_CompatInfo-2.23.1.tgz +/PHP_CompatInfo-2.24.0.tgz diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index af4a7b5..b63d6c5 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -16,7 +16,7 @@ Name: php-bartlett-PHP-CompatInfo -Version: 2.23.1 +Version: 2.24.0 Release: 1%{?dist} Summary: Find out version and the extensions required for a piece of code to run @@ -39,7 +39,7 @@ BuildRequires: php-pear(PEAR) >= 1.9.0 BuildRequires: php-channel(%{channel}) # to run test suite BuildRequires: php-pear(pear.phpunit.de/PHPUnit) >= 3.6.0 -BuildRequires: php-pear(%{channel}/PHP_Reflect) >= 1.8.0 +BuildRequires: php-pear(%{channel}/PHP_Reflect) >= 1.9.0 Requires(post): %{__pear} Requires(postun): %{__pear} @@ -51,7 +51,7 @@ Requires: php-pcre Requires: php-reflection Requires: php-spl Requires: php-pear(PEAR) >= 1.9.0 -Requires: php-pear(%{channel}/PHP_Reflect) >= 1.8.0 +Requires: php-pear(%{channel}/PHP_Reflect) >= 1.9.0 Requires: php-pear(%{channel}/PHP_Reflect) < 2 Requires: php-pear(Console_CommandLine) >= 1.2.0 # Optional @@ -166,6 +166,10 @@ fi %changelog +* Fri Oct 18 2013 Remi Collet - 2.24.0-1 +- update to 2.24.0 +- raise dependency, PHP_Reflect 1.9.0 + * Mon Sep 23 2013 Remi Collet - 2.23.1-1 - Update to 2.23.1 - raise dependencies: PHP 5.3.0, PHP_Reflect 1.8.0 (and < 2) diff --git a/sources b/sources index 910650b..928bf3b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7ded2ef550bf99ea703af79dfe0064c4 PHP_CompatInfo-2.23.1.tgz +a7f1f0fd7f7e6d5d512fc36973691e2e PHP_CompatInfo-2.24.0.tgz From 964b5e01fd3217ea15591fddd948740e4c8219f9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 14 Nov 2013 14:11:34 +0100 Subject: [PATCH 002/111] update to 2.25.0 --- .gitignore | 1 + php-bartlett-PHP-CompatInfo.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f3abc87..9c5537c 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ package-*.xml /PHP_CompatInfo-2.22.0.tgz /PHP_CompatInfo-2.23.1.tgz /PHP_CompatInfo-2.24.0.tgz +/PHP_CompatInfo-2.25.0.tgz diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index b63d6c5..3fe18e5 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -16,7 +16,7 @@ Name: php-bartlett-PHP-CompatInfo -Version: 2.24.0 +Version: 2.25.0 Release: 1%{?dist} Summary: Find out version and the extensions required for a piece of code to run @@ -166,6 +166,9 @@ fi %changelog +* Thu Nov 14 2013 Remi Collet - 2.25.0-1 +- Update to 2.25.0 + * Fri Oct 18 2013 Remi Collet - 2.24.0-1 - update to 2.24.0 - raise dependency, PHP_Reflect 1.9.0 diff --git a/sources b/sources index 928bf3b..0d6604e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a7f1f0fd7f7e6d5d512fc36973691e2e PHP_CompatInfo-2.24.0.tgz +e82d3df2ef505225e98836bf400bb335 PHP_CompatInfo-2.25.0.tgz From 19024338b0663bc0f6d3e945bac0dc811523a854 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 14 Nov 2013 14:12:13 +0100 Subject: [PATCH 003/111] remove phpci temporary compat command --- php-bartlett-PHP-CompatInfo.spec | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 3fe18e5..b818324 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -60,7 +60,6 @@ Requires: php-pear(pear.phpunit.de/PHP_Timer) >= 1.0.0 # Optional and not yet availalble php-pear(Net_Growl) >= 2.2.2 Provides: php-pear(%{channel}/%{pear_name}) = %{version}%{?prever} -Provides: phpci = %{version}%{?prever} Provides: phpcompatinfo = %{version}%{?prever} @@ -108,10 +107,6 @@ install -pm 644 phpcompatinfo.xml %{buildroot}%{pear_cfgdir}/%{pear_name}/ mkdir -p %{buildroot}%{_mandir}/man1 install -pm 644 %{SOURCE1} %{buildroot}%{_mandir}/man1/phpcompatinfo.1 -# Keep old phpci command for compatibility (will be remove later) -cd %{buildroot}%{_bindir} -ln -s phpcompatinfo phpci - %check cd %{pear_name}-%{version}%{?prever} @@ -160,7 +155,6 @@ fi %{pear_phpdir}/Bartlett/PHP/Compat* %{pear_testdir}/%{pear_name} %{pear_datadir}/%{pear_name} -%{_bindir}/phpci %{_bindir}/phpcompatinfo %{_mandir}/man1/phpcompatinfo.* @@ -168,6 +162,7 @@ fi %changelog * Thu Nov 14 2013 Remi Collet - 2.25.0-1 - Update to 2.25.0 +- remove phpci temporary compat command * Fri Oct 18 2013 Remi Collet - 2.24.0-1 - update to 2.24.0 From 03acb3bb97a69f4ae87cdbd239c161a7330911c3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 13 Dec 2013 12:26:07 +0100 Subject: [PATCH 004/111] update to 2.26.0 (stable) for PHP 5.3.28, 5.4.23, 5.5.7 --- .gitignore | 1 + php-bartlett-PHP-CompatInfo.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9c5537c..7718758 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ package-*.xml /PHP_CompatInfo-2.23.1.tgz /PHP_CompatInfo-2.24.0.tgz /PHP_CompatInfo-2.25.0.tgz +/PHP_CompatInfo-2.26.0.tgz diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index b818324..2a6ff03 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -16,7 +16,7 @@ Name: php-bartlett-PHP-CompatInfo -Version: 2.25.0 +Version: 2.26.0 Release: 1%{?dist} Summary: Find out version and the extensions required for a piece of code to run @@ -160,6 +160,9 @@ fi %changelog +* Fri Dec 13 2013 Remi Collet - 2.26.0-1 +- Update to 2.26.0 (stable) + * Thu Nov 14 2013 Remi Collet - 2.25.0-1 - Update to 2.25.0 - remove phpci temporary compat command diff --git a/sources b/sources index 0d6604e..7ea53c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e82d3df2ef505225e98836bf400bb335 PHP_CompatInfo-2.25.0.tgz +ca6f0922e26119157efb891cd51d6c66 PHP_CompatInfo-2.26.0.tgz From 312cc87c8e0d2238c4c1bd8a31228de23b172957 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 08:27:51 -0500 Subject: [PATCH 005/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- php-bartlett-PHP-CompatInfo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 2a6ff03..53d5ee9 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -17,7 +17,7 @@ Name: php-bartlett-PHP-CompatInfo Version: 2.26.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Find out version and the extensions required for a piece of code to run Group: Development/Libraries @@ -160,6 +160,9 @@ fi %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 2.26.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Fri Dec 13 2013 Remi Collet - 2.26.0-1 - Update to 2.26.0 (stable) From c56ec56a0d4c14c46a8fe9780947f437ae6d1a19 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 25 Jul 2014 08:41:19 +0200 Subject: [PATCH 006/111] - Update to 3.2.0 - add manpage - sources from github - patch autoloader to not rely on composer - drop documentation (link to online doc in description) - add upstream patch for SNMP extension --- .gitignore | 1 + PHP_CompatInfo-conf.patch | 18 --- php-bartlett-PHP-CompatInfo-rpm.patch | 71 +++++++++ php-bartlett-PHP-CompatInfo-upstream.patch | 84 ++++++++++ php-bartlett-PHP-CompatInfo.spec | 170 +++++++++------------ phpcompatinfo.1 | 149 ------------------ sources | 2 +- 7 files changed, 228 insertions(+), 267 deletions(-) delete mode 100644 PHP_CompatInfo-conf.patch create mode 100644 php-bartlett-PHP-CompatInfo-rpm.patch create mode 100644 php-bartlett-PHP-CompatInfo-upstream.patch delete mode 100644 phpcompatinfo.1 diff --git a/.gitignore b/.gitignore index 7718758..a5a6627 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ package-*.xml /PHP_CompatInfo-2.24.0.tgz /PHP_CompatInfo-2.25.0.tgz /PHP_CompatInfo-2.26.0.tgz +/php-compat-info-3.2.0.tar.gz diff --git a/PHP_CompatInfo-conf.patch b/PHP_CompatInfo-conf.patch deleted file mode 100644 index 2aa82ae..0000000 --- a/PHP_CompatInfo-conf.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- PHP_CompatInfo-2.19.0/phpcompatinfo.xml.dist 2013-07-11 22:21:27.000000000 +0200 -+++ PHP_CompatInfo-2.19.0/phpcompatinfo.xml 2013-07-12 08:22:34.529605184 +0200 -@@ -5,13 +5,14 @@ - reportFileAppend="false" - cacheDriver="file" - recursive="false" -- fileExtensions="php, inc, phtml" -+ fileExtensions="php, inc, phtml, module, install" - consoleProgress="true" - verbose="false" - > - - - -+ /tmp/phpci-%{USER} - 1 - 86400 - diff --git a/php-bartlett-PHP-CompatInfo-rpm.patch b/php-bartlett-PHP-CompatInfo-rpm.patch new file mode 100644 index 0000000..a39ef5a --- /dev/null +++ b/php-bartlett-PHP-CompatInfo-rpm.patch @@ -0,0 +1,71 @@ +diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo +--- ./bin/phpcompatinfo.rpm 2014-07-22 20:58:01.000000000 +0200 ++++ ./bin/phpcompatinfo 2014-07-24 07:35:44.357468394 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env php ++#!/usr/bin/php + registerNamespaces(array( ++ 'Doctrine\\Common\\Cache' => $vendorDir, ++ 'Symfony\\Component\\Finder' => $vendorDir, ++ 'Symfony\\Component\\EventDispatcher' => $vendorDir, ++ 'Symfony\\Component\\Console' => $vendorDir, ++ 'Symfony\\Component\\ClassLoader' => $vendorDir, ++ 'Bartlett' => $vendorDir, ++)); ++$loader->register(); + + if (PHP_SAPI !== 'cli') { + return; +diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php +--- ./tests/bootstrap.php.rpm 2014-07-22 20:58:01.000000000 +0200 ++++ ./tests/bootstrap.php 2014-07-24 07:35:28.060391649 +0200 +@@ -1,8 +1,29 @@ + registerNamespaces(array( ++ 'Symfony\\Component\\Finder' => $vendorDir, ++ 'Symfony\\Component\\EventDispatcher' => $vendorDir, ++ 'Symfony\\Component\\Console' => $vendorDir, ++ 'Symfony\\Component\\ClassLoader' => $vendorDir, ++ 'Bartlett\\Reflect' => $vendorDir, ++ 'Bartlett\\Tests\\CompatInfo' => $baseDir . '/tests', ++ 'Bartlett' => $baseDir . '/src', ++ )); ++ ++$loader->register(); ++ ++# Class not catched by autoloader ++require $vendorDir . '/Bartlett/Reflect.php'; + require __DIR__ . '/Reference/GenericTest.php'; diff --git a/php-bartlett-PHP-CompatInfo-upstream.patch b/php-bartlett-PHP-CompatInfo-upstream.patch new file mode 100644 index 0000000..a42c72d --- /dev/null +++ b/php-bartlett-PHP-CompatInfo-upstream.patch @@ -0,0 +1,84 @@ +From c45d362462779cf67a06f2e991e88f4c6ca4908d Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Thu, 24 Jul 2014 16:58:37 +0200 +Subject: [PATCH] fix ref version for haru, ssh2 and stomp extension + +Signed-off-by: Laurent Laville +--- + src/Bartlett/CompatInfo/Reference/Extension/HaruExtension.php | 2 +- + src/Bartlett/CompatInfo/Reference/Extension/Ssh2Extension.php | 2 +- + src/Bartlett/CompatInfo/Reference/Extension/StompExtension.php | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/Bartlett/CompatInfo/Reference/Extension/HaruExtension.php b/src/Bartlett/CompatInfo/Reference/Extension/HaruExtension.php +index 0445211..d6783f6 100644 +--- a/src/Bartlett/CompatInfo/Reference/Extension/HaruExtension.php ++++ b/src/Bartlett/CompatInfo/Reference/Extension/HaruExtension.php +@@ -7,7 +7,7 @@ + class HaruExtension extends AbstractReference + { + const REF_NAME = 'haru'; +- const REF_VERSION = ''; ++ const REF_VERSION = '1.0.4'; // 2012-12-23 + + public function __construct() + { +diff --git a/src/Bartlett/CompatInfo/Reference/Extension/Ssh2Extension.php b/src/Bartlett/CompatInfo/Reference/Extension/Ssh2Extension.php +index 102ac4c..e958f4a 100644 +--- a/src/Bartlett/CompatInfo/Reference/Extension/Ssh2Extension.php ++++ b/src/Bartlett/CompatInfo/Reference/Extension/Ssh2Extension.php +@@ -7,7 +7,7 @@ + class Ssh2Extension extends AbstractReference + { + const REF_NAME = 'ssh2'; +- const REF_VERSION = ''; ++ const REF_VERSION = '0.12'; // 2012-10-15 + + public function __construct() + { +diff --git a/src/Bartlett/CompatInfo/Reference/Extension/StompExtension.php b/src/Bartlett/CompatInfo/Reference/Extension/StompExtension.php +index b2c5ce7..20f77a5 100644 +--- a/src/Bartlett/CompatInfo/Reference/Extension/StompExtension.php ++++ b/src/Bartlett/CompatInfo/Reference/Extension/StompExtension.php +@@ -7,7 +7,7 @@ + class StompExtension extends AbstractReference + { + const REF_NAME = 'stomp'; +- const REF_VERSION = ''; ++ const REF_VERSION = '1.0.5'; // 2012-11-18 + + public function __construct() + { +-- +1.9.3 + +From b3bcf488623080ad0de6965d478692dbc6c3e921 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Thu, 24 Jul 2014 16:59:05 +0200 +Subject: [PATCH] don't use extension version if not registered in reference, + fix snmp issue + +Signed-off-by: Laurent Laville +--- + src/Bartlett/CompatInfo/Reference/AbstractReference.php | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/Bartlett/CompatInfo/Reference/AbstractReference.php b/src/Bartlett/CompatInfo/Reference/AbstractReference.php +index 3bef201..2926813 100644 +--- a/src/Bartlett/CompatInfo/Reference/AbstractReference.php ++++ b/src/Bartlett/CompatInfo/Reference/AbstractReference.php +@@ -186,9 +186,10 @@ public function getCurrentVersion() + { + $version = phpversion($this->name); + $pattern = '/^[0-9]+\.[0-9]+/'; +- if (!preg_match($pattern, $version)) { ++ if (empty($this->version) || !preg_match($pattern, $version)) { + /** + * When version is not provided by the extension, or not standard format ++ * or we don't have it in our reference (ex snmp) because have no sense + * be sure at least to return latest PHP version supported. + */ + $version = $this->getLatestPhpVersion(); +-- +1.9.3 + diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 53d5ee9..cda11a3 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -1,66 +1,67 @@ # spec file for php-bartlett-PHP-CompatInfo # -# Copyright (c) 2011-2013 Remi Collet +# Copyright (c) 2011-2014 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/3.0/ # # Please, preserve the changelog entries # -%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} -%{!?pear_metadir: %global pear_metadir %{pear_phpdir}} -%global pear_name PHP_CompatInfo -%global channel bartlett.laurent-laville.org - -# TODO : link /usr/share/pear/data/PHP_CompatInfo/misc/jquery-min.js -# to system jquery when available, then fix License (BSD only) - +%global gh_commit 23d66048d3aac6093e215143274eb95e8556da70 +#global gh_short %(c=%{gh_commit}; echo ${c:0:7}) +%global gh_owner llaville +%global gh_project php-compat-info Name: php-bartlett-PHP-CompatInfo -Version: 2.26.0 -Release: 2%{?dist} +Version: 3.2.0 +Release: 1%{?dist} Summary: Find out version and the extensions required for a piece of code to run Group: Development/Libraries -# PHP-CompatInfo is BSD, bundled jquery is MIT (or GPL) -License: BSD and MIT +License: BSD URL: http://php5.laurent-laville.org/compatinfo/ -Source0: http://bartlett.laurent-laville.org/get/%{pear_name}-%{version}%{?prever}.tgz -Source1: https://raw.github.com/llaville/php-compat-info/master/misc/phpcompatinfo.1 +Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}%{?gh_short:-%{gh_short}}.tar.gz -# Update configuration for best experience -# Reference = ALL known extension (instead of installed ones) -# Make cache / save_path user specific -# Add .install .module to fileExtensions (for drupal) -Patch0: %{pear_name}-conf.patch +# Autoloader for RPM - die composer ! +Patch0: %{name}-rpm.patch +Patch1: %{name}-upstream.patch BuildArch: noarch BuildRequires: php(language) >= 5.3.0 -BuildRequires: php-pear(PEAR) >= 1.9.0 -BuildRequires: php-channel(%{channel}) # to run test suite -BuildRequires: php-pear(pear.phpunit.de/PHPUnit) >= 3.6.0 -BuildRequires: php-pear(%{channel}/PHP_Reflect) >= 1.9.0 +BuildRequires: %{_bindir}/phpunit +BuildRequires: php-composer(bartlett/php-reflect) >= 2.2 -Requires(post): %{__pear} -Requires(postun): %{__pear} +# From composer.json, "require" +# "php": ">=5.3.0", +# "ext-libxml": "*", +# "ext-pcre": "*", +# "ext-spl": "*", +# "ext-json": "*", +# "symfony/console": "~2.5", +# "bartlett/php-reflect": "~2.2" Requires: php(language) >= 5.3.0 -Requires: php-date -Requires: php-dom +Requires: php-json Requires: php-libxml Requires: php-pcre -Requires: php-reflection Requires: php-spl -Requires: php-pear(PEAR) >= 1.9.0 -Requires: php-pear(%{channel}/PHP_Reflect) >= 1.9.0 -Requires: php-pear(%{channel}/PHP_Reflect) < 2 -Requires: php-pear(Console_CommandLine) >= 1.2.0 -# Optional -Requires: php-pear(pear.phpunit.de/PHPUnit) >= 3.6.0 -Requires: php-pear(pear.phpunit.de/PHP_Timer) >= 1.0.0 -# Optional and not yet availalble php-pear(Net_Growl) >= 2.2.2 +Requires: php-composer(bartlett/php-reflect) >= 2.2 +Requires: php-composer(bartlett/php-reflect) < 3 +Requires: php-composer(symfony/console) >= 2.5 +Requires: php-composer(symfony/console) < 3 +# From composer.json, "suggest" +# "doctrine/cache": "Allow caching results, since bartlett/php-reflect 2.2" +Requires: php-composer(doctrine/cache) +# Required by autoloader +Requires: php-composer(phpunit/php-timer) +Requires: php-composer(nikic/php-parser) +Requires: php-composer(symfony/class-loader) +Requires: php-composer(symfony/event-dispatcher) +Requires: php-composer(symfony/finder) +# From phpcompatinfo report for version 3.2.0 +Requires: php-curl -Provides: php-pear(%{channel}/%{pear_name}) = %{version}%{?prever} -Provides: phpcompatinfo = %{version}%{?prever} +Provides: phpcompatinfo = %{version} +Provides: php-composer(bartlett/php-compatinfo) = %{version} %description @@ -69,97 +70,68 @@ version and extensions required for it to run. CLI version has many reports (extension, interface, class, function, constant) to display and ability to show content of dictionary references. -HTML Documentation: %{pear_docdir}/%{pear_name}/html/index.html +Documentation: http://php5.laurent-laville.org/compatinfo/manual/3.2/en/ %prep -%setup -q -c +%setup -q -n %{gh_project}-%{gh_commit} -cd %{pear_name}-%{version}%{?prever} +%patch0 -p1 -b .rpm +%patch1 -p1 -b .git -# Copy upstream default configuration -cp phpcompatinfo.xml.dist phpcompatinfo.xml -# Apply our changes -%patch0 -p1 -b .rpm - -cp ../package.xml %{name}.xml +sed -e 's/@package_version@/%{version}/' \ + -i $(find src -name \*.php) %build -cd %{pear_name}-%{version}%{?prever} +# Nothing %install -cd %{pear_name}-%{version}%{?prever} -%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml +mkdir -p %{buildroot}%{_datadir}/php +cp -pr src/Bartlett %{buildroot}%{_datadir}/php/Bartlett -# Clean up unnecessary files -rm -rf %{buildroot}%{pear_metadir}/.??* - -# Install XML package description -mkdir -p %{buildroot}%{pear_xmldir} -install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir} - -# Create default package configuration -install -pm 644 phpcompatinfo.xml %{buildroot}%{pear_cfgdir}/%{pear_name}/ - -# Install the man page -mkdir -p %{buildroot}%{_mandir}/man1 -install -pm 644 %{SOURCE1} %{buildroot}%{_mandir}/man1/phpcompatinfo.1 +install -D -p -m 755 bin/phpcompatinfo %{buildroot}%{_bindir}/phpcompatinfo +install -D -p -m 644 bin/phpcompatinfo.json.dist %{buildroot}%{_sysconfdir}/phpcompatinfo.json +install -D -p -m 644 bin/phpcompatinfo.1 %{buildroot}%{_mandir}/man1/phpcompatinfo.1 %check -cd %{pear_name}-%{version}%{?prever} - -%if 0%{?rhel} == 6 -# php-5.3.3-CVE-2012-0057.patch add new constants from php 5.3.9 -# so drop this test which fails with -# Constant 'XSL_SECPREF_CREATE_DIRECTORY', found in Reference (5.3.9,), exists. -rm -f tests/Reference/XslTest.php -%endif - -# OK, but incomplete or skipped tests! -# Tests: 810, Assertions: 10996, Skipped: 80, when most extensions installed -# Tests: 551, Assertions: 6833, Skipped: 378, in mock -# Reference tests need some fixes for EL-5, so ignore result for now %{_bindir}/phpunit \ -d date.timezone=UTC \ -d memory_limit=-1 \ - --bootstrap %{buildroot}%{pear_phpdir}/Bartlett/PHP/CompatInfo/Autoload.php \ %if 0%{?rhel} < 6 && 0%{?fedora} < 8 - tests || exit 0 -%else - tests + || exit 0 %endif %post -%{__pear} install --nodeps --soft --force --register-only \ - %{pear_xmldir}/%{name}.xml >/dev/null || : - -%postun -if [ $1 -eq 0 ] ; then - %{__pear} uninstall --nodeps --ignore-errors --register-only \ - %{channel}/%{pear_name} >/dev/null || : +if [ -x %{_bindir}/pear ]; then + %{_bindir}/pear uninstall --nodeps --ignore-errors --register-only \ + bartlett.laurent-laville.org/PHP_CompatInfo >/dev/null || : fi %files -%doc %{pear_docdir}/%{pear_name} -%dir %{pear_cfgdir}/%{pear_name} -# Editable configuration -%config(noreplace) %{pear_cfgdir}/%{pear_name}/phpcompatinfo.xml -# Default configuration -%{pear_cfgdir}/%{pear_name}/phpcompatinfo.xml.dist -%{pear_xmldir}/%{name}.xml -%{pear_phpdir}/Bartlett/PHP/Compat* -%{pear_testdir}/%{pear_name} -%{pear_datadir}/%{pear_name} +%{!?_licensedir:%global license %%doc} +%license LICENSE +%doc composer.json README.* +%config(noreplace) %{_sysconfdir}/phpcompatinfo.json %{_bindir}/phpcompatinfo -%{_mandir}/man1/phpcompatinfo.* +%{_datadir}/php/Bartlett/CompatInfo +%{_datadir}/php/Bartlett/CompatInfo.php +%{_mandir}/man1/phpcompatinfo.1* %changelog +* Fri Jul 25 2014 Remi Collet - 3.2.0-1 +- Update to 3.2.0 +- add manpage +- sources from github +- patch autoloader to not rely on composer +- drop documentation (link to online doc in description) +- add upstream patch for SNMP extension + * Sat Jun 07 2014 Fedora Release Engineering - 2.26.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/phpcompatinfo.1 b/phpcompatinfo.1 deleted file mode 100644 index 0a0f32b..0000000 --- a/phpcompatinfo.1 +++ /dev/null @@ -1,149 +0,0 @@ -'\" t -.\" Title: phpcompatinfo -.\" Author: [see the "AUTHORS" section] -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 05/28/2013 -.\" Manual: \ \& -.\" Source: \ \& -.\" Language: English -.\" -.TH "PHPCOMPATINFO" "1" "05/28/2013" "\ \&" "\ \&" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- -.SH "NAME" -phpcompatinfo \- parse any data source to find out the minimum version and extensions required for it to run -.SH "SYNOPSIS" -.sp -\fBphpcompatinfo\fR [\fIOPTIONS\fR] \fICOMMAND\fR [\fIOPTS\fR] [\fIDATASOURCE\fR] -.SH "DESCRIPTION" -.sp -The phpcompatinfo(1) command parse any \fIDATASOURCE\fR to find out the minimum PHP version and extensions required\&. -.SH "OPTIONS" -.PP -\fB\-\-configuration\fR=\fIXMLFILE\fR -.RS 4 -Read configuration options from -\fIXMLFILE\fR\&. All command line options will overrides those that are defined in this xml file\&. -.RE -.PP -\fB\-\-no\-configuration\fR -.RS 4 -Ignore default configuration files: -\fIphpcompatinfo\&.xml\fR, -\fIphpcompatinfo\&.xml\&.dist\fR\&. -.RE -.PP -\fB\-d, \-\-ini\-set\fR=\fIINI_SET\fR -.RS 4 -Sets a php\&.ini directive value\&. This option may be specified more than once\&. -.RE -.PP -\fB\-v, \-\-verbose\fR -.RS 4 -Verbosely print processing information and warning messages\&. -.sp -.RS 4 -.ie n \{\ -\h'-04'\(bu\h'+03'\c -.\} -.el \{\ -.sp -1 -.IP \(bu 2.3 -.\} -[\fITOPIC\fR] \-h, \-\-help*:: Print help TOPIC\&. -\fItopic\fR\fB\-\-help\fR -will print help content about a topic, -\fB\-\-help\fR -summarizes phpcompatinfo syntax\&. -.RE -.RE -.PP -\fB\-\-version\fR -.RS 4 -Print program version number\&. -.RE -.SH "PRINT COMMAND" -.sp -The phpcompatinfo(1) \fIPRINT\fR command is used to find out minimum php version to run data source code provided\&. Syntax: -.sp -.if n \{\ -.RS 4 -.\} -.nf -phpcompatinfo print [OPTION] DATA_SOURCE -.fi -.if n \{\ -.RE -.\} -.sp -Where: -.PP -\fBOPTION\fR -.RS 4 -phpcompatinfo(1) -\fB\-\-report\fR -option specifying the type of result to print on stdout\&. See -\fB\-\-help\-report\fR -option for valid choices\&. -.RE -.PP -\fBDATA_SOURCE\fR -.RS 4 -The source path to scan\&. -.RE -.sp -The commands perform as follows: -.PP -\fBprint\fR -.RS 4 -Print report on stdout or into a file if -\fB\-\-report\-file\fR -option is in effect\&. -.RE -.SH "EXIT STATUS" -.PP -\fB0\fR -.RS 4 -Success -.RE -.PP -\fB1\fR -.RS 4 -Failure (syntax or usage error; configuration error; unexpected error)\&. -.RE -.SH "BUGS" -.sp -Report any issue at https://github\&.com/llaville/php\-compat\-info/issues -.SH "AUTHORS" -.sp -PHP_CompatInfo was originally written by Davey Shafik in 2004\&. -.sp -Remi Collet, contributor of many extensions reference and unit tests, joined the project since version 2\&.0\&.0RC2 -.sp -This CLI version was introduced and written by Laurent Laville\&. -.SH "SEE ALSO" -.sp -Main web site: http://php5\&.laurent\-laville\&.org/compatinfo/ -.SH "COPYRIGHT" -.sp -Copyright (C) 2010\-2013 Laurent Laville\&. -.SH "LICENSE" -.sp -Free use of this software is granted under the terms of the BSD 3\-clause license\&. diff --git a/sources b/sources index 7ea53c8..c7858ac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ca6f0922e26119157efb891cd51d6c66 PHP_CompatInfo-2.26.0.tgz +0a0b4588a28c40e671e73b9078b5b18e php-compat-info-3.2.0.tar.gz From e94cd571012f474c4b56a52bb24e81ee5774055f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 22 Aug 2014 09:33:18 +0200 Subject: [PATCH 007/111] Update to 3.2.0 - add dependency on seld/jsonlint - raise dependency on bartlett/php-reflect 2.3 - enable the cache plugin in default configuration --- .gitignore | 34 +-------- php-bartlett-PHP-CompatInfo-rpm.patch | 34 +++++++-- php-bartlett-PHP-CompatInfo-upstream.patch | 84 ---------------------- php-bartlett-PHP-CompatInfo.spec | 25 ++++--- sources | 2 +- 5 files changed, 48 insertions(+), 131 deletions(-) delete mode 100644 php-bartlett-PHP-CompatInfo-upstream.patch diff --git a/.gitignore b/.gitignore index a5a6627..856a22e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,35 +1,3 @@ clog -*spec~ -package-*.xml -/PHP_CompatInfo-2.1.0.tgz -/PHP_CompatInfo-2.2.1.tgz -/PHP_CompatInfo-2.2.2.tgz -/PHP_CompatInfo-2.2.3.tgz -/PHP_CompatInfo-2.2.4.tgz -/PHP_CompatInfo-2.2.5.tgz -/PHP_CompatInfo-2.3.0.tgz -/PHP_CompatInfo-2.4.0.tgz -/PHP_CompatInfo-2.5.0.tgz -/PHP_CompatInfo-2.6.0.tgz -/PHP_CompatInfo-2.7.0.tgz -/PHP_CompatInfo-2.8.0.tgz -/PHP_CompatInfo-2.8.1.tgz -/PHP_CompatInfo-2.11.0.tgz -/PHP_CompatInfo-2.12.1.tgz -/PHP_CompatInfo-2.13.0.tgz -/PHP_CompatInfo-2.13.2.tgz -/PHP_CompatInfo-2.14.0.tgz -/PHP_CompatInfo-2.14.1.tgz -/PHP_CompatInfo-2.15.0.tgz -/PHP_CompatInfo-2.16.0.tgz -/PHP_CompatInfo-2.17.0.tgz -/PHP_CompatInfo-2.18.0.tgz -/PHP_CompatInfo-2.19.0.tgz -/PHP_CompatInfo-2.20.0.tgz -/PHP_CompatInfo-2.21.0.tgz -/PHP_CompatInfo-2.22.0.tgz -/PHP_CompatInfo-2.23.1.tgz -/PHP_CompatInfo-2.24.0.tgz -/PHP_CompatInfo-2.25.0.tgz -/PHP_CompatInfo-2.26.0.tgz /php-compat-info-3.2.0.tar.gz +/php-compat-info-3.3.0.tar.gz diff --git a/php-bartlett-PHP-CompatInfo-rpm.patch b/php-bartlett-PHP-CompatInfo-rpm.patch index a39ef5a..f35d15c 100644 --- a/php-bartlett-PHP-CompatInfo-rpm.patch +++ b/php-bartlett-PHP-CompatInfo-rpm.patch @@ -1,13 +1,36 @@ +diff -up ./bin/phpcompatinfo.json.dist.rpm ./bin/phpcompatinfo.json.dist +--- ./bin/phpcompatinfo.json.dist.rpm 2014-08-22 08:17:40.045281815 +0200 ++++ ./bin/phpcompatinfo.json.dist 2014-08-22 08:17:46.784308376 +0200 +@@ -9,6 +9,19 @@ + { + "name": "Analyser", + "class": "Bartlett\\Reflect\\Plugin\\Analyser\\AnalyserPlugin" ++ }, ++ { ++ "name": "Cache", ++ "class": "Bartlett\\Reflect\\Plugin\\Cache\\CachePlugin", ++ "options": { ++ "adapter": "DoctrineCacheAdapter", ++ "backend": { ++ "class": "Doctrine\\Common\\Cache\\FilesystemCache", ++ "args": [ ++ "%{HOME}/.cache/phpreflect" ++ ] ++ } ++ } + } + ], + "analysers" : [ diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo ---- ./bin/phpcompatinfo.rpm 2014-07-22 20:58:01.000000000 +0200 -+++ ./bin/phpcompatinfo 2014-07-24 07:35:44.357468394 +0200 +--- ./bin/phpcompatinfo.rpm 2014-08-21 21:09:22.000000000 +0200 ++++ ./bin/phpcompatinfo 2014-08-22 08:28:20.750827392 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env php +#!/usr/bin/php $vendorDir, + 'Symfony\\Component\\Console' => $vendorDir, + 'Symfony\\Component\\ClassLoader' => $vendorDir, ++ 'Seld\\JsonLint' => $vendorDir, + 'Bartlett' => $vendorDir, +)); +$loader->register(); @@ -35,8 +59,8 @@ diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo if (PHP_SAPI !== 'cli') { return; diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php ---- ./tests/bootstrap.php.rpm 2014-07-22 20:58:01.000000000 +0200 -+++ ./tests/bootstrap.php 2014-07-24 07:35:28.060391649 +0200 +--- ./tests/bootstrap.php.rpm 2014-08-21 21:09:22.000000000 +0200 ++++ ./tests/bootstrap.php 2014-08-22 08:30:12.203270207 +0200 @@ -1,8 +1,29 @@ -Date: Thu, 24 Jul 2014 16:58:37 +0200 -Subject: [PATCH] fix ref version for haru, ssh2 and stomp extension - -Signed-off-by: Laurent Laville ---- - src/Bartlett/CompatInfo/Reference/Extension/HaruExtension.php | 2 +- - src/Bartlett/CompatInfo/Reference/Extension/Ssh2Extension.php | 2 +- - src/Bartlett/CompatInfo/Reference/Extension/StompExtension.php | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/Bartlett/CompatInfo/Reference/Extension/HaruExtension.php b/src/Bartlett/CompatInfo/Reference/Extension/HaruExtension.php -index 0445211..d6783f6 100644 ---- a/src/Bartlett/CompatInfo/Reference/Extension/HaruExtension.php -+++ b/src/Bartlett/CompatInfo/Reference/Extension/HaruExtension.php -@@ -7,7 +7,7 @@ - class HaruExtension extends AbstractReference - { - const REF_NAME = 'haru'; -- const REF_VERSION = ''; -+ const REF_VERSION = '1.0.4'; // 2012-12-23 - - public function __construct() - { -diff --git a/src/Bartlett/CompatInfo/Reference/Extension/Ssh2Extension.php b/src/Bartlett/CompatInfo/Reference/Extension/Ssh2Extension.php -index 102ac4c..e958f4a 100644 ---- a/src/Bartlett/CompatInfo/Reference/Extension/Ssh2Extension.php -+++ b/src/Bartlett/CompatInfo/Reference/Extension/Ssh2Extension.php -@@ -7,7 +7,7 @@ - class Ssh2Extension extends AbstractReference - { - const REF_NAME = 'ssh2'; -- const REF_VERSION = ''; -+ const REF_VERSION = '0.12'; // 2012-10-15 - - public function __construct() - { -diff --git a/src/Bartlett/CompatInfo/Reference/Extension/StompExtension.php b/src/Bartlett/CompatInfo/Reference/Extension/StompExtension.php -index b2c5ce7..20f77a5 100644 ---- a/src/Bartlett/CompatInfo/Reference/Extension/StompExtension.php -+++ b/src/Bartlett/CompatInfo/Reference/Extension/StompExtension.php -@@ -7,7 +7,7 @@ - class StompExtension extends AbstractReference - { - const REF_NAME = 'stomp'; -- const REF_VERSION = ''; -+ const REF_VERSION = '1.0.5'; // 2012-11-18 - - public function __construct() - { --- -1.9.3 - -From b3bcf488623080ad0de6965d478692dbc6c3e921 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Thu, 24 Jul 2014 16:59:05 +0200 -Subject: [PATCH] don't use extension version if not registered in reference, - fix snmp issue - -Signed-off-by: Laurent Laville ---- - src/Bartlett/CompatInfo/Reference/AbstractReference.php | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/Bartlett/CompatInfo/Reference/AbstractReference.php b/src/Bartlett/CompatInfo/Reference/AbstractReference.php -index 3bef201..2926813 100644 ---- a/src/Bartlett/CompatInfo/Reference/AbstractReference.php -+++ b/src/Bartlett/CompatInfo/Reference/AbstractReference.php -@@ -186,9 +186,10 @@ public function getCurrentVersion() - { - $version = phpversion($this->name); - $pattern = '/^[0-9]+\.[0-9]+/'; -- if (!preg_match($pattern, $version)) { -+ if (empty($this->version) || !preg_match($pattern, $version)) { - /** - * When version is not provided by the extension, or not standard format -+ * or we don't have it in our reference (ex snmp) because have no sense - * be sure at least to return latest PHP version supported. - */ - $version = $this->getLatestPhpVersion(); --- -1.9.3 - diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index cda11a3..1e6e080 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -6,13 +6,13 @@ # # Please, preserve the changelog entries # -%global gh_commit 23d66048d3aac6093e215143274eb95e8556da70 +%global gh_commit fca41fa03aec12bacf1c281a4fa6b832960f2fb4 #global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner llaville %global gh_project php-compat-info Name: php-bartlett-PHP-CompatInfo -Version: 3.2.0 +Version: 3.3.0 Release: 1%{?dist} Summary: Find out version and the extensions required for a piece of code to run @@ -23,12 +23,12 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit # Autoloader for RPM - die composer ! Patch0: %{name}-rpm.patch -Patch1: %{name}-upstream.patch BuildArch: noarch BuildRequires: php(language) >= 5.3.0 # to run test suite BuildRequires: %{_bindir}/phpunit +# 2.2 is enough for test (2.3 required for cache) BuildRequires: php-composer(bartlett/php-reflect) >= 2.2 # From composer.json, "require" @@ -38,16 +38,19 @@ BuildRequires: php-composer(bartlett/php-reflect) >= 2.2 # "ext-spl": "*", # "ext-json": "*", # "symfony/console": "~2.5", -# "bartlett/php-reflect": "~2.2" +# "bartlett/php-reflect": "~2.3", +# "seld/jsonlint": "~1.1" Requires: php(language) >= 5.3.0 Requires: php-json Requires: php-libxml Requires: php-pcre Requires: php-spl -Requires: php-composer(bartlett/php-reflect) >= 2.2 +Requires: php-composer(bartlett/php-reflect) >= 2.3 Requires: php-composer(bartlett/php-reflect) < 3 Requires: php-composer(symfony/console) >= 2.5 Requires: php-composer(symfony/console) < 3 +Requires: php-composer(seld/jsonlint) >= 1.1 +Requires: php-composer(seld/jsonlint) < 2 # From composer.json, "suggest" # "doctrine/cache": "Allow caching results, since bartlett/php-reflect 2.2" Requires: php-composer(doctrine/cache) @@ -57,8 +60,6 @@ Requires: php-composer(nikic/php-parser) Requires: php-composer(symfony/class-loader) Requires: php-composer(symfony/event-dispatcher) Requires: php-composer(symfony/finder) -# From phpcompatinfo report for version 3.2.0 -Requires: php-curl Provides: phpcompatinfo = %{version} Provides: php-composer(bartlett/php-compatinfo) = %{version} @@ -77,7 +78,6 @@ Documentation: http://php5.laurent-laville.org/compatinfo/manual/3.2/en/ %setup -q -n %{gh_project}-%{gh_commit} %patch0 -p1 -b .rpm -%patch1 -p1 -b .git sed -e 's/@package_version@/%{version}/' \ -i $(find src -name \*.php) @@ -97,6 +97,9 @@ install -D -p -m 644 bin/phpcompatinfo.1 %{buildroot}%{_mandir}/man1/php %check +# Not ready (local build with php 5.6 and xcache 4.0-dev) +rm tests/Reference/Extension/XcacheExtensionTest.php + %{_bindir}/phpunit \ -d date.timezone=UTC \ -d memory_limit=-1 \ @@ -124,6 +127,12 @@ fi %changelog +* Fri Aug 24 2014 Remi Collet - 3.3.0-1 +- Update to 3.2.0 +- add dependency on seld/jsonlint +- raise dependency on bartlett/php-reflect 2.3 +- enable the cache plugin in default configuration + * Fri Jul 25 2014 Remi Collet - 3.2.0-1 - Update to 3.2.0 - add manpage diff --git a/sources b/sources index c7858ac..cd63915 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0a0b4588a28c40e671e73b9078b5b18e php-compat-info-3.2.0.tar.gz +c67e44a59200795910b440f35cb71294 php-compat-info-3.3.0.tar.gz From d564a919c7bc93e3b2bdf1fc8ea7ca5b22576d7a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 22 Aug 2014 09:39:49 +0200 Subject: [PATCH 008/111] typo --- php-bartlett-PHP-CompatInfo.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 1e6e080..64a063d 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -127,7 +127,7 @@ fi %changelog -* Fri Aug 24 2014 Remi Collet - 3.3.0-1 +* Fri Aug 22 2014 Remi Collet - 3.3.0-1 - Update to 3.2.0 - add dependency on seld/jsonlint - raise dependency on bartlett/php-reflect 2.3 From 7962ff1c3521324494be2b4bbdd73c95eb268768 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 25 Sep 2014 08:43:07 +0200 Subject: [PATCH 009/111] update to 3.4.0 --- .gitignore | 1 + php-bartlett-PHP-CompatInfo.spec | 16 +++++++++------- sources | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 856a22e..6ad73f2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ clog /php-compat-info-3.2.0.tar.gz /php-compat-info-3.3.0.tar.gz +/php-compat-info-3.4.0.tar.gz diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 64a063d..9e8a1a3 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -6,13 +6,13 @@ # # Please, preserve the changelog entries # -%global gh_commit fca41fa03aec12bacf1c281a4fa6b832960f2fb4 +%global gh_commit 4f9def9b616c3af1bb577c188b66f3039e8dd333 #global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner llaville %global gh_project php-compat-info Name: php-bartlett-PHP-CompatInfo -Version: 3.3.0 +Version: 3.4.0 Release: 1%{?dist} Summary: Find out version and the extensions required for a piece of code to run @@ -28,8 +28,7 @@ BuildArch: noarch BuildRequires: php(language) >= 5.3.0 # to run test suite BuildRequires: %{_bindir}/phpunit -# 2.2 is enough for test (2.3 required for cache) -BuildRequires: php-composer(bartlett/php-reflect) >= 2.2 +BuildRequires: php-composer(bartlett/php-reflect) >= 2.4 # From composer.json, "require" # "php": ">=5.3.0", @@ -38,14 +37,14 @@ BuildRequires: php-composer(bartlett/php-reflect) >= 2.2 # "ext-spl": "*", # "ext-json": "*", # "symfony/console": "~2.5", -# "bartlett/php-reflect": "~2.3", +# "bartlett/php-reflect": "~2.4", # "seld/jsonlint": "~1.1" Requires: php(language) >= 5.3.0 Requires: php-json Requires: php-libxml Requires: php-pcre Requires: php-spl -Requires: php-composer(bartlett/php-reflect) >= 2.3 +Requires: php-composer(bartlett/php-reflect) >= 2.4 Requires: php-composer(bartlett/php-reflect) < 3 Requires: php-composer(symfony/console) >= 2.5 Requires: php-composer(symfony/console) < 3 @@ -71,7 +70,7 @@ version and extensions required for it to run. CLI version has many reports (extension, interface, class, function, constant) to display and ability to show content of dictionary references. -Documentation: http://php5.laurent-laville.org/compatinfo/manual/3.2/en/ +Documentation: http://php5.laurent-laville.org/compatinfo/manual/current/en/ %prep @@ -127,6 +126,9 @@ fi %changelog +* Thu Sep 25 2014 Remi Collet - 3.4.0-1 +- Update to 3.4.0 + * Fri Aug 22 2014 Remi Collet - 3.3.0-1 - Update to 3.2.0 - add dependency on seld/jsonlint diff --git a/sources b/sources index cd63915..13634b1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c67e44a59200795910b440f35cb71294 php-compat-info-3.3.0.tar.gz +6879a7bb587e2c1ba3e02cd37c52ea98 php-compat-info-3.4.0.tar.gz From b659ce2d3ea2d31858146cac8ba2c6d1defe8160 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 6 Oct 2014 13:52:19 +0200 Subject: [PATCH 010/111] fix FTBFS with PHP 5.6.1 (Thanks to Koschei) --- php-bartlett-PHP-CompatInfo-upstream.patch | 23 ++++++++++++++++++++++ php-bartlett-PHP-CompatInfo.spec | 9 ++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 php-bartlett-PHP-CompatInfo-upstream.patch diff --git a/php-bartlett-PHP-CompatInfo-upstream.patch b/php-bartlett-PHP-CompatInfo-upstream.patch new file mode 100644 index 0000000..742de0b --- /dev/null +++ b/php-bartlett-PHP-CompatInfo-upstream.patch @@ -0,0 +1,23 @@ +From 4855f83fb4cd8a5ffa5aa07a27ee7c355906ad9a Mon Sep 17 00:00:00 2001 +From: Laurent Laville +Date: Fri, 3 Oct 2014 14:01:34 +0200 +Subject: [PATCH] fixed optional parameters in Sysvsem ref about sem_acquire + function and nowait argument + +--- + src/Bartlett/CompatInfo/Reference/Extension/SysvsemExtension.php | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Bartlett/CompatInfo/Reference/Extension/SysvsemExtension.php b/src/Bartlett/CompatInfo/Reference/Extension/SysvsemExtension.php +index 32c199f..7e72faa 100644 +--- a/src/Bartlett/CompatInfo/Reference/Extension/SysvsemExtension.php ++++ b/src/Bartlett/CompatInfo/Reference/Extension/SysvsemExtension.php +@@ -43,7 +43,7 @@ protected function getR40000() + 'php.max' => '', + ); + $release->functions = array( +- 'sem_acquire' => array('4.0.0', '5.6.1RC1'), ++ 'sem_acquire' => array('4.0.0', '', '4.0.0, 5.6.1RC1'), + 'sem_get' => null, + 'sem_release' => null, + ); diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 9e8a1a3..c743fac 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -13,7 +13,7 @@ Name: php-bartlett-PHP-CompatInfo Version: 3.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Find out version and the extensions required for a piece of code to run Group: Development/Libraries @@ -24,6 +24,9 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit # Autoloader for RPM - die composer ! Patch0: %{name}-rpm.patch +# Upstream patches +Patch1: %{name}-upstream.patch + BuildArch: noarch BuildRequires: php(language) >= 5.3.0 # to run test suite @@ -77,6 +80,7 @@ Documentation: http://php5.laurent-laville.org/compatinfo/manual/current/en/ %setup -q -n %{gh_project}-%{gh_commit} %patch0 -p1 -b .rpm +%patch1 -p1 sed -e 's/@package_version@/%{version}/' \ -i $(find src -name \*.php) @@ -126,6 +130,9 @@ fi %changelog +* Mon Oct 6 2014 Remi Collet - 3.4.0-2 +- fix FTBFS with PHP 5.6.1 (Thanks to Koschei) + * Thu Sep 25 2014 Remi Collet - 3.4.0-1 - Update to 3.4.0 From 4d021c27bba7078d17160b46fca6310ecfb6da09 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 17 Oct 2014 13:15:53 +0200 Subject: [PATCH 011/111] update to 3.5.0 --- .gitignore | 1 + php-bartlett-PHP-CompatInfo-rpm.patch | 6 +++-- php-bartlett-PHP-CompatInfo-upstream.patch | 23 ------------------ php-bartlett-PHP-CompatInfo.spec | 27 +++++++++++++--------- sources | 2 +- 5 files changed, 22 insertions(+), 37 deletions(-) delete mode 100644 php-bartlett-PHP-CompatInfo-upstream.patch diff --git a/.gitignore b/.gitignore index 6ad73f2..52ccd25 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ clog /php-compat-info-3.2.0.tar.gz /php-compat-info-3.3.0.tar.gz /php-compat-info-3.4.0.tar.gz +/php-compat-info-3.5.0.tar.gz diff --git a/php-bartlett-PHP-CompatInfo-rpm.patch b/php-bartlett-PHP-CompatInfo-rpm.patch index f35d15c..3b9f3c7 100644 --- a/php-bartlett-PHP-CompatInfo-rpm.patch +++ b/php-bartlett-PHP-CompatInfo-rpm.patch @@ -30,7 +30,7 @@ diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo -Date: Fri, 3 Oct 2014 14:01:34 +0200 -Subject: [PATCH] fixed optional parameters in Sysvsem ref about sem_acquire - function and nowait argument - ---- - src/Bartlett/CompatInfo/Reference/Extension/SysvsemExtension.php | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Bartlett/CompatInfo/Reference/Extension/SysvsemExtension.php b/src/Bartlett/CompatInfo/Reference/Extension/SysvsemExtension.php -index 32c199f..7e72faa 100644 ---- a/src/Bartlett/CompatInfo/Reference/Extension/SysvsemExtension.php -+++ b/src/Bartlett/CompatInfo/Reference/Extension/SysvsemExtension.php -@@ -43,7 +43,7 @@ protected function getR40000() - 'php.max' => '', - ); - $release->functions = array( -- 'sem_acquire' => array('4.0.0', '5.6.1RC1'), -+ 'sem_acquire' => array('4.0.0', '', '4.0.0, 5.6.1RC1'), - 'sem_get' => null, - 'sem_release' => null, - ); diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index c743fac..8e0b983 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -6,14 +6,14 @@ # # Please, preserve the changelog entries # -%global gh_commit 4f9def9b616c3af1bb577c188b66f3039e8dd333 +%global gh_commit f537b51e9ca93213a458a1f2ac8d3cc9a4cb0054 #global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner llaville %global gh_project php-compat-info Name: php-bartlett-PHP-CompatInfo -Version: 3.4.0 -Release: 2%{?dist} +Version: 3.5.0 +Release: 1%{?dist} Summary: Find out version and the extensions required for a piece of code to run Group: Development/Libraries @@ -24,14 +24,11 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit # Autoloader for RPM - die composer ! Patch0: %{name}-rpm.patch -# Upstream patches -Patch1: %{name}-upstream.patch - BuildArch: noarch BuildRequires: php(language) >= 5.3.0 # to run test suite BuildRequires: %{_bindir}/phpunit -BuildRequires: php-composer(bartlett/php-reflect) >= 2.4 +BuildRequires: php-composer(bartlett/php-reflect) >= 2.5 # From composer.json, "require" # "php": ">=5.3.0", @@ -40,19 +37,23 @@ BuildRequires: php-composer(bartlett/php-reflect) >= 2.4 # "ext-spl": "*", # "ext-json": "*", # "symfony/console": "~2.5", -# "bartlett/php-reflect": "~2.4", -# "seld/jsonlint": "~1.1" +# "bartlett/php-reflect": "~2.5", +# From phpreflect (implicit dep.) +# "sebastian/version": "~1.0", +# "seld/jsonlint": "~1.1" Requires: php(language) >= 5.3.0 Requires: php-json Requires: php-libxml Requires: php-pcre Requires: php-spl -Requires: php-composer(bartlett/php-reflect) >= 2.4 +Requires: php-composer(bartlett/php-reflect) >= 2.5 Requires: php-composer(bartlett/php-reflect) < 3 Requires: php-composer(symfony/console) >= 2.5 Requires: php-composer(symfony/console) < 3 Requires: php-composer(seld/jsonlint) >= 1.1 Requires: php-composer(seld/jsonlint) < 2 +Requires: php-composer(sebastian/version) >= 1.0 +Requires: php-composer(sebastian/version) < 2 # From composer.json, "suggest" # "doctrine/cache": "Allow caching results, since bartlett/php-reflect 2.2" Requires: php-composer(doctrine/cache) @@ -80,7 +81,6 @@ Documentation: http://php5.laurent-laville.org/compatinfo/manual/current/en/ %setup -q -n %{gh_project}-%{gh_commit} %patch0 -p1 -b .rpm -%patch1 -p1 sed -e 's/@package_version@/%{version}/' \ -i $(find src -name \*.php) @@ -130,6 +130,11 @@ fi %changelog +* Thu Oct 16 2014 Remi Collet - 3.5.0-1 +- Update to 3.5.0 +- add dependency on sebastian/version +- raise dependency on bartlett/php-reflect 2.5 + * Mon Oct 6 2014 Remi Collet - 3.4.0-2 - fix FTBFS with PHP 5.6.1 (Thanks to Koschei) diff --git a/sources b/sources index 13634b1..ca9d30b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6879a7bb587e2c1ba3e02cd37c52ea98 php-compat-info-3.4.0.tar.gz +aebcb30ee46754911998e4900731f67c php-compat-info-3.5.0.tar.gz From 56bd9b961cc97c27b8006294e6e8eb821fdf66c7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 17 Oct 2014 13:57:03 +0200 Subject: [PATCH 012/111] increase test timeout for koji --- php-bartlett-PHP-CompatInfo.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 8e0b983..8690e47 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -103,6 +103,10 @@ install -D -p -m 644 bin/phpcompatinfo.1 %{buildroot}%{_mandir}/man1/php # Not ready (local build with php 5.6 and xcache 4.0-dev) rm tests/Reference/Extension/XcacheExtensionTest.php +# fix timeout for koji +sed -s 's/colors/timeoutForSmallTests="10" colors/' \ + phpunit.xml.dist >phpunit.xml + %{_bindir}/phpunit \ -d date.timezone=UTC \ -d memory_limit=-1 \ From 3d5a0f4fb2c5190b0cb157bc4a1b204e32bef4c0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 14 Nov 2014 12:42:04 +0100 Subject: [PATCH 013/111] update to 3.6.0 --- .gitignore | 1 + php-bartlett-PHP-CompatInfo-rpm.patch | 14 ++++++----- php-bartlett-PHP-CompatInfo.spec | 34 +++++++++++---------------- sources | 2 +- 4 files changed, 24 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index 52ccd25..7947bca 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ clog /php-compat-info-3.3.0.tar.gz /php-compat-info-3.4.0.tar.gz /php-compat-info-3.5.0.tar.gz +/php-compat-info-3.6.0.tar.gz diff --git a/php-bartlett-PHP-CompatInfo-rpm.patch b/php-bartlett-PHP-CompatInfo-rpm.patch index 3b9f3c7..87bbfe0 100644 --- a/php-bartlett-PHP-CompatInfo-rpm.patch +++ b/php-bartlett-PHP-CompatInfo-rpm.patch @@ -22,19 +22,20 @@ diff -up ./bin/phpcompatinfo.json.dist.rpm ./bin/phpcompatinfo.json.dist ], "analysers" : [ diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo ---- ./bin/phpcompatinfo.rpm 2014-08-21 21:09:22.000000000 +0200 -+++ ./bin/phpcompatinfo 2014-08-22 08:28:20.750827392 +0200 +--- ./bin/phpcompatinfo.rpm 2014-11-13 15:57:07.000000000 +0100 ++++ ./bin/phpcompatinfo 2014-11-13 17:57:48.174914678 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env php +#!/usr/bin/php setUseIncludePath(true); +$vendorDir = '/usr/share/php'; +require_once $vendorDir . '/PhpParser/Autoloader.php'; +PhpParser\Autoloader::register(); @@ -53,10 +54,11 @@ diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo + 'Symfony\\Component\\Console' => $vendorDir, + 'Symfony\\Component\\ClassLoader' => $vendorDir, + 'Seld\\JsonLint' => $vendorDir, ++ 'JsonSchema' => $vendorDir, + 'Bartlett' => $vendorDir, +)); +$loader->register(); - + if (PHP_SAPI !== 'cli') { return; diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 8690e47..45d0245 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -6,13 +6,13 @@ # # Please, preserve the changelog entries # -%global gh_commit f537b51e9ca93213a458a1f2ac8d3cc9a4cb0054 +%global gh_commit b29ff9ce621c07b1d511a0a37b1a34a3be7ed95e #global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner llaville %global gh_project php-compat-info Name: php-bartlett-PHP-CompatInfo -Version: 3.5.0 +Version: 3.6.0 Release: 1%{?dist} Summary: Find out version and the extensions required for a piece of code to run @@ -28,7 +28,7 @@ BuildArch: noarch BuildRequires: php(language) >= 5.3.0 # to run test suite BuildRequires: %{_bindir}/phpunit -BuildRequires: php-composer(bartlett/php-reflect) >= 2.5 +BuildRequires: php-composer(bartlett/php-reflect) >= 2.6 # From composer.json, "require" # "php": ">=5.3.0", @@ -38,22 +38,15 @@ BuildRequires: php-composer(bartlett/php-reflect) >= 2.5 # "ext-json": "*", # "symfony/console": "~2.5", # "bartlett/php-reflect": "~2.5", -# From phpreflect (implicit dep.) -# "sebastian/version": "~1.0", -# "seld/jsonlint": "~1.1" Requires: php(language) >= 5.3.0 Requires: php-json Requires: php-libxml Requires: php-pcre Requires: php-spl -Requires: php-composer(bartlett/php-reflect) >= 2.5 +Requires: php-composer(bartlett/php-reflect) >= 2.6 Requires: php-composer(bartlett/php-reflect) < 3 Requires: php-composer(symfony/console) >= 2.5 Requires: php-composer(symfony/console) < 3 -Requires: php-composer(seld/jsonlint) >= 1.1 -Requires: php-composer(seld/jsonlint) < 2 -Requires: php-composer(sebastian/version) >= 1.0 -Requires: php-composer(sebastian/version) < 2 # From composer.json, "suggest" # "doctrine/cache": "Allow caching results, since bartlett/php-reflect 2.2" Requires: php-composer(doctrine/cache) @@ -63,6 +56,9 @@ Requires: php-composer(nikic/php-parser) Requires: php-composer(symfony/class-loader) Requires: php-composer(symfony/event-dispatcher) Requires: php-composer(symfony/finder) +Requires: php-composer(seld/jsonlint) +Requires: php-composer(sebastian/version) +Requires: php-composer(justinrainbow/json-schema) Provides: phpcompatinfo = %{version} Provides: php-composer(bartlett/php-compatinfo) = %{version} @@ -78,7 +74,8 @@ Documentation: http://php5.laurent-laville.org/compatinfo/manual/current/en/ %prep -%setup -q -n %{gh_project}-%{gh_commit} +#setup -q -n %{gh_project}-%{gh_commit} +%setup -q -n %{gh_project}-%{version} %patch0 -p1 -b .rpm @@ -100,15 +97,7 @@ install -D -p -m 644 bin/phpcompatinfo.1 %{buildroot}%{_mandir}/man1/php %check -# Not ready (local build with php 5.6 and xcache 4.0-dev) -rm tests/Reference/Extension/XcacheExtensionTest.php - -# fix timeout for koji -sed -s 's/colors/timeoutForSmallTests="10" colors/' \ - phpunit.xml.dist >phpunit.xml - %{_bindir}/phpunit \ - -d date.timezone=UTC \ -d memory_limit=-1 \ %if 0%{?rhel} < 6 && 0%{?fedora} < 8 || exit 0 @@ -134,6 +123,11 @@ fi %changelog +* Thu Nov 13 2014 Remi Collet - 3.6.0-1 +- Update to 3.6.0 +- add dependency on justinrainbow/json-schema +- raise dependency on bartlett/php-reflect 2.6 + * Thu Oct 16 2014 Remi Collet - 3.5.0-1 - Update to 3.5.0 - add dependency on sebastian/version diff --git a/sources b/sources index ca9d30b..d830a00 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aebcb30ee46754911998e4900731f67c php-compat-info-3.5.0.tar.gz +396d23d4c9654714fe7f402314f8a65a php-compat-info-3.6.0.tar.gz From c8d060427d2ba2184b1c73f55eda7f04d72ff81d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 21 Nov 2014 13:35:58 +0100 Subject: [PATCH 014/111] update to 3.6.1 --- .gitignore | 1 + php-bartlett-PHP-CompatInfo.spec | 10 ++++++---- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 7947bca..fcf3189 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ clog /php-compat-info-3.4.0.tar.gz /php-compat-info-3.5.0.tar.gz /php-compat-info-3.6.0.tar.gz +/php-compat-info-3.6.1.tar.gz diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 45d0245..f798936 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -6,13 +6,13 @@ # # Please, preserve the changelog entries # -%global gh_commit b29ff9ce621c07b1d511a0a37b1a34a3be7ed95e +%global gh_commit d47fb5a0798c60dac81a3f9f1643fd73c73787d3 #global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner llaville %global gh_project php-compat-info Name: php-bartlett-PHP-CompatInfo -Version: 3.6.0 +Version: 3.6.1 Release: 1%{?dist} Summary: Find out version and the extensions required for a piece of code to run @@ -74,8 +74,7 @@ Documentation: http://php5.laurent-laville.org/compatinfo/manual/current/en/ %prep -#setup -q -n %{gh_project}-%{gh_commit} -%setup -q -n %{gh_project}-%{version} +%setup -q -n %{gh_project}-%{gh_commit} %patch0 -p1 -b .rpm @@ -123,6 +122,9 @@ fi %changelog +* Thu Nov 20 2014 Remi Collet - 3.6.1-1 +- Update to 3.6.1 + * Thu Nov 13 2014 Remi Collet - 3.6.0-1 - Update to 3.6.0 - add dependency on justinrainbow/json-schema diff --git a/sources b/sources index d830a00..60792a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -396d23d4c9654714fe7f402314f8a65a php-compat-info-3.6.0.tar.gz +58ebf3c5a07efe07f448df45d1e8648d php-compat-info-3.6.1.tar.gz From 7a5a4c088ce1e7360e701eb3a382842aad3cdeb6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 19 Dec 2014 14:10:22 +0100 Subject: [PATCH 015/111] update to 3.7.1 --- .gitignore | 1 + php-bartlett-PHP-CompatInfo.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fcf3189..7c90cc8 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ clog /php-compat-info-3.5.0.tar.gz /php-compat-info-3.6.0.tar.gz /php-compat-info-3.6.1.tar.gz +/php-compat-info-3.7.1.tar.gz diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index f798936..7a31d3f 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -6,13 +6,13 @@ # # Please, preserve the changelog entries # -%global gh_commit d47fb5a0798c60dac81a3f9f1643fd73c73787d3 +%global gh_commit 86f65a4c99aa3f84a0be3354acd4174df57cceb1 #global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner llaville %global gh_project php-compat-info Name: php-bartlett-PHP-CompatInfo -Version: 3.6.1 +Version: 3.7.1 Release: 1%{?dist} Summary: Find out version and the extensions required for a piece of code to run @@ -122,6 +122,9 @@ fi %changelog +* Fri Dec 19 2014 Remi Collet - 3.7.1-1 +- Update to 3.7.1 + * Thu Nov 20 2014 Remi Collet - 3.6.1-1 - Update to 3.6.1 diff --git a/sources b/sources index 60792a9..cc67c1f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -58ebf3c5a07efe07f448df45d1e8648d php-compat-info-3.6.1.tar.gz +2e07ed5acb50cd42b555c9f5787374d9 php-compat-info-3.7.1.tar.gz From ab34e2b9f1c4d7da63defd4ae5ec52facbd04a62 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 5 Jan 2015 17:55:37 +0100 Subject: [PATCH 016/111] update to 3.7.2 --- .gitignore | 1 + php-bartlett-PHP-CompatInfo.spec | 16 ++++++++++------ sources | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 7c90cc8..bed55cb 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ clog /php-compat-info-3.6.0.tar.gz /php-compat-info-3.6.1.tar.gz /php-compat-info-3.7.1.tar.gz +/php-compat-info-3.7.2.tar.gz diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 7a31d3f..6487934 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -1,18 +1,18 @@ # spec file for php-bartlett-PHP-CompatInfo # -# Copyright (c) 2011-2014 Remi Collet +# Copyright (c) 2011-2015 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/3.0/ # # Please, preserve the changelog entries # -%global gh_commit 86f65a4c99aa3f84a0be3354acd4174df57cceb1 +%global gh_commit bbf5bf1cbc1c7ea481f315a084e5d341c24e283a #global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner llaville %global gh_project php-compat-info Name: php-bartlett-PHP-CompatInfo -Version: 3.7.1 +Version: 3.7.2 Release: 1%{?dist} Summary: Find out version and the extensions required for a piece of code to run @@ -28,7 +28,7 @@ BuildArch: noarch BuildRequires: php(language) >= 5.3.0 # to run test suite BuildRequires: %{_bindir}/phpunit -BuildRequires: php-composer(bartlett/php-reflect) >= 2.6 +BuildRequires: php-composer(bartlett/php-reflect) >= 2.6.2 # From composer.json, "require" # "php": ">=5.3.0", @@ -37,13 +37,13 @@ BuildRequires: php-composer(bartlett/php-reflect) >= 2.6 # "ext-spl": "*", # "ext-json": "*", # "symfony/console": "~2.5", -# "bartlett/php-reflect": "~2.5", +# "bartlett/php-reflect": "~2.6", Requires: php(language) >= 5.3.0 Requires: php-json Requires: php-libxml Requires: php-pcre Requires: php-spl -Requires: php-composer(bartlett/php-reflect) >= 2.6 +Requires: php-composer(bartlett/php-reflect) >= 2.6.2 Requires: php-composer(bartlett/php-reflect) < 3 Requires: php-composer(symfony/console) >= 2.5 Requires: php-composer(symfony/console) < 3 @@ -122,6 +122,10 @@ fi %changelog +* Mon Jan 5 2015 Remi Collet - 3.7.2-1 +- Update to 3.7.2 +- open https://github.com/llaville/php-compat-info/pull/157 + * Fri Dec 19 2014 Remi Collet - 3.7.1-1 - Update to 3.7.1 diff --git a/sources b/sources index cc67c1f..9ba050f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2e07ed5acb50cd42b555c9f5787374d9 php-compat-info-3.7.1.tar.gz +c9fb9c9c8bb20e63664b9bd514f6e1ba php-compat-info-3.7.2.tar.gz From 49905f33186e320f0f808e0d73645735335549c8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 2 Feb 2015 16:56:50 +0100 Subject: [PATCH 017/111] update to 3.7.3 --- .gitignore | 1 + php-bartlett-PHP-CompatInfo.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index bed55cb..00940a2 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ clog /php-compat-info-3.6.1.tar.gz /php-compat-info-3.7.1.tar.gz /php-compat-info-3.7.2.tar.gz +/php-compat-info-3.7.3.tar.gz diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 6487934..1216d39 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -6,13 +6,13 @@ # # Please, preserve the changelog entries # -%global gh_commit bbf5bf1cbc1c7ea481f315a084e5d341c24e283a +%global gh_commit e84e2b60281f1f97b886208d6d06efa4d7701236 #global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner llaville %global gh_project php-compat-info Name: php-bartlett-PHP-CompatInfo -Version: 3.7.2 +Version: 3.7.3 Release: 1%{?dist} Summary: Find out version and the extensions required for a piece of code to run @@ -37,7 +37,7 @@ BuildRequires: php-composer(bartlett/php-reflect) >= 2.6.2 # "ext-spl": "*", # "ext-json": "*", # "symfony/console": "~2.5", -# "bartlett/php-reflect": "~2.6", +# "bartlett/php-reflect": "^2.6.2", Requires: php(language) >= 5.3.0 Requires: php-json Requires: php-libxml @@ -122,6 +122,9 @@ fi %changelog +* Mon Feb 2 2015 Remi Collet - 3.7.3-1 +- Update to 3.7.3 + * Mon Jan 5 2015 Remi Collet - 3.7.2-1 - Update to 3.7.2 - open https://github.com/llaville/php-compat-info/pull/157 diff --git a/sources b/sources index 9ba050f..ae9320c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c9fb9c9c8bb20e63664b9bd514f6e1ba php-compat-info-3.7.2.tar.gz +dfd5b14306cb43816daefc75423c6ff3 php-compat-info-3.7.3.tar.gz From c1b0beae351ce25c5b967fcd7837b9ea50dac100 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 22 May 2015 19:21:02 +0200 Subject: [PATCH 018/111] - update to 4.2.0 - raise dependency on bartlett/php-reflect 3.1 - add dependency on bartlett/umlwriter - add fedora-review-check script - handle --without tests option to skip test suite during build --- .gitignore | 1 + fedora-review-check | 8 ++ php-bartlett-PHP-CompatInfo-4.2.0-rpm.patch | 140 ++++++++++++++++++++ php-bartlett-PHP-CompatInfo-rpm.patch | 99 -------------- php-bartlett-PHP-CompatInfo.spec | 88 +++++++++--- sources | 2 +- 6 files changed, 218 insertions(+), 120 deletions(-) create mode 100755 fedora-review-check create mode 100644 php-bartlett-PHP-CompatInfo-4.2.0-rpm.patch delete mode 100644 php-bartlett-PHP-CompatInfo-rpm.patch diff --git a/.gitignore b/.gitignore index 00940a2..8b85b01 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ clog /php-compat-info-3.7.1.tar.gz /php-compat-info-3.7.2.tar.gz /php-compat-info-3.7.3.tar.gz +/php-compat-info-4.2.0-4026f69.tar.gz diff --git a/fedora-review-check b/fedora-review-check new file mode 100755 index 0000000..cc72fc4 --- /dev/null +++ b/fedora-review-check @@ -0,0 +1,8 @@ +#!/bin/sh + +if [ $# -eq 2 ] +then exec /usr/bin/phpcompatinfo analyser:run $2 --output $1 --no-ansi + +else echo "usage $0 logname dirname" + exit 1 +fi diff --git a/php-bartlett-PHP-CompatInfo-4.2.0-rpm.patch b/php-bartlett-PHP-CompatInfo-4.2.0-rpm.patch new file mode 100644 index 0000000..2f04774 --- /dev/null +++ b/php-bartlett-PHP-CompatInfo-4.2.0-rpm.patch @@ -0,0 +1,140 @@ +diff -up ./bin/phpcompatinfo.json.dist.rpm ./bin/phpcompatinfo.json.dist +--- ./bin/phpcompatinfo.json.dist.rpm 2015-04-04 15:32:17.536201524 +0200 ++++ ./bin/phpcompatinfo.json.dist 2015-04-04 15:32:37.776282296 +0200 +@@ -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 2015-04-04 08:52:23.000000000 +0200 ++++ ./bin/phpcompatinfo 2015-04-04 15:33:59.668609143 +0200 +@@ -16,8 +16,30 @@ if (\Phar::running()) { + putenv("BARTLETTRC=" . strtolower($appName) . '.json'); + } + } +-$loader = require_once $vendorDir . '/autoload.php'; +-$loader->setUseIncludePath(true); ++ ++putenv('BARTLETT_COMPATINFO_DB=/usr/share/php-bartlett-PHP-CompatInfo/compatinfo.sqlite'); ++ ++$vendorDir = '/usr/share/php'; ++require_once $vendorDir . '/PhpParser/Autoloader.php'; ++PhpParser\Autoloader::register(); ++ ++require_once $vendorDir . '/SebastianBergmann/Version/Version.php'; ++ ++require_once $vendorDir . '/Symfony/Component/ClassLoader/UniversalClassLoader.php'; ++use Symfony\Component\ClassLoader\UniversalClassLoader; ++ ++$loader = new UniversalClassLoader(); ++$loader->registerNamespaces(array( ++ 'Symfony\\Component' => $vendorDir, ++ 'Doctrine\\Common' => $vendorDir, ++ 'phpDocumentor\\Reflection' => $vendorDir, ++ 'Seld\\JsonLint' => $vendorDir, ++ 'JsonSchema' => $vendorDir, ++ 'Psr\\Log' => $vendorDir, ++ 'Monolog' => $vendorDir, ++ 'Bartlett' => $vendorDir, ++)); ++$loader->register(); + + if (PHP_SAPI !== 'cli') { + return; +@@ -28,5 +50,5 @@ use Bartlett\CompatInfo\Console\Applicat + + Environment::setScanDir(); + +-$application = new Application($appName, '4.2'); ++$application = new Application($appName, '@package_version@'); + $application->run(); +diff -up ./data/handleDB.php.rpm ./data/handleDB.php +--- ./data/handleDB.php.rpm 2015-04-04 08:52:23.000000000 +0200 ++++ ./data/handleDB.php 2015-04-04 15:31:55.188112331 +0200 +@@ -11,7 +11,18 @@ + * @since Release 4.0.0alpha3 + */ + +-require_once dirname(__DIR__) . '/vendor/autoload.php'; ++$baseDir = dirname(__DIR__); ++$vendorDir = '/usr/share/php'; ++require_once $vendorDir . '/Symfony/Component/ClassLoader/UniversalClassLoader.php'; ++use Symfony\Component\ClassLoader\UniversalClassLoader; ++ ++$loader = new UniversalClassLoader(); ++$loader->registerNamespaces(array( ++ 'Symfony\\Component' => $vendorDir, ++ )); ++ ++$loader->register(); ++ + require_once __DIR__ . '/ReferenceCollection.php'; + + use Bartlett\CompatInfo\Reference\ExtensionFactory; +diff -up ./src/Bartlett/CompatInfo/Environment.php.rpm ./src/Bartlett/CompatInfo/Environment.php +--- ./src/Bartlett/CompatInfo/Environment.php.rpm 2015-04-04 08:52:23.000000000 +0200 ++++ ./src/Bartlett/CompatInfo/Environment.php 2015-04-04 15:31:55.188112331 +0200 +@@ -34,6 +34,10 @@ class Environment + */ + public static function initRefDb() + { ++ if ($database = getenv('BARTLETT_COMPATINFO_DB')) { ++ return new \PDO('sqlite:' . $database); ++ } ++ + $database = 'compatinfo.sqlite'; + $tempDir = sys_get_temp_dir() . '/bartlett'; + +diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php +--- ./tests/bootstrap.php.rpm 2015-04-04 08:52:23.000000000 +0200 ++++ ./tests/bootstrap.php 2015-04-04 15:31:55.188112331 +0200 +@@ -1,8 +1,31 @@ + registerNamespaces(array( ++ 'Doctrine\\Common' => $vendorDir, ++ 'phpDocumentor\\Reflection' => $vendorDir, ++ 'Symfony\\Component' => $vendorDir, ++ 'Seld\\JsonLint' => $vendorDir, ++ 'JsonSchema' => $vendorDir, ++ 'Bartlett\\Reflect' => $vendorDir, ++ 'Bartlett\\UmlWriter' => $vendorDir, ++ 'Bartlett\\Tests\\CompatInfo' => $baseDir . '/tests', ++ 'Bartlett' => $baseDir . '/src', ++ )); ++ ++$loader->register(); ++ ++# Class not catched by autoloader ++require $vendorDir . '/Bartlett/Reflect.php'; + require __DIR__ . '/Reference/GenericTest.php'; diff --git a/php-bartlett-PHP-CompatInfo-rpm.patch b/php-bartlett-PHP-CompatInfo-rpm.patch deleted file mode 100644 index 87bbfe0..0000000 --- a/php-bartlett-PHP-CompatInfo-rpm.patch +++ /dev/null @@ -1,99 +0,0 @@ -diff -up ./bin/phpcompatinfo.json.dist.rpm ./bin/phpcompatinfo.json.dist ---- ./bin/phpcompatinfo.json.dist.rpm 2014-08-22 08:17:40.045281815 +0200 -+++ ./bin/phpcompatinfo.json.dist 2014-08-22 08:17:46.784308376 +0200 -@@ -9,6 +9,19 @@ - { - "name": "Analyser", - "class": "Bartlett\\Reflect\\Plugin\\Analyser\\AnalyserPlugin" -+ }, -+ { -+ "name": "Cache", -+ "class": "Bartlett\\Reflect\\Plugin\\Cache\\CachePlugin", -+ "options": { -+ "adapter": "DoctrineCacheAdapter", -+ "backend": { -+ "class": "Doctrine\\Common\\Cache\\FilesystemCache", -+ "args": [ -+ "%{HOME}/.cache/phpreflect" -+ ] -+ } -+ } - } - ], - "analysers" : [ -diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo ---- ./bin/phpcompatinfo.rpm 2014-11-13 15:57:07.000000000 +0100 -+++ ./bin/phpcompatinfo 2014-11-13 17:57:48.174914678 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env php -+#!/usr/bin/php - setUseIncludePath(true); -+$vendorDir = '/usr/share/php'; -+require_once $vendorDir . '/PhpParser/Autoloader.php'; -+PhpParser\Autoloader::register(); -+ -+require_once $vendorDir . '/PHP/Timer.php'; -+require_once $vendorDir . '/SebastianBergmann/Version/Version.php'; -+ -+require_once $vendorDir . '/Symfony/Component/ClassLoader/UniversalClassLoader.php'; -+use Symfony\Component\ClassLoader\UniversalClassLoader; -+ -+$loader = new UniversalClassLoader(); -+$loader->registerNamespaces(array( -+ 'Doctrine\\Common\\Cache' => $vendorDir, -+ 'Symfony\\Component\\Finder' => $vendorDir, -+ 'Symfony\\Component\\EventDispatcher' => $vendorDir, -+ 'Symfony\\Component\\Console' => $vendorDir, -+ 'Symfony\\Component\\ClassLoader' => $vendorDir, -+ 'Seld\\JsonLint' => $vendorDir, -+ 'JsonSchema' => $vendorDir, -+ 'Bartlett' => $vendorDir, -+)); -+$loader->register(); - - if (PHP_SAPI !== 'cli') { - return; -diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php ---- ./tests/bootstrap.php.rpm 2014-08-21 21:09:22.000000000 +0200 -+++ ./tests/bootstrap.php 2014-08-22 08:30:12.203270207 +0200 -@@ -1,8 +1,30 @@ - registerNamespaces(array( -+ 'Symfony\\Component\\Finder' => $vendorDir, -+ 'Symfony\\Component\\EventDispatcher' => $vendorDir, -+ 'Symfony\\Component\\Console' => $vendorDir, -+ 'Symfony\\Component\\ClassLoader' => $vendorDir, -+ 'Bartlett\\Reflect' => $vendorDir, -+ 'Bartlett\\Tests\\CompatInfo' => $baseDir . '/tests', -+ 'Bartlett' => $baseDir . '/src', -+ )); -+ -+$loader->register(); -+ -+# Class not catched by autoloader -+require $vendorDir . '/Bartlett/Reflect.php'; - require __DIR__ . '/Reference/GenericTest.php'; diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 1216d39..b6af49e 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -1,61 +1,91 @@ -# spec file for php-bartlett-PHP-CompatInfo +# remirepo/fedora spec file for php-bartlett-PHP-CompatInfo # # Copyright (c) 2011-2015 Remi Collet # License: CC-BY-SA -# http://creativecommons.org/licenses/by-sa/3.0/ +# http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global gh_commit e84e2b60281f1f97b886208d6d06efa4d7701236 -#global gh_short %(c=%{gh_commit}; echo ${c:0:7}) +%global gh_commit 4026f69cd3d5f03467a58386a4a00225e3dc2544 +%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner llaville %global gh_project php-compat-info +%global with_tests %{?_without_tests:0}%{!?_without_tests:1} Name: php-bartlett-PHP-CompatInfo -Version: 3.7.3 +Version: 4.2.0 Release: 1%{?dist} Summary: Find out version and the extensions required for a piece of code to run Group: Development/Libraries License: BSD URL: http://php5.laurent-laville.org/compatinfo/ -Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}%{?gh_short:-%{gh_short}}.tar.gz +Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}%{?prever}-%{gh_short}.tar.gz +# Script for fedora-review +Source1: fedora-review-check # Autoloader for RPM - die composer ! -Patch0: %{name}-rpm.patch +# and sqlite database path +Patch0: %{name}-4.2.0-rpm.patch BuildArch: noarch -BuildRequires: php(language) >= 5.3.0 +BuildRequires: php(language) >= 5.3.2 +BuildRequires: php-pdo_sqlite +BuildRequires: php-composer(bartlett/php-reflect) >= 3.1 +%if %{with_tests} # to run test suite BuildRequires: %{_bindir}/phpunit -BuildRequires: php-composer(bartlett/php-reflect) >= 2.6.2 +%endif # From composer.json, "require" -# "php": ">=5.3.0", +# "php": ">=5.3.2", # "ext-libxml": "*", # "ext-pcre": "*", # "ext-spl": "*", # "ext-json": "*", +# "ext-pdo_sqlite": "*", # "symfony/console": "~2.5", -# "bartlett/php-reflect": "^2.6.2", -Requires: php(language) >= 5.3.0 +# "bartlett/php-reflect": "~3.1", +Requires: php(language) >= 5.3.2 +Requires: php-cli Requires: php-json Requires: php-libxml Requires: php-pcre +Requires: php-pdo_sqlite Requires: php-spl -Requires: php-composer(bartlett/php-reflect) >= 2.6.2 -Requires: php-composer(bartlett/php-reflect) < 3 +Requires: php-composer(bartlett/php-reflect) >= 3.1 +Requires: php-composer(bartlett/php-reflect) < 4 Requires: php-composer(symfony/console) >= 2.5 Requires: php-composer(symfony/console) < 3 +# From composer.json, "require-dev": { +# "doctrine/cache": "~1.3", +# "psr/log": "~1.0", +# "monolog/monolog": "~1.10", +# "bartlett/monolog-callbackfilterhandler": "~1.0", +# "bartlett/monolog-growlhandler": "~1.0", +# "bartlett/phpunit-loggertestlistener": "~1.5", +# "bartlett/umlwriter": "~1.0" # From composer.json, "suggest" +# "doctrine/cache": "Allow caching results, since bartlett/php-reflect 2.2", +# "psr/log": "Allow logging events with the LogPlugin", +# "monolog/monolog": "Allow logging events with the LogPlugin", +# "bartlett/monolog-callbackfilterhandler": "Advanced filtering strategies for Monolog", +# "bartlett/monolog-growlhandler": "Sends notifications to Growl for Monolog", +# "bartlett/phpunit-loggertestlistener": "Allow logging unit tests to your favorite PSR-3 logger interface", +# "bartlett/umlwriter": "Allow writing UML class diagrams (Graphviz or PlantUML)" # "doctrine/cache": "Allow caching results, since bartlett/php-reflect 2.2" +# "bartlett/umlwriter": "Allow writing UML class diagrams (Graphviz or PlantUML)" Requires: php-composer(doctrine/cache) +Requires: php-composer(bartlett/umlwriter) # Required by autoloader -Requires: php-composer(phpunit/php-timer) Requires: php-composer(nikic/php-parser) +Requires: php-composer(doctrine/collections) Requires: php-composer(symfony/class-loader) Requires: php-composer(symfony/event-dispatcher) Requires: php-composer(symfony/finder) +Requires: php-composer(symfony/stopwatch) +Requires: php-composer(symfony/dependency-injection) +Requires: php-composer(phpdocumentor/reflection-docblock) Requires: php-composer(seld/jsonlint) Requires: php-composer(sebastian/version) Requires: php-composer(justinrainbow/json-schema) @@ -78,12 +108,17 @@ Documentation: http://php5.laurent-laville.org/compatinfo/manual/current/en/ %patch0 -p1 -b .rpm -sed -e 's/@package_version@/%{version}/' \ - -i $(find src -name \*.php) +# Cleanup patched files +find src -name \*rpm -delete -print + +# Set package version +sed -e 's/@package_version@/%{version}%{?prever}/' \ + -i $(find src -name \*.php) bin/phpcompatinfo %build -# Nothing +: Generate the references database +%{_bindir}/php -d date.timezone=Europe/Paris data/handleDB.php db:init %install @@ -93,14 +128,20 @@ cp -pr src/Bartlett %{buildroot}%{_datadir}/php/Bartlett install -D -p -m 755 bin/phpcompatinfo %{buildroot}%{_bindir}/phpcompatinfo install -D -p -m 644 bin/phpcompatinfo.json.dist %{buildroot}%{_sysconfdir}/phpcompatinfo.json install -D -p -m 644 bin/phpcompatinfo.1 %{buildroot}%{_mandir}/man1/phpcompatinfo.1 +install -D -p -m 644 data/compatinfo.sqlite %{buildroot}%{_datadir}/%{name}/compatinfo.sqlite + +install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/fedora-review-check +%if %{with_tests} %check %{_bindir}/phpunit \ + --include-path src \ -d memory_limit=-1 \ -%if 0%{?rhel} < 6 && 0%{?fedora} < 8 +%if 0%{?fedora} < 21 || exit 0 %endif +%endif %post @@ -117,11 +158,18 @@ fi %config(noreplace) %{_sysconfdir}/phpcompatinfo.json %{_bindir}/phpcompatinfo %{_datadir}/php/Bartlett/CompatInfo -%{_datadir}/php/Bartlett/CompatInfo.php %{_mandir}/man1/phpcompatinfo.1* +%{_datadir}/%{name} %changelog +* Tue May 19 2015 Remi Collet - 4.2.0-1 +- update to 4.2.0 +- raise dependency on bartlett/php-reflect 3.1 +- add dependency on bartlett/umlwriter +- add fedora-review-check script +- handle --without tests option to skip test suite during build + * Mon Feb 2 2015 Remi Collet - 3.7.3-1 - Update to 3.7.3 diff --git a/sources b/sources index ae9320c..1684989 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dfd5b14306cb43816daefc75423c6ff3 php-compat-info-3.7.3.tar.gz +64324284bb811c9d185f41b5e5109a32 php-compat-info-4.2.0-4026f69.tar.gz From b05884528337263e2366c2f9e79466cf1ef73dcc Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 16 Jun 2015 12:17:58 +0200 Subject: [PATCH 019/111] v 4.3.0 --- .gitignore | 1 + ...atch => php-bartlett-PHP-CompatInfo-4.3.0-rpm.patch | 2 +- php-bartlett-PHP-CompatInfo.spec | 10 +++++++--- sources | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) rename php-bartlett-PHP-CompatInfo-4.2.0-rpm.patch => php-bartlett-PHP-CompatInfo-4.3.0-rpm.patch (99%) diff --git a/.gitignore b/.gitignore index 8b85b01..0eb7ee7 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ clog /php-compat-info-3.7.2.tar.gz /php-compat-info-3.7.3.tar.gz /php-compat-info-4.2.0-4026f69.tar.gz +/php-compat-info-4.3.0-c4bfef8.tar.gz diff --git a/php-bartlett-PHP-CompatInfo-4.2.0-rpm.patch b/php-bartlett-PHP-CompatInfo-4.3.0-rpm.patch similarity index 99% rename from php-bartlett-PHP-CompatInfo-4.2.0-rpm.patch rename to php-bartlett-PHP-CompatInfo-4.3.0-rpm.patch index 2f04774..36e02b5 100644 --- a/php-bartlett-PHP-CompatInfo-4.2.0-rpm.patch +++ b/php-bartlett-PHP-CompatInfo-4.3.0-rpm.patch @@ -61,7 +61,7 @@ diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo Environment::setScanDir(); --$application = new Application($appName, '4.2'); +-$application = new Application($appName, '4.3'); +$application = new Application($appName, '@package_version@'); $application->run(); diff -up ./data/handleDB.php.rpm ./data/handleDB.php diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index b6af49e..d7739f3 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -6,14 +6,14 @@ # # Please, preserve the changelog entries # -%global gh_commit 4026f69cd3d5f03467a58386a4a00225e3dc2544 +%global gh_commit c4bfef85fe799d2079f98f7b3e46d021bc739069 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner llaville %global gh_project php-compat-info %global with_tests %{?_without_tests:0}%{!?_without_tests:1} Name: php-bartlett-PHP-CompatInfo -Version: 4.2.0 +Version: 4.3.0 Release: 1%{?dist} Summary: Find out version and the extensions required for a piece of code to run @@ -26,7 +26,7 @@ Source1: fedora-review-check # Autoloader for RPM - die composer ! # and sqlite database path -Patch0: %{name}-4.2.0-rpm.patch +Patch0: %{name}-4.3.0-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 5.3.2 @@ -138,6 +138,7 @@ install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name} %{_bindir}/phpunit \ --include-path src \ -d memory_limit=-1 \ + --verbose \ %if 0%{?fedora} < 21 || exit 0 %endif @@ -163,6 +164,9 @@ fi %changelog +* Tue Jun 16 2015 Remi Collet - 4.6.0-1 +- update to 4.3.0 + * Tue May 19 2015 Remi Collet - 4.2.0-1 - update to 4.2.0 - raise dependency on bartlett/php-reflect 3.1 diff --git a/sources b/sources index 1684989..e3c96e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -64324284bb811c9d185f41b5e5109a32 php-compat-info-4.2.0-4026f69.tar.gz +0ff66371f36d4a4a85f37d9cdbc23605 php-compat-info-4.3.0-c4bfef8.tar.gz From 6fb125450862650131525e805a251241dee65faa Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 22 Jun 2015 07:34:08 +0200 Subject: [PATCH 020/111] fix autoload --- php-bartlett-PHP-CompatInfo-4.3.0-rpm.patch | 4 ++-- php-bartlett-PHP-CompatInfo.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/php-bartlett-PHP-CompatInfo-4.3.0-rpm.patch b/php-bartlett-PHP-CompatInfo-4.3.0-rpm.patch index 36e02b5..c64a75e 100644 --- a/php-bartlett-PHP-CompatInfo-4.3.0-rpm.patch +++ b/php-bartlett-PHP-CompatInfo-4.3.0-rpm.patch @@ -37,7 +37,7 @@ diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo +require_once $vendorDir . '/PhpParser/Autoloader.php'; +PhpParser\Autoloader::register(); + -+require_once $vendorDir . '/SebastianBergmann/Version/Version.php'; ++require_once $vendorDir . '/SebastianBergmann/Version/autoload.php'; + +require_once $vendorDir . '/Symfony/Component/ClassLoader/UniversalClassLoader.php'; +use Symfony\Component\ClassLoader\UniversalClassLoader; @@ -115,7 +115,7 @@ diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php +require_once $vendorDir . '/PhpParser/Autoloader.php'; +PhpParser\Autoloader::register(); -+require_once $vendorDir . '/SebastianBergmann/Version/Version.php'; ++require_once $vendorDir . '/SebastianBergmann/Version/autoload.php'; + +require_once $vendorDir . '/Symfony/Component/ClassLoader/UniversalClassLoader.php'; +use Symfony\Component\ClassLoader\UniversalClassLoader; diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index d7739f3..1ca9b17 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -14,7 +14,7 @@ Name: php-bartlett-PHP-CompatInfo Version: 4.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Find out version and the extensions required for a piece of code to run Group: Development/Libraries @@ -164,7 +164,10 @@ fi %changelog -* Tue Jun 16 2015 Remi Collet - 4.6.0-1 +* Sun Jun 21 2015 Remi Collet - 4.3.0-2 +- fix autoloader + +* Tue Jun 16 2015 Remi Collet - 4.3.0-1 - update to 4.3.0 * Tue May 19 2015 Remi Collet - 4.2.0-1 From 53b7fc1877d2e96b871cd6f22213d6ae7cc3f467 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 26 Jun 2015 13:15:48 +0200 Subject: [PATCH 021/111] rewrite autoloader --- php-bartlett-PHP-CompatInfo-4.3.0-rpm.patch | 123 +++++++------------- php-bartlett-PHP-CompatInfo-autoload.php | 25 ++++ php-bartlett-PHP-CompatInfo.spec | 39 +++---- 3 files changed, 87 insertions(+), 100 deletions(-) create mode 100644 php-bartlett-PHP-CompatInfo-autoload.php diff --git a/php-bartlett-PHP-CompatInfo-4.3.0-rpm.patch b/php-bartlett-PHP-CompatInfo-4.3.0-rpm.patch index c64a75e..b1bbb9e 100644 --- a/php-bartlett-PHP-CompatInfo-4.3.0-rpm.patch +++ b/php-bartlett-PHP-CompatInfo-4.3.0-rpm.patch @@ -1,6 +1,6 @@ diff -up ./bin/phpcompatinfo.json.dist.rpm ./bin/phpcompatinfo.json.dist ---- ./bin/phpcompatinfo.json.dist.rpm 2015-04-04 15:32:17.536201524 +0200 -+++ ./bin/phpcompatinfo.json.dist 2015-04-04 15:32:37.776282296 +0200 +--- ./bin/phpcompatinfo.json.dist.rpm 2015-06-16 10:56:41.000000000 +0200 ++++ ./bin/phpcompatinfo.json.dist 2015-06-26 11:15:13.028747350 +0200 @@ -6,6 +6,19 @@ } ], @@ -22,89 +22,76 @@ diff -up ./bin/phpcompatinfo.json.dist.rpm ./bin/phpcompatinfo.json.dist "analysers" : [ ], diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo ---- ./bin/phpcompatinfo.rpm 2015-04-04 08:52:23.000000000 +0200 -+++ ./bin/phpcompatinfo 2015-04-04 15:33:59.668609143 +0200 -@@ -16,8 +16,30 @@ if (\Phar::running()) { - putenv("BARTLETTRC=" . strtolower($appName) . '.json'); - } +--- ./bin/phpcompatinfo.rpm 2015-06-16 10:56:41.000000000 +0200 ++++ ./bin/phpcompatinfo 2015-06-26 11:15:13.033747371 +0200 +@@ -1,23 +1,13 @@ + #!/usr/bin/env php + setUseIncludePath(true); -+ -+putenv('BARTLETT_COMPATINFO_DB=/usr/share/php-bartlett-PHP-CompatInfo/compatinfo.sqlite'); -+ -+$vendorDir = '/usr/share/php'; -+require_once $vendorDir . '/PhpParser/Autoloader.php'; -+PhpParser\Autoloader::register(); -+ -+require_once $vendorDir . '/SebastianBergmann/Version/autoload.php'; -+ -+require_once $vendorDir . '/Symfony/Component/ClassLoader/UniversalClassLoader.php'; -+use Symfony\Component\ClassLoader\UniversalClassLoader; -+ -+$loader = new UniversalClassLoader(); -+$loader->registerNamespaces(array( -+ 'Symfony\\Component' => $vendorDir, -+ 'Doctrine\\Common' => $vendorDir, -+ 'phpDocumentor\\Reflection' => $vendorDir, -+ 'Seld\\JsonLint' => $vendorDir, -+ 'JsonSchema' => $vendorDir, -+ 'Psr\\Log' => $vendorDir, -+ 'Monolog' => $vendorDir, -+ 'Bartlett' => $vendorDir, -+)); -+$loader->register(); if (PHP_SAPI !== 'cli') { return; -@@ -28,5 +50,5 @@ use Bartlett\CompatInfo\Console\Applicat +@@ -28,5 +18,5 @@ use Bartlett\CompatInfo\Console\Applicat Environment::setScanDir(); -$application = new Application($appName, '4.3'); -+$application = new Application($appName, '@package_version@'); ++$application = new Application($appName, '4.3.0'); $application->run(); diff -up ./data/handleDB.php.rpm ./data/handleDB.php ---- ./data/handleDB.php.rpm 2015-04-04 08:52:23.000000000 +0200 -+++ ./data/handleDB.php 2015-04-04 15:31:55.188112331 +0200 -@@ -11,7 +11,18 @@ +--- ./data/handleDB.php.rpm 2015-06-16 10:56:41.000000000 +0200 ++++ ./data/handleDB.php 2015-06-26 11:15:13.028747350 +0200 +@@ -11,7 +11,8 @@ * @since Release 4.0.0alpha3 */ -require_once dirname(__DIR__) . '/vendor/autoload.php'; -+$baseDir = dirname(__DIR__); -+$vendorDir = '/usr/share/php'; -+require_once $vendorDir . '/Symfony/Component/ClassLoader/UniversalClassLoader.php'; -+use Symfony\Component\ClassLoader\UniversalClassLoader; -+ -+$loader = new UniversalClassLoader(); -+$loader->registerNamespaces(array( -+ 'Symfony\\Component' => $vendorDir, -+ )); -+ -+$loader->register(); ++require_once __DIR__ . '/../src/Bartlett/CompatInfo/autoload.php'; + require_once __DIR__ . '/ReferenceCollection.php'; use Bartlett\CompatInfo\Reference\ExtensionFactory; diff -up ./src/Bartlett/CompatInfo/Environment.php.rpm ./src/Bartlett/CompatInfo/Environment.php ---- ./src/Bartlett/CompatInfo/Environment.php.rpm 2015-04-04 08:52:23.000000000 +0200 -+++ ./src/Bartlett/CompatInfo/Environment.php 2015-04-04 15:31:55.188112331 +0200 -@@ -34,6 +34,10 @@ class Environment +--- ./src/Bartlett/CompatInfo/Environment.php.rpm 2015-06-26 11:20:20.075019885 +0200 ++++ ./src/Bartlett/CompatInfo/Environment.php 2015-06-26 11:23:06.329708917 +0200 +@@ -34,6 +34,11 @@ class Environment */ public static function initRefDb() { -+ if ($database = getenv('BARTLETT_COMPATINFO_DB')) { ++ if (($database = getenv('BARTLETT_COMPATINFO_DB')) && file_exists($database)) { ++ return new \PDO('sqlite:' . $database); ++ } else if (file_exists($database = '/usr/share/php-bartlett-PHP-CompatInfo/compatinfo.sqlite')) { + return new \PDO('sqlite:' . $database); + } -+ $database = 'compatinfo.sqlite'; $tempDir = sys_get_temp_dir() . '/bartlett'; diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php ---- ./tests/bootstrap.php.rpm 2015-04-04 08:52:23.000000000 +0200 -+++ ./tests/bootstrap.php 2015-04-04 15:31:55.188112331 +0200 -@@ -1,8 +1,31 @@ +--- ./tests/bootstrap.php.rpm 2015-06-16 10:56:41.000000000 +0200 ++++ ./tests/bootstrap.php 2015-06-26 11:17:16.429258776 +0200 +@@ -1,8 +1,11 @@ addPrefix('Bartlett\\Tests\\CompatInfo', $baseDir . '/tests'); -+require_once $vendorDir . '/SebastianBergmann/Version/autoload.php'; -+ -+require_once $vendorDir . '/Symfony/Component/ClassLoader/UniversalClassLoader.php'; -+use Symfony\Component\ClassLoader\UniversalClassLoader; -+ -+$loader = new UniversalClassLoader(); -+$loader->registerNamespaces(array( -+ 'Doctrine\\Common' => $vendorDir, -+ 'phpDocumentor\\Reflection' => $vendorDir, -+ 'Symfony\\Component' => $vendorDir, -+ 'Seld\\JsonLint' => $vendorDir, -+ 'JsonSchema' => $vendorDir, -+ 'Bartlett\\Reflect' => $vendorDir, -+ 'Bartlett\\UmlWriter' => $vendorDir, -+ 'Bartlett\\Tests\\CompatInfo' => $baseDir . '/tests', -+ 'Bartlett' => $baseDir . '/src', -+ )); -+ -+$loader->register(); -+ ++putenv('BARTLETT_COMPATINFO_DB='.dirname(__DIR__).'/data/compatinfo.sqlite'); +# Class not catched by autoloader -+require $vendorDir . '/Bartlett/Reflect.php'; require __DIR__ . '/Reference/GenericTest.php'; diff --git a/php-bartlett-PHP-CompatInfo-autoload.php b/php-bartlett-PHP-CompatInfo-autoload.php new file mode 100644 index 0000000..d40d05c --- /dev/null +++ b/php-bartlett-PHP-CompatInfo-autoload.php @@ -0,0 +1,25 @@ +register(); +} +$fedoraClassLoader->addPrefixes(array( + 'Bartlett\\CompatInfo' => dirname(dirname(__DIR__)), +)); +if (is_file('/usr/share/php-bartlett-PHP-CompatInfo/compatinfo.sqlite')) { + putenv('BARTLETT_COMPATINFO_DB=/usr/share/php-bartlett-PHP-CompatInfo/compatinfo.sqlite'); +} + +// Dependencies +require_once $vendorDir . '/Bartlett/Reflect/autoload.php'; diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 1ca9b17..2aaa31e 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -14,27 +14,33 @@ Name: php-bartlett-PHP-CompatInfo Version: 4.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Find out version and the extensions required for a piece of code to run Group: Development/Libraries License: BSD URL: http://php5.laurent-laville.org/compatinfo/ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}%{?prever}-%{gh_short}.tar.gz + # Script for fedora-review Source1: fedora-review-check # Autoloader for RPM - die composer ! -# and sqlite database path +Source2: %{name}-autoload.php + +# Autoload and sqlite database path Patch0: %{name}-4.3.0-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 5.3.2 -BuildRequires: php-pdo_sqlite -BuildRequires: php-composer(bartlett/php-reflect) >= 3.1 %if %{with_tests} # to run test suite BuildRequires: %{_bindir}/phpunit +BuildRequires: php-pdo_sqlite +BuildRequires: php-composer(bartlett/php-reflect) >= 3.1 +# For our patch / autoloader +BuildRequires: php-composer(symfony/class-loader) +BuildRequires: php-bartlett-PHP-Reflect >= 3.1.1-3 %endif # From composer.json, "require" @@ -75,20 +81,9 @@ Requires: php-composer(symfony/console) < 3 # "bartlett/umlwriter": "Allow writing UML class diagrams (Graphviz or PlantUML)" # "doctrine/cache": "Allow caching results, since bartlett/php-reflect 2.2" # "bartlett/umlwriter": "Allow writing UML class diagrams (Graphviz or PlantUML)" -Requires: php-composer(doctrine/cache) -Requires: php-composer(bartlett/umlwriter) # Required by autoloader -Requires: php-composer(nikic/php-parser) -Requires: php-composer(doctrine/collections) Requires: php-composer(symfony/class-loader) -Requires: php-composer(symfony/event-dispatcher) -Requires: php-composer(symfony/finder) -Requires: php-composer(symfony/stopwatch) -Requires: php-composer(symfony/dependency-injection) -Requires: php-composer(phpdocumentor/reflection-docblock) -Requires: php-composer(seld/jsonlint) -Requires: php-composer(sebastian/version) -Requires: php-composer(justinrainbow/json-schema) +Requires: php-bartlett-PHP-Reflect >= 3.1.1-3 Provides: phpcompatinfo = %{version} Provides: php-composer(bartlett/php-compatinfo) = %{version} @@ -107,6 +102,7 @@ Documentation: http://php5.laurent-laville.org/compatinfo/manual/current/en/ %setup -q -n %{gh_project}-%{gh_commit} %patch0 -p1 -b .rpm +cp %{SOURCE2} src/Bartlett/CompatInfo/autoload.php # Cleanup patched files find src -name \*rpm -delete -print @@ -136,12 +132,8 @@ install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name} %if %{with_tests} %check %{_bindir}/phpunit \ - --include-path src \ - -d memory_limit=-1 \ - --verbose \ -%if 0%{?fedora} < 21 - || exit 0 -%endif + --include-path %{buildroot}%{_datadir}/php \ + -d memory_limit=1G %endif @@ -164,6 +156,9 @@ fi %changelog +* Fri Jun 26 2015 Remi Collet - 4.3.0-3 +- rewrite autoloader + * Sun Jun 21 2015 Remi Collet - 4.3.0-2 - fix autoloader From 893499c0648c3cdb09e5ee4cbdd09035101a36a7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 29 Jun 2015 18:29:22 +0200 Subject: [PATCH 022/111] upstream patch for ldap extension in 5.6.11RC1 (thanks Koschei) --- php-bartlett-PHP-CompatInfo-upstream.patch | 31 ++++++++++++++++++++++ php-bartlett-PHP-CompatInfo.spec | 8 +++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 php-bartlett-PHP-CompatInfo-upstream.patch diff --git a/php-bartlett-PHP-CompatInfo-upstream.patch b/php-bartlett-PHP-CompatInfo-upstream.patch new file mode 100644 index 0000000..24cea05 --- /dev/null +++ b/php-bartlett-PHP-CompatInfo-upstream.patch @@ -0,0 +1,31 @@ +From bc9c9abf4ff653105a441f22e9cc99eb816369b3 Mon Sep 17 00:00:00 2001 +From: Laurent Laville +Date: Mon, 29 Jun 2015 17:57:14 +0200 +Subject: [PATCH] add new constant LDAP_OPT_DIAGNOSTIC_MESSAGE introduced by + PHP 5.6.11RC1 and rebuilt DB + +--- + data/compatinfo.sqlite | Bin 897024 -> 897024 bytes + data/references/Ldap.constants.json | 9 +++++++++ + 2 files changed, 9 insertions(+) + +diff --git a/data/references/Ldap.constants.json b/data/references/Ldap.constants.json +index 82fd290..c44822d 100644 +--- a/data/references/Ldap.constants.json ++++ b/data/references/Ldap.constants.json +@@ -136,6 +136,15 @@ + }, + { + "ext_name_fk": 35, ++ "name": "LDAP_OPT_DIAGNOSTIC_MESSAGE", ++ "ext_min": "5.6.11RC1", ++ "ext_max": "", ++ "php_min": "5.6.11RC1", ++ "php_max": "", ++ "php_excludes": "" ++ }, ++ { ++ "ext_name_fk": 35, + "name": "LDAP_OPT_DEREF", + "ext_min": "4.0.0", + "ext_max": "", diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 2aaa31e..6cf45a7 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -14,7 +14,7 @@ Name: php-bartlett-PHP-CompatInfo Version: 4.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Find out version and the extensions required for a piece of code to run Group: Development/Libraries @@ -30,6 +30,8 @@ Source2: %{name}-autoload.php # Autoload and sqlite database path Patch0: %{name}-4.3.0-rpm.patch +# ldap reference +Patch1: %{name}-upstream.patch BuildArch: noarch BuildRequires: php(language) >= 5.3.2 @@ -102,6 +104,7 @@ Documentation: http://php5.laurent-laville.org/compatinfo/manual/current/en/ %setup -q -n %{gh_project}-%{gh_commit} %patch0 -p1 -b .rpm +%patch1 -p1 cp %{SOURCE2} src/Bartlett/CompatInfo/autoload.php # Cleanup patched files @@ -156,6 +159,9 @@ fi %changelog +* Mon Jun 29 2015 Remi Collet - 4.3.0-4 +- upstream patch for ldap extension in 5.6.11RC1 (thanks Koschei) + * Fri Jun 26 2015 Remi Collet - 4.3.0-3 - rewrite autoloader From 7a8435d5131824cf2a55eabd6880626d1c5b5973 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 14 Jul 2015 10:18:33 +0200 Subject: [PATCH 023/111] v4.4.0 --- .gitignore | 1 + ...hp-bartlett-PHP-CompatInfo-4.4.0-rpm.patch | 45 ++++++++++++------- php-bartlett-PHP-CompatInfo-autoload.php | 3 -- php-bartlett-PHP-CompatInfo-upstream.patch | 31 ------------- php-bartlett-PHP-CompatInfo.spec | 20 ++++++--- sources | 2 +- 6 files changed, 44 insertions(+), 58 deletions(-) rename php-bartlett-PHP-CompatInfo-4.3.0-rpm.patch => php-bartlett-PHP-CompatInfo-4.4.0-rpm.patch (72%) delete mode 100644 php-bartlett-PHP-CompatInfo-upstream.patch diff --git a/.gitignore b/.gitignore index 0eb7ee7..777af61 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ clog /php-compat-info-3.7.3.tar.gz /php-compat-info-4.2.0-4026f69.tar.gz /php-compat-info-4.3.0-c4bfef8.tar.gz +/php-compat-info-4.4.0-92ee634.tar.gz diff --git a/php-bartlett-PHP-CompatInfo-4.3.0-rpm.patch b/php-bartlett-PHP-CompatInfo-4.4.0-rpm.patch similarity index 72% rename from php-bartlett-PHP-CompatInfo-4.3.0-rpm.patch rename to php-bartlett-PHP-CompatInfo-4.4.0-rpm.patch index b1bbb9e..dd91593 100644 --- a/php-bartlett-PHP-CompatInfo-4.3.0-rpm.patch +++ b/php-bartlett-PHP-CompatInfo-4.4.0-rpm.patch @@ -1,6 +1,6 @@ diff -up ./bin/phpcompatinfo.json.dist.rpm ./bin/phpcompatinfo.json.dist ---- ./bin/phpcompatinfo.json.dist.rpm 2015-06-16 10:56:41.000000000 +0200 -+++ ./bin/phpcompatinfo.json.dist 2015-06-26 11:15:13.028747350 +0200 +--- ./bin/phpcompatinfo.json.dist.rpm 2015-07-11 10:04:30.000000000 +0200 ++++ ./bin/phpcompatinfo.json.dist 2015-07-13 09:06:15.108698079 +0200 @@ -6,6 +6,19 @@ } ], @@ -22,9 +22,9 @@ diff -up ./bin/phpcompatinfo.json.dist.rpm ./bin/phpcompatinfo.json.dist "analysers" : [ ], diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo ---- ./bin/phpcompatinfo.rpm 2015-06-16 10:56:41.000000000 +0200 -+++ ./bin/phpcompatinfo 2015-06-26 11:15:13.033747371 +0200 -@@ -1,23 +1,13 @@ +--- ./bin/phpcompatinfo.rpm 2015-07-11 10:04:30.000000000 +0200 ++++ ./bin/phpcompatinfo 2015-07-13 09:06:15.114698099 +0200 +@@ -1,23 +1,12 @@ #!/usr/bin/env php setUseIncludePath(true); - if (PHP_SAPI !== 'cli') { + if (\Phar::running()) { + if ($home) { +@@ -35,18 +24,10 @@ if (PHP_SAPI !== 'cli') { return; -@@ -28,5 +18,5 @@ use Bartlett\CompatInfo\Console\Applicat + } + +-if (\Phar::running()) { +- try { +- Bartlett\CompatInfo\Environment::checkRequirements(); +- } catch (\RuntimeException $e) { +- die ($e->getMessage()); +- } +-} +- + use Bartlett\Reflect\Environment; + use Bartlett\CompatInfo\Console\Application; Environment::setScanDir(); -$application = new Application($appName, '4.3'); -+$application = new Application($appName, '4.3.0'); ++$application = new Application($appName, '@package_version@'); $application->run(); diff -up ./data/handleDB.php.rpm ./data/handleDB.php ---- ./data/handleDB.php.rpm 2015-06-16 10:56:41.000000000 +0200 -+++ ./data/handleDB.php 2015-06-26 11:15:13.028747350 +0200 +--- ./data/handleDB.php.rpm 2015-07-11 10:04:30.000000000 +0200 ++++ ./data/handleDB.php 2015-07-13 09:06:15.108698079 +0200 @@ -11,7 +11,8 @@ * @since Release 4.0.0alpha3 */ @@ -74,9 +86,9 @@ diff -up ./data/handleDB.php.rpm ./data/handleDB.php use Bartlett\CompatInfo\Reference\ExtensionFactory; diff -up ./src/Bartlett/CompatInfo/Environment.php.rpm ./src/Bartlett/CompatInfo/Environment.php ---- ./src/Bartlett/CompatInfo/Environment.php.rpm 2015-06-26 11:20:20.075019885 +0200 -+++ ./src/Bartlett/CompatInfo/Environment.php 2015-06-26 11:23:06.329708917 +0200 -@@ -34,6 +34,11 @@ class Environment +--- ./src/Bartlett/CompatInfo/Environment.php.rpm 2015-07-13 09:10:10.271476463 +0200 ++++ ./src/Bartlett/CompatInfo/Environment.php 2015-07-13 09:10:52.422615982 +0200 +@@ -36,6 +36,12 @@ class Environment */ public static function initRefDb() { @@ -85,12 +97,13 @@ diff -up ./src/Bartlett/CompatInfo/Environment.php.rpm ./src/Bartlett/CompatInfo + } else if (file_exists($database = '/usr/share/php-bartlett-PHP-CompatInfo/compatinfo.sqlite')) { + return new \PDO('sqlite:' . $database); + } ++ $database = 'compatinfo.sqlite'; $tempDir = sys_get_temp_dir() . '/bartlett'; diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php ---- ./tests/bootstrap.php.rpm 2015-06-16 10:56:41.000000000 +0200 -+++ ./tests/bootstrap.php 2015-06-26 11:17:16.429258776 +0200 +--- ./tests/bootstrap.php.rpm 2015-07-11 10:04:30.000000000 +0200 ++++ ./tests/bootstrap.php 2015-07-13 09:06:15.108698079 +0200 @@ -1,8 +1,11 @@ addPrefixes(array( 'Bartlett\\CompatInfo' => dirname(dirname(__DIR__)), )); -if (is_file('/usr/share/php-bartlett-PHP-CompatInfo/compatinfo.sqlite')) { - putenv('BARTLETT_COMPATINFO_DB=/usr/share/php-bartlett-PHP-CompatInfo/compatinfo.sqlite'); -} // Dependencies require_once $vendorDir . '/Bartlett/Reflect/autoload.php'; diff --git a/php-bartlett-PHP-CompatInfo-upstream.patch b/php-bartlett-PHP-CompatInfo-upstream.patch deleted file mode 100644 index 24cea05..0000000 --- a/php-bartlett-PHP-CompatInfo-upstream.patch +++ /dev/null @@ -1,31 +0,0 @@ -From bc9c9abf4ff653105a441f22e9cc99eb816369b3 Mon Sep 17 00:00:00 2001 -From: Laurent Laville -Date: Mon, 29 Jun 2015 17:57:14 +0200 -Subject: [PATCH] add new constant LDAP_OPT_DIAGNOSTIC_MESSAGE introduced by - PHP 5.6.11RC1 and rebuilt DB - ---- - data/compatinfo.sqlite | Bin 897024 -> 897024 bytes - data/references/Ldap.constants.json | 9 +++++++++ - 2 files changed, 9 insertions(+) - -diff --git a/data/references/Ldap.constants.json b/data/references/Ldap.constants.json -index 82fd290..c44822d 100644 ---- a/data/references/Ldap.constants.json -+++ b/data/references/Ldap.constants.json -@@ -136,6 +136,15 @@ - }, - { - "ext_name_fk": 35, -+ "name": "LDAP_OPT_DIAGNOSTIC_MESSAGE", -+ "ext_min": "5.6.11RC1", -+ "ext_max": "", -+ "php_min": "5.6.11RC1", -+ "php_max": "", -+ "php_excludes": "" -+ }, -+ { -+ "ext_name_fk": 35, - "name": "LDAP_OPT_DEREF", - "ext_min": "4.0.0", - "ext_max": "", diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 6cf45a7..2225162 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -6,15 +6,16 @@ # # Please, preserve the changelog entries # -%global gh_commit c4bfef85fe799d2079f98f7b3e46d021bc739069 +%{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} +%global gh_commit 92ee6348c3059c614b58d9927a21a778b5d7b97e %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner llaville %global gh_project php-compat-info %global with_tests %{?_without_tests:0}%{!?_without_tests:1} Name: php-bartlett-PHP-CompatInfo -Version: 4.3.0 -Release: 4%{?dist} +Version: 4.4.0 +Release: 1%{?dist} Summary: Find out version and the extensions required for a piece of code to run Group: Development/Libraries @@ -29,9 +30,7 @@ Source1: fedora-review-check Source2: %{name}-autoload.php # Autoload and sqlite database path -Patch0: %{name}-4.3.0-rpm.patch -# ldap reference -Patch1: %{name}-upstream.patch +Patch0: %{name}-4.4.0-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 5.3.2 @@ -104,7 +103,6 @@ Documentation: http://php5.laurent-laville.org/compatinfo/manual/current/en/ %setup -q -n %{gh_project}-%{gh_commit} %patch0 -p1 -b .rpm -%patch1 -p1 cp %{SOURCE2} src/Bartlett/CompatInfo/autoload.php # Cleanup patched files @@ -134,6 +132,11 @@ install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name} %if %{with_tests} %check +%if "%{php_version}" < "5.5" +# https://github.com/llaville/php-compat-info/issues/206 +rm tests/Reference/Extension/IntlExtensionTest.php +%endif + %{_bindir}/phpunit \ --include-path %{buildroot}%{_datadir}/php \ -d memory_limit=1G @@ -159,6 +162,9 @@ fi %changelog +* Mon Jul 13 2015 Remi Collet - 4.4.0-1 +- update to 4.4.0 + * Mon Jun 29 2015 Remi Collet - 4.3.0-4 - upstream patch for ldap extension in 5.6.11RC1 (thanks Koschei) diff --git a/sources b/sources index e3c96e1..d6c5224 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0ff66371f36d4a4a85f37d9cdbc23605 php-compat-info-4.3.0-c4bfef8.tar.gz +1b7bfea58869c2121eadb7a9af340b6e php-compat-info-4.4.0-92ee634.tar.gz From 28d85fb5df3c677d0bc191efc2bd4a5de84c3d45 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 20 Jul 2015 14:46:26 +0200 Subject: [PATCH 024/111] add upstream patch for Intl --- php-bartlett-PHP-CompatInfo.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 2225162..8d0c467 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -15,7 +15,7 @@ Name: php-bartlett-PHP-CompatInfo Version: 4.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Find out version and the extensions required for a piece of code to run Group: Development/Libraries @@ -32,6 +32,9 @@ Source2: %{name}-autoload.php # Autoload and sqlite database path Patch0: %{name}-4.4.0-rpm.patch +# Upstream fix for Intl reference +Patch1: %{name}-upstream.patch + BuildArch: noarch BuildRequires: php(language) >= 5.3.2 %if %{with_tests} @@ -103,6 +106,7 @@ Documentation: http://php5.laurent-laville.org/compatinfo/manual/current/en/ %setup -q -n %{gh_project}-%{gh_commit} %patch0 -p1 -b .rpm +%patch1 -p1 -b .upstream cp %{SOURCE2} src/Bartlett/CompatInfo/autoload.php # Cleanup patched files @@ -162,6 +166,9 @@ fi %changelog +* Mon Jul 20 2015 Remi Collet - 4.4.0-2 +- add upstream patch for Intl reference + * Mon Jul 13 2015 Remi Collet - 4.4.0-1 - update to 4.4.0 From 103cb4df62797d719ce69fdc4af037ef5555e9e2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 20 Jul 2015 14:46:44 +0200 Subject: [PATCH 025/111] add upstream patch for Intl --- php-bartlett-PHP-CompatInfo-upstream.patch | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 php-bartlett-PHP-CompatInfo-upstream.patch diff --git a/php-bartlett-PHP-CompatInfo-upstream.patch b/php-bartlett-PHP-CompatInfo-upstream.patch new file mode 100644 index 0000000..07a04ab --- /dev/null +++ b/php-bartlett-PHP-CompatInfo-upstream.patch @@ -0,0 +1,48 @@ +From 392b4889f236326115516c680415cef5c02a5c23 Mon Sep 17 00:00:00 2001 +From: Laurent Laville +Date: Tue, 14 Jul 2015 21:00:38 +0200 +Subject: [PATCH] fixed issue GH-206 + +--- + data/references/Intl1.classes.json | 8 -------- + data/references/Intl5.classes.json | 8 ++++++++ + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/data/references/Intl1.classes.json b/data/references/Intl1.classes.json +index 568bf5d..d9abb1c 100644 +--- a/data/references/Intl1.classes.json ++++ b/data/references/Intl1.classes.json +@@ -17,14 +17,6 @@ + }, + { + "ext_name_fk": 32, +- "name": "IntlException", +- "ext_min": "1.0.0beta", +- "ext_max": "", +- "php_min": "5.2.0", +- "php_max": "" +- }, +- { +- "ext_name_fk": 32, + "name": "Locale", + "ext_min": "1.0.0beta", + "ext_max": "", +diff --git a/data/references/Intl5.classes.json b/data/references/Intl5.classes.json +index 8ad32c5..b5fdfb5 100644 +--- a/data/references/Intl5.classes.json ++++ b/data/references/Intl5.classes.json +@@ -70,5 +70,13 @@ + "ext_max": "", + "php_min": "5.5.0", + "php_max": "" ++ }, ++ { ++ "ext_name_fk": 32, ++ "name": "IntlException", ++ "ext_min": "5.5.0", ++ "ext_max": "", ++ "php_min": "5.5.0", ++ "php_max": "" + } + ] +\ No newline at end of file From 14a336667249f16c1f81743b27ffd821a547ee06 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 6 Oct 2015 12:53:07 +0200 Subject: [PATCH 026/111] v4.5.0 --- .gitignore | 1 + ...hp-bartlett-PHP-CompatInfo-4.5.0-rpm.patch | 2 +- php-bartlett-PHP-CompatInfo-upstream.patch | 48 ------------------- php-bartlett-PHP-CompatInfo.spec | 20 +++----- sources | 2 +- 5 files changed, 10 insertions(+), 63 deletions(-) rename php-bartlett-PHP-CompatInfo-4.4.0-rpm.patch => php-bartlett-PHP-CompatInfo-4.5.0-rpm.patch (98%) delete mode 100644 php-bartlett-PHP-CompatInfo-upstream.patch diff --git a/.gitignore b/.gitignore index 777af61..0a73a9d 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ clog /php-compat-info-4.2.0-4026f69.tar.gz /php-compat-info-4.3.0-c4bfef8.tar.gz /php-compat-info-4.4.0-92ee634.tar.gz +/php-compat-info-4.5.0-31d781a.tar.gz diff --git a/php-bartlett-PHP-CompatInfo-4.4.0-rpm.patch b/php-bartlett-PHP-CompatInfo-4.5.0-rpm.patch similarity index 98% rename from php-bartlett-PHP-CompatInfo-4.4.0-rpm.patch rename to php-bartlett-PHP-CompatInfo-4.5.0-rpm.patch index dd91593..60280df 100644 --- a/php-bartlett-PHP-CompatInfo-4.4.0-rpm.patch +++ b/php-bartlett-PHP-CompatInfo-4.5.0-rpm.patch @@ -69,7 +69,7 @@ diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo Environment::setScanDir(); --$application = new Application($appName, '4.3'); +-$application = new Application($appName, '4.5'); +$application = new Application($appName, '@package_version@'); $application->run(); diff -up ./data/handleDB.php.rpm ./data/handleDB.php diff --git a/php-bartlett-PHP-CompatInfo-upstream.patch b/php-bartlett-PHP-CompatInfo-upstream.patch deleted file mode 100644 index 07a04ab..0000000 --- a/php-bartlett-PHP-CompatInfo-upstream.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 392b4889f236326115516c680415cef5c02a5c23 Mon Sep 17 00:00:00 2001 -From: Laurent Laville -Date: Tue, 14 Jul 2015 21:00:38 +0200 -Subject: [PATCH] fixed issue GH-206 - ---- - data/references/Intl1.classes.json | 8 -------- - data/references/Intl5.classes.json | 8 ++++++++ - 2 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/data/references/Intl1.classes.json b/data/references/Intl1.classes.json -index 568bf5d..d9abb1c 100644 ---- a/data/references/Intl1.classes.json -+++ b/data/references/Intl1.classes.json -@@ -17,14 +17,6 @@ - }, - { - "ext_name_fk": 32, -- "name": "IntlException", -- "ext_min": "1.0.0beta", -- "ext_max": "", -- "php_min": "5.2.0", -- "php_max": "" -- }, -- { -- "ext_name_fk": 32, - "name": "Locale", - "ext_min": "1.0.0beta", - "ext_max": "", -diff --git a/data/references/Intl5.classes.json b/data/references/Intl5.classes.json -index 8ad32c5..b5fdfb5 100644 ---- a/data/references/Intl5.classes.json -+++ b/data/references/Intl5.classes.json -@@ -70,5 +70,13 @@ - "ext_max": "", - "php_min": "5.5.0", - "php_max": "" -+ }, -+ { -+ "ext_name_fk": 32, -+ "name": "IntlException", -+ "ext_min": "5.5.0", -+ "ext_max": "", -+ "php_min": "5.5.0", -+ "php_max": "" - } - ] -\ No newline at end of file diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 8d0c467..2c09472 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -7,15 +7,15 @@ # Please, preserve the changelog entries # %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit 92ee6348c3059c614b58d9927a21a778b5d7b97e +%global gh_commit 31d781af6cf6113db85da8838bf25eb73e7b093e %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner llaville %global gh_project php-compat-info %global with_tests %{?_without_tests:0}%{!?_without_tests:1} Name: php-bartlett-PHP-CompatInfo -Version: 4.4.0 -Release: 2%{?dist} +Version: 4.5.0 +Release: 1%{?dist} Summary: Find out version and the extensions required for a piece of code to run Group: Development/Libraries @@ -30,10 +30,7 @@ Source1: fedora-review-check Source2: %{name}-autoload.php # Autoload and sqlite database path -Patch0: %{name}-4.4.0-rpm.patch - -# Upstream fix for Intl reference -Patch1: %{name}-upstream.patch +Patch0: %{name}-4.5.0-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 5.3.2 @@ -106,7 +103,6 @@ Documentation: http://php5.laurent-laville.org/compatinfo/manual/current/en/ %setup -q -n %{gh_project}-%{gh_commit} %patch0 -p1 -b .rpm -%patch1 -p1 -b .upstream cp %{SOURCE2} src/Bartlett/CompatInfo/autoload.php # Cleanup patched files @@ -136,11 +132,6 @@ install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name} %if %{with_tests} %check -%if "%{php_version}" < "5.5" -# https://github.com/llaville/php-compat-info/issues/206 -rm tests/Reference/Extension/IntlExtensionTest.php -%endif - %{_bindir}/phpunit \ --include-path %{buildroot}%{_datadir}/php \ -d memory_limit=1G @@ -166,6 +157,9 @@ fi %changelog +* Tue Oct 6 2015 Remi Collet - 4.5.0-1 +- update to 4.5.0 + * Mon Jul 20 2015 Remi Collet - 4.4.0-2 - add upstream patch for Intl reference diff --git a/sources b/sources index d6c5224..9ed1cb3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1b7bfea58869c2121eadb7a9af340b6e php-compat-info-4.4.0-92ee634.tar.gz +837673ac1811c45df8181e249221ace6 php-compat-info-4.5.0-31d781a.tar.gz From 2ca788a28606c214c683b1f6bac6f80904000def Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 11 Oct 2015 19:22:19 +0200 Subject: [PATCH 027/111] v4.5.1 --- .gitignore | 1 + php-bartlett-PHP-CompatInfo.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0a73a9d..b5f4890 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ clog /php-compat-info-4.3.0-c4bfef8.tar.gz /php-compat-info-4.4.0-92ee634.tar.gz /php-compat-info-4.5.0-31d781a.tar.gz +/php-compat-info-4.5.1-e4c5d42.tar.gz diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 2c09472..a0bec01 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -7,14 +7,14 @@ # Please, preserve the changelog entries # %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit 31d781af6cf6113db85da8838bf25eb73e7b093e +%global gh_commit e4c5d42dce0820f59939bc7fbd2a8995bac66000 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner llaville %global gh_project php-compat-info %global with_tests %{?_without_tests:0}%{!?_without_tests:1} Name: php-bartlett-PHP-CompatInfo -Version: 4.5.0 +Version: 4.5.1 Release: 1%{?dist} Summary: Find out version and the extensions required for a piece of code to run @@ -157,6 +157,9 @@ fi %changelog +* Sun Oct 11 2015 Remi Collet - 4.5.1-1 +- update to 4.5.1 + * Tue Oct 6 2015 Remi Collet - 4.5.0-1 - update to 4.5.0 diff --git a/sources b/sources index 9ed1cb3..22d0fdb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -837673ac1811c45df8181e249221ace6 php-compat-info-4.5.0-31d781a.tar.gz +e6df4b0f3ef47efd63622ffe184fe248 php-compat-info-4.5.1-e4c5d42.tar.gz From 4b6f3ce768f6ed83a825687e17c7adc82bccd5e8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 26 Nov 2015 14:22:42 +0100 Subject: [PATCH 028/111] v4.5.2 --- .gitignore | 1 + php-bartlett-PHP-CompatInfo.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b5f4890..3eb034d 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ clog /php-compat-info-4.4.0-92ee634.tar.gz /php-compat-info-4.5.0-31d781a.tar.gz /php-compat-info-4.5.1-e4c5d42.tar.gz +/php-compat-info-4.5.2-4fc02f5.tar.gz diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index a0bec01..c78e43e 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -7,14 +7,14 @@ # Please, preserve the changelog entries # %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit e4c5d42dce0820f59939bc7fbd2a8995bac66000 +%global gh_commit 4fc02f5dc9e07039e3baafe53a287547dd8675bd %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner llaville %global gh_project php-compat-info %global with_tests %{?_without_tests:0}%{!?_without_tests:1} Name: php-bartlett-PHP-CompatInfo -Version: 4.5.1 +Version: 4.5.2 Release: 1%{?dist} Summary: Find out version and the extensions required for a piece of code to run @@ -157,6 +157,9 @@ fi %changelog +* Wed Nov 25 2015 Remi Collet - 4.5.2-1 +- update to 4.5.2 + * Sun Oct 11 2015 Remi Collet - 4.5.1-1 - update to 4.5.1 diff --git a/sources b/sources index 22d0fdb..55c4e3a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e6df4b0f3ef47efd63622ffe184fe248 php-compat-info-4.5.1-e4c5d42.tar.gz +f0dd63c07ce9e18f0a6d812a317313dd php-compat-info-4.5.2-4fc02f5.tar.gz From c42d0cce9f8f6b20e0e5830d731fdeafe974f378 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 29 Dec 2015 10:48:30 +0100 Subject: [PATCH 029/111] - update to 5.0.0 - raise dependency on bartlett/php-reflect ~4.0 - raise minimal php version to 5.4 - add dependency on bartlett/php-compatinfo-db --- .gitignore | 1 + php-bartlett-PHP-CompatInfo-4.5.0-rpm.patch | 120 ------------------ ...bartlett-PHP-CompatInfo-5.0.0-autoload.php | 1 + php-bartlett-PHP-CompatInfo-5.0.0-rpm.patch | 85 +++++++++++++ php-bartlett-PHP-CompatInfo.spec | 40 +++--- sources | 2 +- 6 files changed, 113 insertions(+), 136 deletions(-) delete mode 100644 php-bartlett-PHP-CompatInfo-4.5.0-rpm.patch rename php-bartlett-PHP-CompatInfo-autoload.php => php-bartlett-PHP-CompatInfo-5.0.0-autoload.php (91%) create mode 100644 php-bartlett-PHP-CompatInfo-5.0.0-rpm.patch diff --git a/.gitignore b/.gitignore index 3eb034d..539d8a3 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ clog /php-compat-info-4.5.0-31d781a.tar.gz /php-compat-info-4.5.1-e4c5d42.tar.gz /php-compat-info-4.5.2-4fc02f5.tar.gz +/php-compat-info-5.0.0-1b65ee3.tar.gz diff --git a/php-bartlett-PHP-CompatInfo-4.5.0-rpm.patch b/php-bartlett-PHP-CompatInfo-4.5.0-rpm.patch deleted file mode 100644 index 60280df..0000000 --- a/php-bartlett-PHP-CompatInfo-4.5.0-rpm.patch +++ /dev/null @@ -1,120 +0,0 @@ -diff -up ./bin/phpcompatinfo.json.dist.rpm ./bin/phpcompatinfo.json.dist ---- ./bin/phpcompatinfo.json.dist.rpm 2015-07-11 10:04:30.000000000 +0200 -+++ ./bin/phpcompatinfo.json.dist 2015-07-13 09:06:15.108698079 +0200 -@@ -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 2015-07-11 10:04:30.000000000 +0200 -+++ ./bin/phpcompatinfo 2015-07-13 09:06:15.114698099 +0200 -@@ -1,23 +1,12 @@ - #!/usr/bin/env php - setUseIncludePath(true); - - if (\Phar::running()) { - if ($home) { -@@ -35,18 +24,10 @@ if (PHP_SAPI !== 'cli') { - return; - } - --if (\Phar::running()) { -- try { -- Bartlett\CompatInfo\Environment::checkRequirements(); -- } catch (\RuntimeException $e) { -- die ($e->getMessage()); -- } --} -- - use Bartlett\Reflect\Environment; - use Bartlett\CompatInfo\Console\Application; - - Environment::setScanDir(); - --$application = new Application($appName, '4.5'); -+$application = new Application($appName, '@package_version@'); - $application->run(); -diff -up ./data/handleDB.php.rpm ./data/handleDB.php ---- ./data/handleDB.php.rpm 2015-07-11 10:04:30.000000000 +0200 -+++ ./data/handleDB.php 2015-07-13 09:06:15.108698079 +0200 -@@ -11,7 +11,8 @@ - * @since Release 4.0.0alpha3 - */ - --require_once dirname(__DIR__) . '/vendor/autoload.php'; -+require_once __DIR__ . '/../src/Bartlett/CompatInfo/autoload.php'; -+ - require_once __DIR__ . '/ReferenceCollection.php'; - - use Bartlett\CompatInfo\Reference\ExtensionFactory; -diff -up ./src/Bartlett/CompatInfo/Environment.php.rpm ./src/Bartlett/CompatInfo/Environment.php ---- ./src/Bartlett/CompatInfo/Environment.php.rpm 2015-07-13 09:10:10.271476463 +0200 -+++ ./src/Bartlett/CompatInfo/Environment.php 2015-07-13 09:10:52.422615982 +0200 -@@ -36,6 +36,12 @@ class Environment - */ - public static function initRefDb() - { -+ if (($database = getenv('BARTLETT_COMPATINFO_DB')) && file_exists($database)) { -+ return new \PDO('sqlite:' . $database); -+ } else if (file_exists($database = '/usr/share/php-bartlett-PHP-CompatInfo/compatinfo.sqlite')) { -+ return new \PDO('sqlite:' . $database); -+ } -+ - $database = 'compatinfo.sqlite'; - $tempDir = sys_get_temp_dir() . '/bartlett'; - -diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php ---- ./tests/bootstrap.php.rpm 2015-07-11 10:04:30.000000000 +0200 -+++ ./tests/bootstrap.php 2015-07-13 09:06:15.108698079 +0200 -@@ -1,8 +1,11 @@ - addPrefix('Bartlett\\Tests\\CompatInfo', $baseDir . '/tests'); - -+putenv('BARTLETT_COMPATINFO_DB='.dirname(__DIR__).'/data/compatinfo.sqlite'); -+# Class not catched by autoloader - require __DIR__ . '/Reference/GenericTest.php'; diff --git a/php-bartlett-PHP-CompatInfo-autoload.php b/php-bartlett-PHP-CompatInfo-5.0.0-autoload.php similarity index 91% rename from php-bartlett-PHP-CompatInfo-autoload.php rename to php-bartlett-PHP-CompatInfo-5.0.0-autoload.php index 62dd824..cf3b6a5 100644 --- a/php-bartlett-PHP-CompatInfo-autoload.php +++ b/php-bartlett-PHP-CompatInfo-5.0.0-autoload.php @@ -20,3 +20,4 @@ $fedoraClassLoader->addPrefixes(array( // Dependencies require_once $vendorDir . '/Bartlett/Reflect/autoload.php'; +require_once $vendorDir . '/Bartlett/CompatInfoDb/autoload.php'; diff --git a/php-bartlett-PHP-CompatInfo-5.0.0-rpm.patch b/php-bartlett-PHP-CompatInfo-5.0.0-rpm.patch new file mode 100644 index 0000000..5a4a301 --- /dev/null +++ b/php-bartlett-PHP-CompatInfo-5.0.0-rpm.patch @@ -0,0 +1,85 @@ +diff -up ./bin/phpcompatinfo.json.dist.rpm ./bin/phpcompatinfo.json.dist +--- ./bin/phpcompatinfo.json.dist.rpm 2015-12-05 10:11:45.000000000 +0100 ++++ ./bin/phpcompatinfo.json.dist 2015-12-07 09:08:39.785273332 +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 2015-12-05 10:11:45.000000000 +0100 ++++ ./bin/phpcompatinfo 2015-12-07 09:14:17.072783363 +0100 +@@ -1,52 +1,21 @@ + #!/usr/bin/env php + setUseIncludePath(true); +- +-if (\Phar::running()) { +- if ($home) { +- // when optional resources are not embedded in phar distribution, +- // avoid PHP Warnings, and lookup first in global vendor dir (COMPOSER_HOME) if exists +- $classMapfiltered = $fallbackClassMap($loader->getClassMap(), 'Net_Growl'); +- $loader->addClassMap($classMapfiltered); +- +- // try to find PEAR Net_Growl classes package in folder $fallbackNetGrowlDir (see phar-stub.php) +- $loader->add(false, $fallbackNetGrowlDir); +- } ++require_once $vendorDir . '/Bartlett/CompatInfo/autoload.php'; ++if (!getenv("BARTLETTRC")) { ++ putenv("BARTLETTRC=" . strtolower($appName) . '.json'); + } + + if (PHP_SAPI !== 'cli') { + return; + } + +-if (\Phar::running()) { +- 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.0'); ++$application = new Application($appName, '@package_version@'); + $application->run(); +diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index c78e43e..867e6ab 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -7,14 +7,14 @@ # Please, preserve the changelog entries # %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit 4fc02f5dc9e07039e3baafe53a287547dd8675bd +%global gh_commit 1b65ee36ac475e2ce3a20fae612659ea933338c6 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner llaville %global gh_project php-compat-info %global with_tests %{?_without_tests:0}%{!?_without_tests:1} Name: php-bartlett-PHP-CompatInfo -Version: 4.5.2 +Version: 5.0.0 Release: 1%{?dist} Summary: Find out version and the extensions required for a piece of code to run @@ -27,41 +27,44 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit Source1: fedora-review-check # Autoloader for RPM - die composer ! -Source2: %{name}-autoload.php +Source2: %{name}-5.0.0-autoload.php # Autoload and sqlite database path -Patch0: %{name}-4.5.0-rpm.patch +Patch0: %{name}-5.0.0-rpm.patch BuildArch: noarch -BuildRequires: php(language) >= 5.3.2 +BuildRequires: php(language) >= 5.4.0 %if %{with_tests} # to run test suite BuildRequires: %{_bindir}/phpunit BuildRequires: php-pdo_sqlite -BuildRequires: php-composer(bartlett/php-reflect) >= 3.1 +BuildRequires: php-composer(bartlett/php-reflect) >= 4.0 +BuildRequires: php-composer(bartlett/php-compatinfo-db) >= 1.0 # For our patch / autoloader BuildRequires: php-composer(symfony/class-loader) -BuildRequires: php-bartlett-PHP-Reflect >= 3.1.1-3 %endif # From composer.json, "require" -# "php": ">=5.3.2", +# "php": ">=5.4.0", # "ext-libxml": "*", # "ext-pcre": "*", # "ext-spl": "*", # "ext-json": "*", # "ext-pdo_sqlite": "*", # "symfony/console": "~2.5", -# "bartlett/php-reflect": "~3.1", -Requires: php(language) >= 5.3.2 +# "bartlett/php-reflect": "~4.0", +# "bartlett/php-compatinfo-db": "~1.0" +Requires: php(language) >= 5.4.0 Requires: php-cli Requires: php-json Requires: php-libxml Requires: php-pcre Requires: php-pdo_sqlite Requires: php-spl -Requires: php-composer(bartlett/php-reflect) >= 3.1 -Requires: php-composer(bartlett/php-reflect) < 4 +Requires: php-composer(bartlett/php-reflect) >= 4.0 +Requires: php-composer(bartlett/php-reflect) < 5 +Requires: php-composer(bartlett/php-compatinfo-db) >= 1.0 +Requires: php-composer(bartlett/php-compatinfo-db) < 2 Requires: php-composer(symfony/console) >= 2.5 Requires: php-composer(symfony/console) < 3 # From composer.json, "require-dev": { @@ -114,8 +117,7 @@ sed -e 's/@package_version@/%{version}%{?prever}/' \ %build -: Generate the references database -%{_bindir}/php -d date.timezone=Europe/Paris data/handleDB.php db:init +# Nothing %install @@ -125,13 +127,15 @@ cp -pr src/Bartlett %{buildroot}%{_datadir}/php/Bartlett install -D -p -m 755 bin/phpcompatinfo %{buildroot}%{_bindir}/phpcompatinfo install -D -p -m 644 bin/phpcompatinfo.json.dist %{buildroot}%{_sysconfdir}/phpcompatinfo.json install -D -p -m 644 bin/phpcompatinfo.1 %{buildroot}%{_mandir}/man1/phpcompatinfo.1 -install -D -p -m 644 data/compatinfo.sqlite %{buildroot}%{_datadir}/%{name}/compatinfo.sqlite install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/fedora-review-check %if %{with_tests} %check +mkdir vendor +ln -s %{buildroot}%{_datadir}/php/Bartlett/CompatInfo/autoload.php vendor/ + %{_bindir}/phpunit \ --include-path %{buildroot}%{_datadir}/php \ -d memory_limit=1G @@ -157,6 +161,12 @@ fi %changelog +* Thu Dec 10 2015 Remi Collet - 5.0.0-1 +- update to 5.0.0 +- raise dependency on bartlett/php-reflect ~4.0 +- raise minimal php version to 5.4 +- add dependency on bartlett/php-compatinfo-db + * Wed Nov 25 2015 Remi Collet - 4.5.2-1 - update to 4.5.2 diff --git a/sources b/sources index 55c4e3a..61c1b2b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f0dd63c07ce9e18f0a6d812a317313dd php-compat-info-4.5.2-4fc02f5.tar.gz +c0c7dd953aac634e7456bdb4e1923aa4 php-compat-info-5.0.0-1b65ee3.tar.gz From 7503c81a27d4d39e1c698129bf49d2fb91b69856 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 17:00:21 +0000 Subject: [PATCH 030/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- php-bartlett-PHP-CompatInfo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 867e6ab..81d019f 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -15,7 +15,7 @@ Name: php-bartlett-PHP-CompatInfo Version: 5.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Find out version and the extensions required for a piece of code to run Group: Development/Libraries @@ -161,6 +161,9 @@ fi %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 5.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Thu Dec 10 2015 Remi Collet - 5.0.0-1 - update to 5.0.0 - raise dependency on bartlett/php-reflect ~4.0 From ca58628de33edda29639ce5beccb3be103cd3907 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 6 Jul 2016 17:02:08 +0200 Subject: [PATCH 031/111] - update to 5.0.1 - display DB version instead of build date --- .gitignore | 1 + php-bartlett-PHP-CompatInfo-5.0.0-rpm.patch | 14 ++++++++++++++ php-bartlett-PHP-CompatInfo.spec | 21 +++++++++++++-------- sources | 2 +- 4 files changed, 29 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 539d8a3..dc8b6bb 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ clog /php-compat-info-4.5.1-e4c5d42.tar.gz /php-compat-info-4.5.2-4fc02f5.tar.gz /php-compat-info-5.0.0-1b65ee3.tar.gz +/php-compat-info-5.0.1-300a168.tar.gz diff --git a/php-bartlett-PHP-CompatInfo-5.0.0-rpm.patch b/php-bartlett-PHP-CompatInfo-5.0.0-rpm.patch index 5a4a301..ed5eed3 100644 --- a/php-bartlett-PHP-CompatInfo-5.0.0-rpm.patch +++ b/php-bartlett-PHP-CompatInfo-5.0.0-rpm.patch @@ -83,3 +83,17 @@ diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo +$application = new Application($appName, '@package_version@'); $application->run(); diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php +--- ./src/Bartlett/CompatInfo/Console/Application.php.rpm 2016-03-09 18:38:00.713180108 +0100 ++++ ./src/Bartlett/CompatInfo/Console/Application.php 2016-03-09 18:36:09.737741387 +0100 +@@ -52,9 +52,10 @@ + $v = Environment::versionRefDb(); + + return sprintf( +- '%s version %s DB built %s', ++ '%s version %s DB version %s built %s', + $this->getName(), + $this->getVersion(), ++ $v['build.version'], + $v['build.string'] + ); + } diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 81d019f..0e493ce 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -1,21 +1,24 @@ # remirepo/fedora spec file for php-bartlett-PHP-CompatInfo # -# Copyright (c) 2011-2015 Remi Collet +# Copyright (c) 2011-2016 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit 1b65ee36ac475e2ce3a20fae612659ea933338c6 +%global gh_commit 300a1689891aa97a6733ef496081ec394f53486b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) +#global gh_date 20151005 %global gh_owner llaville %global gh_project php-compat-info +#global prever RC2 %global with_tests %{?_without_tests:0}%{!?_without_tests:1} Name: php-bartlett-PHP-CompatInfo -Version: 5.0.0 -Release: 2%{?dist} +Version: 5.0.1 +%global specrel 1 +Release: %{?gh_date:0.%{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 Group: Development/Libraries @@ -87,7 +90,6 @@ Requires: php-composer(symfony/console) < 3 # "bartlett/umlwriter": "Allow writing UML class diagrams (Graphviz or PlantUML)" # Required by autoloader Requires: php-composer(symfony/class-loader) -Requires: php-bartlett-PHP-Reflect >= 3.1.1-3 Provides: phpcompatinfo = %{version} Provides: php-composer(bartlett/php-compatinfo) = %{version} @@ -104,6 +106,7 @@ Documentation: http://php5.laurent-laville.org/compatinfo/manual/current/en/ %prep %setup -q -n %{gh_project}-%{gh_commit} +#setup -q -n %{gh_project}-%{version} %patch0 -p1 -b .rpm cp %{SOURCE2} src/Bartlett/CompatInfo/autoload.php @@ -136,9 +139,7 @@ install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name} mkdir vendor ln -s %{buildroot}%{_datadir}/php/Bartlett/CompatInfo/autoload.php vendor/ -%{_bindir}/phpunit \ - --include-path %{buildroot}%{_datadir}/php \ - -d memory_limit=1G +%{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose %endif @@ -161,6 +162,10 @@ fi %changelog +* Wed Jul 6 2016 Remi Collet - 5.0.1-1 +- update to 5.0.1 +- display DB version instead of build date + * Thu Feb 04 2016 Fedora Release Engineering - 5.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 61c1b2b..224774e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c0c7dd953aac634e7456bdb4e1923aa4 php-compat-info-5.0.0-1b65ee3.tar.gz +39dd2634b30358d36980638be65294c9 php-compat-info-5.0.1-300a168.tar.gz From 6e2b2f7ae43784a0c2e59a2d3e2d949685ff0336 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 2 Nov 2016 11:12:04 +0100 Subject: [PATCH 032/111] switch to fedora-autoloader --- ...bartlett-PHP-CompatInfo-5.0.0-autoload.php | 20 +++++-------------- php-bartlett-PHP-CompatInfo.spec | 9 ++++++--- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/php-bartlett-PHP-CompatInfo-5.0.0-autoload.php b/php-bartlett-PHP-CompatInfo-5.0.0-autoload.php index cf3b6a5..4297383 100644 --- a/php-bartlett-PHP-CompatInfo-5.0.0-autoload.php +++ b/php-bartlett-PHP-CompatInfo-5.0.0-autoload.php @@ -3,21 +3,11 @@ * Autoloader for bartlett/php-compatinfo and its dependencies */ -$vendorDir = '/usr/share/php'; +require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; -// Use Symfony autoloader -if (!isset($fedoraClassLoader) || !($fedoraClassLoader instanceof \Symfony\Component\ClassLoader\ClassLoader)) { - if (!class_exists('Symfony\\Component\\ClassLoader\\ClassLoader', false)) { - require_once $vendorDir . '/Symfony/Component/ClassLoader/ClassLoader.php'; - } - - $fedoraClassLoader = new \Symfony\Component\ClassLoader\ClassLoader(); - $fedoraClassLoader->register(); -} -$fedoraClassLoader->addPrefixes(array( - 'Bartlett\\CompatInfo' => dirname(dirname(__DIR__)), +\Fedora\Autoloader\Autoload::addPsr4('Bartlett\\CompatInfo\\', __DIR__); +\Fedora\Autoloader\Dependencies::required(array( + '/usr/share/php/Bartlett/Reflect/autoload.php', + '/usr/share/php/Bartlett/CompatInfoDb/autoload.php', )); -// Dependencies -require_once $vendorDir . '/Bartlett/Reflect/autoload.php'; -require_once $vendorDir . '/Bartlett/CompatInfoDb/autoload.php'; diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 0e493ce..70b7ef3 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -17,7 +17,7 @@ Name: php-bartlett-PHP-CompatInfo Version: 5.0.1 -%global specrel 1 +%global specrel 2 Release: %{?gh_date:0.%{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 @@ -44,7 +44,7 @@ BuildRequires: php-pdo_sqlite BuildRequires: php-composer(bartlett/php-reflect) >= 4.0 BuildRequires: php-composer(bartlett/php-compatinfo-db) >= 1.0 # For our patch / autoloader -BuildRequires: php-composer(symfony/class-loader) +BuildRequires: php-composer(fedora/autoloader) %endif # From composer.json, "require" @@ -89,7 +89,7 @@ Requires: php-composer(symfony/console) < 3 # "doctrine/cache": "Allow caching results, since bartlett/php-reflect 2.2" # "bartlett/umlwriter": "Allow writing UML class diagrams (Graphviz or PlantUML)" # Required by autoloader -Requires: php-composer(symfony/class-loader) +Requires: php-composer(fedora/autoloader) Provides: phpcompatinfo = %{version} Provides: php-composer(bartlett/php-compatinfo) = %{version} @@ -162,6 +162,9 @@ fi %changelog +* Mon Oct 31 2016 Remi Collet - 5.0.1-2 +- switch to fedora/autoloader + * Wed Jul 6 2016 Remi Collet - 5.0.1-1 - update to 5.0.1 - display DB version instead of build date From 55c74ac75206daac515c488181ac24e86c270180 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 16 Dec 2016 07:59:31 +0100 Subject: [PATCH 033/111] v5.0.2 --- .gitignore | 1 + php-bartlett-PHP-CompatInfo-5.0.0-rpm.patch | 16 +--------------- php-bartlett-PHP-CompatInfo.spec | 13 ++++++++----- sources | 2 +- 4 files changed, 11 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index dc8b6bb..e96d16d 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ clog /php-compat-info-4.5.2-4fc02f5.tar.gz /php-compat-info-5.0.0-1b65ee3.tar.gz /php-compat-info-5.0.1-300a168.tar.gz +/php-compat-info-5.0.2-49d6752.tar.gz diff --git a/php-bartlett-PHP-CompatInfo-5.0.0-rpm.patch b/php-bartlett-PHP-CompatInfo-5.0.0-rpm.patch index ed5eed3..55a4c09 100644 --- a/php-bartlett-PHP-CompatInfo-5.0.0-rpm.patch +++ b/php-bartlett-PHP-CompatInfo-5.0.0-rpm.patch @@ -82,18 +82,4 @@ diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo -$application = new Application($appName, '5.0'); +$application = new Application($appName, '@package_version@'); $application->run(); -diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php ---- ./src/Bartlett/CompatInfo/Console/Application.php.rpm 2016-03-09 18:38:00.713180108 +0100 -+++ ./src/Bartlett/CompatInfo/Console/Application.php 2016-03-09 18:36:09.737741387 +0100 -@@ -52,9 +52,10 @@ - $v = Environment::versionRefDb(); - - return sprintf( -- '%s version %s DB built %s', -+ '%s version %s DB version %s built %s', - $this->getName(), - $this->getVersion(), -+ $v['build.version'], - $v['build.string'] - ); - } + diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 70b7ef3..6be6d0e 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit 300a1689891aa97a6733ef496081ec394f53486b +%global gh_commit 49d67523234b35697a0b5b6b2dd8e9b6a23f44cb %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville @@ -16,8 +16,8 @@ %global with_tests %{?_without_tests:0}%{!?_without_tests:1} Name: php-bartlett-PHP-CompatInfo -Version: 5.0.1 -%global specrel 2 +Version: 5.0.2 +%global specrel 1 Release: %{?gh_date:0.%{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,7 +42,7 @@ BuildRequires: php(language) >= 5.4.0 BuildRequires: %{_bindir}/phpunit BuildRequires: php-pdo_sqlite BuildRequires: php-composer(bartlett/php-reflect) >= 4.0 -BuildRequires: php-composer(bartlett/php-compatinfo-db) >= 1.0 +BuildRequires: php-composer(bartlett/php-compatinfo-db) >= 1.15 # For our patch / autoloader BuildRequires: php-composer(fedora/autoloader) %endif @@ -66,7 +66,7 @@ Requires: php-pdo_sqlite Requires: php-spl Requires: php-composer(bartlett/php-reflect) >= 4.0 Requires: php-composer(bartlett/php-reflect) < 5 -Requires: php-composer(bartlett/php-compatinfo-db) >= 1.0 +Requires: php-composer(bartlett/php-compatinfo-db) >= 1.15 Requires: php-composer(bartlett/php-compatinfo-db) < 2 Requires: php-composer(symfony/console) >= 2.5 Requires: php-composer(symfony/console) < 3 @@ -162,6 +162,9 @@ fi %changelog +* Fri Dec 16 2016 Remi Collet - 5.0.2-1 +- update to 5.0.2 + * Mon Oct 31 2016 Remi Collet - 5.0.1-2 - switch to fedora/autoloader diff --git a/sources b/sources index 224774e..1158ed2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -39dd2634b30358d36980638be65294c9 php-compat-info-5.0.1-300a168.tar.gz +SHA512 (php-compat-info-5.0.2-49d6752.tar.gz) = 900ed00366c4253d032a915ee95972aece04f11b6bfe323a75dc0183c308c89123296eec352d1424c4d65459dca2b95690f27db28de362c9bb0c22951715b2dc From 7351443ec05d733785180447967417d464722ded Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 11 Jan 2017 12:11:24 +0100 Subject: [PATCH 034/111] v5.0.3 --- .gitignore | 1 + php-bartlett-PHP-CompatInfo.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e96d16d..5f46c20 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ clog /php-compat-info-5.0.0-1b65ee3.tar.gz /php-compat-info-5.0.1-300a168.tar.gz /php-compat-info-5.0.2-49d6752.tar.gz +/php-compat-info-5.0.3-8e875d5.tar.gz diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 6be6d0e..c8b7d67 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -1,13 +1,13 @@ # remirepo/fedora spec file for php-bartlett-PHP-CompatInfo # -# Copyright (c) 2011-2016 Remi Collet +# Copyright (c) 2011-2017 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit 49d67523234b35697a0b5b6b2dd8e9b6a23f44cb +%global gh_commit 8e875d5d8193045c33260e0af3840963c577089e %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville @@ -16,7 +16,7 @@ %global with_tests %{?_without_tests:0}%{!?_without_tests:1} Name: php-bartlett-PHP-CompatInfo -Version: 5.0.2 +Version: 5.0.3 %global specrel 1 Release: %{?gh_date:0.%{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 @@ -162,6 +162,9 @@ fi %changelog +* Wed Jan 11 2017 Remi Collet - 5.0.3-1 +- update to 5.0.3 + * Fri Dec 16 2016 Remi Collet - 5.0.2-1 - update to 5.0.2 diff --git a/sources b/sources index 1158ed2..849063c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-compat-info-5.0.2-49d6752.tar.gz) = 900ed00366c4253d032a915ee95972aece04f11b6bfe323a75dc0183c308c89123296eec352d1424c4d65459dca2b95690f27db28de362c9bb0c22951715b2dc +SHA512 (php-compat-info-5.0.3-8e875d5.tar.gz) = 4c44e3a0952f9e57da710b1733227e7669d1b47a9a33458790114ec5171d19f133f6351a14ffff71340a3b2818d4077724599d1457ec4cd922b9d899979997a0 From 35a7478a92abe87aa43531f193fdf61d463775ef Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 17 Jan 2017 07:35:16 +0100 Subject: [PATCH 035/111] v5.0.4 --- .gitignore | 1 + php-bartlett-PHP-CompatInfo.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5f46c20..dfcf2a0 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ clog /php-compat-info-5.0.1-300a168.tar.gz /php-compat-info-5.0.2-49d6752.tar.gz /php-compat-info-5.0.3-8e875d5.tar.gz +/php-compat-info-5.0.4-8a49d05.tar.gz diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index c8b7d67..109b331 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit 8e875d5d8193045c33260e0af3840963c577089e +%global gh_commit 8a49d050f417cf39325bc9170f101ed2a2fb9f2a %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville @@ -16,7 +16,7 @@ %global with_tests %{?_without_tests:0}%{!?_without_tests:1} Name: php-bartlett-PHP-CompatInfo -Version: 5.0.3 +Version: 5.0.4 %global specrel 1 Release: %{?gh_date:0.%{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 @@ -162,6 +162,9 @@ fi %changelog +* Tue Jan 17 2017 Remi Collet - 5.0.4-1 +- update to 5.0.4 + * Wed Jan 11 2017 Remi Collet - 5.0.3-1 - update to 5.0.3 diff --git a/sources b/sources index 849063c..8dc5704 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-compat-info-5.0.3-8e875d5.tar.gz) = 4c44e3a0952f9e57da710b1733227e7669d1b47a9a33458790114ec5171d19f133f6351a14ffff71340a3b2818d4077724599d1457ec4cd922b9d899979997a0 +SHA512 (php-compat-info-5.0.4-8a49d05.tar.gz) = 7478daff7a3708a43f04dcc63f74bc947f52c4e485a847ea87deb9a93f984938d7b82ad28a96ba6349dbc92054e8b946854400241413ebb1d7f8dd287afaec4b From a032971f6a07bb84e614ed3334a12d59aedca6a9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 06:24:43 +0000 Subject: [PATCH 036/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- php-bartlett-PHP-CompatInfo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 109b331..a708adb 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -18,7 +18,7 @@ Name: php-bartlett-PHP-CompatInfo Version: 5.0.4 %global specrel 1 -Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} +Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}.1 Summary: Find out version and the extensions required for a piece of code to run Group: Development/Libraries @@ -162,6 +162,9 @@ fi %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 5.0.4-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Tue Jan 17 2017 Remi Collet - 5.0.4-1 - update to 5.0.4 From 3923cad3accdec0c57e63305bcedf97a522f5847 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 17 Mar 2017 07:19:22 +0100 Subject: [PATCH 037/111] v5.0.5' --- .gitignore | 1 + php-bartlett-PHP-CompatInfo.spec | 18 ++++++++++++++---- sources | 2 +- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index dfcf2a0..2226020 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ clog /php-compat-info-5.0.2-49d6752.tar.gz /php-compat-info-5.0.3-8e875d5.tar.gz /php-compat-info-5.0.4-8a49d05.tar.gz +/php-compat-info-5.0.5-cbd0389.tar.gz diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index a708adb..05ba7f1 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit 8a49d050f417cf39325bc9170f101ed2a2fb9f2a +%global gh_commit cbd03899c8a48eb2f9274035c0770d83821905ab %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville @@ -16,9 +16,9 @@ %global with_tests %{?_without_tests:0}%{!?_without_tests:1} Name: php-bartlett-PHP-CompatInfo -Version: 5.0.4 +Version: 5.0.5 %global specrel 1 -Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}.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 Group: Development/Libraries @@ -139,7 +139,14 @@ install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name} mkdir vendor ln -s %{buildroot}%{_datadir}/php/Bartlett/CompatInfo/autoload.php vendor/ -%{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose + +ret=0 +for cmd in php php56 php70 php71; do + if which $cmd; then + $cmd %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose || ret=1 + fi +done +exit $ret %endif @@ -162,6 +169,9 @@ fi %changelog +* Fri Mar 17 2017 Remi Collet - 5.0.5-1 +- Update to 5.0.5 + * Sat Feb 11 2017 Fedora Release Engineering - 5.0.4-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 8dc5704..1d5658e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-compat-info-5.0.4-8a49d05.tar.gz) = 7478daff7a3708a43f04dcc63f74bc947f52c4e485a847ea87deb9a93f984938d7b82ad28a96ba6349dbc92054e8b946854400241413ebb1d7f8dd287afaec4b +SHA512 (php-compat-info-5.0.5-cbd0389.tar.gz) = 723cf06ebd8b952ddc205b27da4ff7cfb426edf1ee588fd34a07b291c132094a31264deb50b4a23db7de1f555419ba10ed0d1751e2f48f82d36e841d544fecd1 From abcab05db27441d647e86f3e73dccc6931508f7b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 27 Mar 2017 14:33:34 +0200 Subject: [PATCH 038/111] v5.0.6 --- .gitignore | 1 + php-bartlett-PHP-CompatInfo.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2226020..cd67449 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ clog /php-compat-info-5.0.3-8e875d5.tar.gz /php-compat-info-5.0.4-8a49d05.tar.gz /php-compat-info-5.0.5-cbd0389.tar.gz +/php-compat-info-5.0.6-3878275.tar.gz diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 05ba7f1..44301de 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit cbd03899c8a48eb2f9274035c0770d83821905ab +%global gh_commit 387827551032eda716e7a35f80a93a331fc724cc %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville @@ -16,7 +16,7 @@ %global with_tests %{?_without_tests:0}%{!?_without_tests:1} Name: php-bartlett-PHP-CompatInfo -Version: 5.0.5 +Version: 5.0.6 %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 @@ -169,6 +169,9 @@ fi %changelog +* Mon Mar 27 2017 Remi Collet - 5.0.6-1 +- Update to 5.0.6 + * Fri Mar 17 2017 Remi Collet - 5.0.5-1 - Update to 5.0.5 diff --git a/sources b/sources index 1d5658e..db188ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-compat-info-5.0.5-cbd0389.tar.gz) = 723cf06ebd8b952ddc205b27da4ff7cfb426edf1ee588fd34a07b291c132094a31264deb50b4a23db7de1f555419ba10ed0d1751e2f48f82d36e841d544fecd1 +SHA512 (php-compat-info-5.0.6-3878275.tar.gz) = 95dc0095c526274971e8e9951cb7bd0021776d82c9a6f4720c7e3ded8846d1dcfcc45c0b5ddc332fe4644f1af926fb8bce4367944ee435aa170a1498113c68a1 From 525e3a54bef8144b22a3190f08bc44a21b0363a4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 10 Jun 2017 11:01:18 +0200 Subject: [PATCH 039/111] v5.0.7 --- .gitignore | 1 + php-bartlett-PHP-CompatInfo.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index cd67449..881e615 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ clog /php-compat-info-5.0.4-8a49d05.tar.gz /php-compat-info-5.0.5-cbd0389.tar.gz /php-compat-info-5.0.6-3878275.tar.gz +/php-compat-info-5.0.7-1a615a1.tar.gz diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 44301de..92a7b5f 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit 387827551032eda716e7a35f80a93a331fc724cc +%global gh_commit 1a615a1da6ee539c6ce7444b85f764fe22e4194c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville @@ -16,7 +16,7 @@ %global with_tests %{?_without_tests:0}%{!?_without_tests:1} Name: php-bartlett-PHP-CompatInfo -Version: 5.0.6 +Version: 5.0.7 %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 @@ -141,7 +141,7 @@ ln -s %{buildroot}%{_datadir}/php/Bartlett/CompatInfo/autoload.php vendor/ ret=0 -for cmd in php php56 php70 php71; do +for cmd in php php56 php70 php71 php72; do if which $cmd; then $cmd %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose || ret=1 fi @@ -169,6 +169,9 @@ fi %changelog +* Sat Jun 10 2017 Remi Collet - 5.0.7-1 +- Update to 5.0.7 + * Mon Mar 27 2017 Remi Collet - 5.0.6-1 - Update to 5.0.6 diff --git a/sources b/sources index db188ee..54450a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-compat-info-5.0.6-3878275.tar.gz) = 95dc0095c526274971e8e9951cb7bd0021776d82c9a6f4720c7e3ded8846d1dcfcc45c0b5ddc332fe4644f1af926fb8bce4367944ee435aa170a1498113c68a1 +SHA512 (php-compat-info-5.0.7-1a615a1.tar.gz) = 6a9e992a51f829e6901899e3dda396bd48073b9ee93b149390329a12f44521714c5ad5486081abe10068c14b70cb9c3dc4e79ea3991f9c832ad8ea6523daf516 From 22d897422dcc0663c99512febe7d56a89a2d9109 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 07:26:30 +0000 Subject: [PATCH 040/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- php-bartlett-PHP-CompatInfo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 92a7b5f..a80bdc0 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -18,7 +18,7 @@ Name: php-bartlett-PHP-CompatInfo Version: 5.0.7 %global specrel 1 -Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} +Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}.1 Summary: Find out version and the extensions required for a piece of code to run Group: Development/Libraries @@ -169,6 +169,9 @@ fi %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 5.0.7-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Jun 10 2017 Remi Collet - 5.0.7-1 - Update to 5.0.7 From 1222269665a66da401cacfb137467167301725a5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 7 Aug 2017 09:04:34 +0200 Subject: [PATCH 041/111] v5.0.8 --- .gitignore | 1 + php-bartlett-PHP-CompatInfo.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 881e615..931ddaf 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ clog /php-compat-info-5.0.5-cbd0389.tar.gz /php-compat-info-5.0.6-3878275.tar.gz /php-compat-info-5.0.7-1a615a1.tar.gz +/php-compat-info-5.0.8-18913e8.tar.gz diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index a80bdc0..909fec1 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit 1a615a1da6ee539c6ce7444b85f764fe22e4194c +%global gh_commit 18913e8807d2ab02dea89b60e006ec395a131f0c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville @@ -16,9 +16,9 @@ %global with_tests %{?_without_tests:0}%{!?_without_tests:1} Name: php-bartlett-PHP-CompatInfo -Version: 5.0.7 +Version: 5.0.8 %global specrel 1 -Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}.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 Group: Development/Libraries @@ -56,7 +56,7 @@ BuildRequires: php-composer(fedora/autoloader) # "ext-pdo_sqlite": "*", # "symfony/console": "~2.5", # "bartlett/php-reflect": "~4.0", -# "bartlett/php-compatinfo-db": "~1.0" +# "bartlett/php-compatinfo-db": "~1.23" Requires: php(language) >= 5.4.0 Requires: php-cli Requires: php-json @@ -66,7 +66,7 @@ Requires: php-pdo_sqlite Requires: php-spl Requires: php-composer(bartlett/php-reflect) >= 4.0 Requires: php-composer(bartlett/php-reflect) < 5 -Requires: php-composer(bartlett/php-compatinfo-db) >= 1.15 +Requires: php-composer(bartlett/php-compatinfo-db) >= 1.23 Requires: php-composer(bartlett/php-compatinfo-db) < 2 Requires: php-composer(symfony/console) >= 2.5 Requires: php-composer(symfony/console) < 3 @@ -169,6 +169,9 @@ fi %changelog +* Mon Aug 7 2017 Remi Collet - 5.0.8-1 +- Update to 5.0.8 + * Thu Jul 27 2017 Fedora Release Engineering - 5.0.7-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index 54450a2..2a5c79b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-compat-info-5.0.7-1a615a1.tar.gz) = 6a9e992a51f829e6901899e3dda396bd48073b9ee93b149390329a12f44521714c5ad5486081abe10068c14b70cb9c3dc4e79ea3991f9c832ad8ea6523daf516 +SHA512 (php-compat-info-5.0.8-18913e8.tar.gz) = e8dec47646db29a222562c4ce9a8bde8cc1a114de7302ac511f1b1a98c74d7d353368b135f71bb9b86bddaf24e810dfc072e6103cf3cc5a68bbd06a0c13820d6 From a4524a321486d1acd4cc07a5f6bbf8bcae3fb279 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 6 Dec 2017 15:38:48 +0100 Subject: [PATCH 042/111] v5.0.9 --- .gitignore | 1 + php-bartlett-PHP-CompatInfo.spec | 25 ++++++++++++++----------- sources | 2 +- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 931ddaf..5352c1e 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ clog /php-compat-info-5.0.6-3878275.tar.gz /php-compat-info-5.0.7-1a615a1.tar.gz /php-compat-info-5.0.8-18913e8.tar.gz +/php-compat-info-5.0.9-23db55a.tar.gz diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 909fec1..782ab07 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit 18913e8807d2ab02dea89b60e006ec395a131f0c +%global gh_commit 23db55a1c8f8a078e691bc66524fcb73eabbcb2c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville @@ -16,7 +16,7 @@ %global with_tests %{?_without_tests:0}%{!?_without_tests:1} Name: php-bartlett-PHP-CompatInfo -Version: 5.0.8 +Version: 5.0.9 %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 @@ -55,8 +55,8 @@ BuildRequires: php-composer(fedora/autoloader) # "ext-json": "*", # "ext-pdo_sqlite": "*", # "symfony/console": "~2.5", -# "bartlett/php-reflect": "~4.0", -# "bartlett/php-compatinfo-db": "~1.23" +# "bartlett/php-reflect": "^4.0", +# "bartlett/php-compatinfo-db": "^1.23" Requires: php(language) >= 5.4.0 Requires: php-cli Requires: php-json @@ -71,13 +71,13 @@ Requires: php-composer(bartlett/php-compatinfo-db) < 2 Requires: php-composer(symfony/console) >= 2.5 Requires: php-composer(symfony/console) < 3 # From composer.json, "require-dev": { -# "doctrine/cache": "~1.3", -# "psr/log": "~1.0", -# "monolog/monolog": "~1.10", -# "bartlett/monolog-callbackfilterhandler": "~1.0", -# "bartlett/monolog-growlhandler": "~1.0", -# "bartlett/phpunit-loggertestlistener": "~1.5", -# "bartlett/umlwriter": "~1.0" +# "doctrine/cache": "^1.3", +# "psr/log": "^1.0", +# "monolog/monolog": "^1.10", +# "bartlett/monolog-callbackfilterhandler": "^1.0", +# "bartlett/monolog-growlhandler": "^1.0", +# "bartlett/phpunit-loggertestlistener": "^1.5", +# "bartlett/umlwriter": "^1.0" # From composer.json, "suggest" # "doctrine/cache": "Allow caching results, since bartlett/php-reflect 2.2", # "psr/log": "Allow logging events with the LogPlugin", @@ -169,6 +169,9 @@ fi %changelog +* Wed Dec 6 2017 Remi Collet - 5.0.9-1 +- Update to 5.0.9 + * Mon Aug 7 2017 Remi Collet - 5.0.8-1 - Update to 5.0.8 diff --git a/sources b/sources index 2a5c79b..28ba720 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-compat-info-5.0.8-18913e8.tar.gz) = e8dec47646db29a222562c4ce9a8bde8cc1a114de7302ac511f1b1a98c74d7d353368b135f71bb9b86bddaf24e810dfc072e6103cf3cc5a68bbd06a0c13820d6 +SHA512 (php-compat-info-5.0.9-23db55a.tar.gz) = 143acef028404a49c479ca1bfd3157ceecfdb29c019539bc0183aa361cb861c8220287fd79b832550cfc6a4f0f3bda2a228ba23d03a01baf6603f3c76fe8c6b5 From 01cbd870eab7e496fc9da777a7ed162f568487ed Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 12 Dec 2017 11:25:31 +0100 Subject: [PATCH 043/111] Update to 5.0.10 (no change) raise dependency on bartlett/php-reflect 4.2 only require a single Symfony version --- .gitignore | 1 + php-bartlett-PHP-CompatInfo.spec | 22 ++++++++++++++++------ sources | 2 +- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 5352c1e..eaa8de8 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ clog /php-compat-info-5.0.7-1a615a1.tar.gz /php-compat-info-5.0.8-18913e8.tar.gz /php-compat-info-5.0.9-23db55a.tar.gz +/php-compat-info-5.0.10-c2ba1ec.tar.gz diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 782ab07..eabeeab 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit 23db55a1c8f8a078e691bc66524fcb73eabbcb2c +%global gh_commit c2ba1eca8ec7927e01f0178095a63b7982326893 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville @@ -15,8 +15,14 @@ #global prever RC2 %global with_tests %{?_without_tests:0}%{!?_without_tests:1} +%if 0%{?fedora} >= 27 +%global sym_prefix php-symfony3 +%else +%global sym_prefix php-symfony +%endif + Name: php-bartlett-PHP-CompatInfo -Version: 5.0.9 +Version: 5.0.10 %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 @@ -41,7 +47,7 @@ BuildRequires: php(language) >= 5.4.0 # to run test suite BuildRequires: %{_bindir}/phpunit BuildRequires: php-pdo_sqlite -BuildRequires: php-composer(bartlett/php-reflect) >= 4.0 +BuildRequires: php-composer(bartlett/php-reflect) >= 4.2 BuildRequires: php-composer(bartlett/php-compatinfo-db) >= 1.15 # For our patch / autoloader BuildRequires: php-composer(fedora/autoloader) @@ -64,12 +70,11 @@ Requires: php-libxml Requires: php-pcre Requires: php-pdo_sqlite Requires: php-spl -Requires: php-composer(bartlett/php-reflect) >= 4.0 +Requires: php-composer(bartlett/php-reflect) >= 4.2 Requires: php-composer(bartlett/php-reflect) < 5 Requires: php-composer(bartlett/php-compatinfo-db) >= 1.23 Requires: php-composer(bartlett/php-compatinfo-db) < 2 -Requires: php-composer(symfony/console) >= 2.5 -Requires: php-composer(symfony/console) < 3 +Requires: %{sym_prefix}-console # From composer.json, "require-dev": { # "doctrine/cache": "^1.3", # "psr/log": "^1.0", @@ -169,6 +174,11 @@ fi %changelog +* Tue Dec 12 2017 Remi Collet - 5.0.10-1 +- Update to 5.0.10 (no change) +- raise dependency on bartlett/php-reflect 4.2 +- only require a single Symfony version + * Wed Dec 6 2017 Remi Collet - 5.0.9-1 - Update to 5.0.9 diff --git a/sources b/sources index 28ba720..3951a82 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-compat-info-5.0.9-23db55a.tar.gz) = 143acef028404a49c479ca1bfd3157ceecfdb29c019539bc0183aa361cb861c8220287fd79b832550cfc6a4f0f3bda2a228ba23d03a01baf6603f3c76fe8c6b5 +SHA512 (php-compat-info-5.0.10-c2ba1ec.tar.gz) = eb2643378625e1fd26e377ae65f15b80be2486dd60fa23e477e43c4d82edb6913fe07ccdf76686c8e3ef6eb0b0a8ec7ad4b65a697d4a1948dae906374e1cb01c From 572e15b6dcc3cd95b446147c9d27872eec0be7f4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 12 Dec 2017 14:35:56 +0100 Subject: [PATCH 044/111] Update to 5.0.11 (no change) raise dependency on PHP 5.5 --- .gitignore | 1 + php-bartlett-PHP-CompatInfo.spec | 18 +++++++++++------- sources | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index eaa8de8..198c938 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ clog /php-compat-info-5.0.8-18913e8.tar.gz /php-compat-info-5.0.9-23db55a.tar.gz /php-compat-info-5.0.10-c2ba1ec.tar.gz +/php-bartlett-PHP-CompatInfo-5.0.11-56a9f8b.tar.gz diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index eabeeab..cea40d2 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit c2ba1eca8ec7927e01f0178095a63b7982326893 +%global gh_commit 56a9f8bcfa63651d5752659447d6145cfa296a3e %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville @@ -22,7 +22,7 @@ %endif Name: php-bartlett-PHP-CompatInfo -Version: 5.0.10 +Version: 5.0.11 %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 @@ -30,7 +30,7 @@ Summary: Find out version and the extensions required for a piece of code Group: Development/Libraries License: BSD URL: http://php5.laurent-laville.org/compatinfo/ -Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}%{?prever}-%{gh_short}.tar.gz +Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}%{?prever}-%{gh_short}.tar.gz # Script for fedora-review Source1: fedora-review-check @@ -42,7 +42,7 @@ Source2: %{name}-5.0.0-autoload.php Patch0: %{name}-5.0.0-rpm.patch BuildArch: noarch -BuildRequires: php(language) >= 5.4.0 +BuildRequires: php(language) >= 5.5 %if %{with_tests} # to run test suite BuildRequires: %{_bindir}/phpunit @@ -54,16 +54,16 @@ BuildRequires: php-composer(fedora/autoloader) %endif # From composer.json, "require" -# "php": ">=5.4.0", +# "php": ">=5.5", # "ext-libxml": "*", # "ext-pcre": "*", # "ext-spl": "*", # "ext-json": "*", # "ext-pdo_sqlite": "*", # "symfony/console": "~2.5", -# "bartlett/php-reflect": "^4.0", +# "bartlett/php-reflect": "^4.2", # "bartlett/php-compatinfo-db": "^1.23" -Requires: php(language) >= 5.4.0 +Requires: php(language) >= 5.5 Requires: php-cli Requires: php-json Requires: php-libxml @@ -174,6 +174,10 @@ fi %changelog +* Tue Dec 12 2017 Remi Collet - 5.0.11-1 +- Update to 5.0.11 (no change) +- raise dependency on PHP 5.5 + * Tue Dec 12 2017 Remi Collet - 5.0.10-1 - Update to 5.0.10 (no change) - raise dependency on bartlett/php-reflect 4.2 diff --git a/sources b/sources index 3951a82..9b6d990 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-compat-info-5.0.10-c2ba1ec.tar.gz) = eb2643378625e1fd26e377ae65f15b80be2486dd60fa23e477e43c4d82edb6913fe07ccdf76686c8e3ef6eb0b0a8ec7ad4b65a697d4a1948dae906374e1cb01c +SHA512 (php-bartlett-PHP-CompatInfo-5.0.11-56a9f8b.tar.gz) = bb8a7bc35f67142033aa5f6a929b64b652a1200167a1db6c643369252edaabe87b9b25d4b5d8449ea3301aacf5d8be12d8f8e5792910235ecef54d5ecad7d074 From 3eaf79c210437470f0abc3c3a30830d78db2aba8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 2 Feb 2018 07:25:50 +0100 Subject: [PATCH 045/111] Update to 5.0.12 (no change) use range dependency on F27+ --- .gitignore | 1 + php-bartlett-PHP-CompatInfo.spec | 34 ++++++++++++++++++++++++-------- sources | 2 +- 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 198c938..3145d40 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ clog /php-compat-info-5.0.9-23db55a.tar.gz /php-compat-info-5.0.10-c2ba1ec.tar.gz /php-bartlett-PHP-CompatInfo-5.0.11-56a9f8b.tar.gz +/php-bartlett-PHP-CompatInfo-5.0.12-ecf11cf.tar.gz diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index cea40d2..8f2d80f 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -6,8 +6,12 @@ # # Please, preserve the changelog entries # + +# For compatibility with SCL +%undefine __brp_mangle_shebangs + %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit 56a9f8bcfa63651d5752659447d6145cfa296a3e +%global gh_commit ecf11cf73912e56cc91814b540e4789cdc8739c6 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville @@ -22,7 +26,7 @@ %endif Name: php-bartlett-PHP-CompatInfo -Version: 5.0.11 +Version: 5.0.12 %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 @@ -47,8 +51,15 @@ BuildRequires: php(language) >= 5.5 # to run test suite BuildRequires: %{_bindir}/phpunit BuildRequires: php-pdo_sqlite +%if 0%{?fedora} >= 27 +BuildRequires: (php-composer(bartlett/php-reflect) >= 4.2 with php-composer(bartlett/php-reflect) < 5) +BuildRequires: (php-composer(bartlett/php-compatinfo-db) >= 1.23 with php-composer(bartlett/php-compatinfo-db) < 2) +%else +BuildRequires: php-composer(bartlett/php-reflect) < 5 BuildRequires: php-composer(bartlett/php-reflect) >= 4.2 -BuildRequires: php-composer(bartlett/php-compatinfo-db) >= 1.15 +BuildRequires: php-composer(bartlett/php-compatinfo-db) < 2 +BuildRequires: php-composer(bartlett/php-compatinfo-db) >= 1.23 +%endif # For our patch / autoloader BuildRequires: php-composer(fedora/autoloader) %endif @@ -60,7 +71,6 @@ BuildRequires: php-composer(fedora/autoloader) # "ext-spl": "*", # "ext-json": "*", # "ext-pdo_sqlite": "*", -# "symfony/console": "~2.5", # "bartlett/php-reflect": "^4.2", # "bartlett/php-compatinfo-db": "^1.23" Requires: php(language) >= 5.5 @@ -70,11 +80,15 @@ Requires: php-libxml Requires: php-pcre Requires: php-pdo_sqlite Requires: php-spl -Requires: php-composer(bartlett/php-reflect) >= 4.2 +%if 0%{?fedora} >= 27 +Requires: (php-composer(bartlett/php-reflect) >= 4.2 with php-composer(bartlett/php-reflect) < 5) +Requires: (php-composer(bartlett/php-compatinfo-db) >= 1.23 with php-composer(bartlett/php-compatinfo-db) < 2) +%else Requires: php-composer(bartlett/php-reflect) < 5 -Requires: php-composer(bartlett/php-compatinfo-db) >= 1.23 +Requires: php-composer(bartlett/php-reflect) >= 4.2 Requires: php-composer(bartlett/php-compatinfo-db) < 2 -Requires: %{sym_prefix}-console +Requires: php-composer(bartlett/php-compatinfo-db) >= 1.23 +%endif # From composer.json, "require-dev": { # "doctrine/cache": "^1.3", # "psr/log": "^1.0", @@ -146,7 +160,7 @@ ln -s %{buildroot}%{_datadir}/php/Bartlett/CompatInfo/autoload.php vendor/ ret=0 -for cmd in php php56 php70 php71 php72; do +for cmd in php php70 php71 php72; do if which $cmd; then $cmd %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose || ret=1 fi @@ -174,6 +188,10 @@ fi %changelog +* Fri Feb 2 2018 Remi Collet - 5.0.12-1 +- Update to 5.0.12 (no change) +- use range dependency on F27+ + * Tue Dec 12 2017 Remi Collet - 5.0.11-1 - Update to 5.0.11 (no change) - raise dependency on PHP 5.5 diff --git a/sources b/sources index 9b6d990..45171fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-5.0.11-56a9f8b.tar.gz) = bb8a7bc35f67142033aa5f6a929b64b652a1200167a1db6c643369252edaabe87b9b25d4b5d8449ea3301aacf5d8be12d8f8e5792910235ecef54d5ecad7d074 +SHA512 (php-bartlett-PHP-CompatInfo-5.0.12-ecf11cf.tar.gz) = 22dc32283fb5bffa3eb6e77df578e8c0f5d6f0c57da6ea1a9fecd7925b06a5b94f5764629e3ba3e163f1187bae21fbbd737af4fde71d90efe0c7dac4dbd218bb From 03295182567ecea097df9c3419127f0958c05926 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 03:04:19 +0000 Subject: [PATCH 046/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-bartlett-PHP-CompatInfo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 8f2d80f..483acab 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -28,7 +28,7 @@ Name: php-bartlett-PHP-CompatInfo Version: 5.0.12 %global specrel 1 -Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} +Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}.1 Summary: Find out version and the extensions required for a piece of code to run Group: Development/Libraries @@ -188,6 +188,9 @@ fi %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 5.0.12-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Fri Feb 2 2018 Remi Collet - 5.0.12-1 - Update to 5.0.12 (no change) - use range dependency on F27+ From 20f04e21b33092c24b547ac5f16853ed8412fd64 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 21:12:27 +0000 Subject: [PATCH 047/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-bartlett-PHP-CompatInfo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 483acab..844b4cd 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -28,7 +28,7 @@ Name: php-bartlett-PHP-CompatInfo Version: 5.0.12 %global specrel 1 -Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}.1 +Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}.2 Summary: Find out version and the extensions required for a piece of code to run Group: Development/Libraries @@ -188,6 +188,9 @@ fi %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 5.0.12-1.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 5.0.12-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From f43091172ec51ed8f152f1ad6c7375250acff58c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 28 Nov 2018 09:25:40 +0100 Subject: [PATCH 048/111] update to 5.1.0 raise dependency on bartlett/php-reflect 4.3 add explicit dependency on nikic/php-parser add explicit dependency on doctrine/cache add dependency on psr/log switch to phpunit7 --- .gitignore | 1 + ...bartlett-PHP-CompatInfo-5.1.0-autoload.php | 6 ++ ...hp-bartlett-PHP-CompatInfo-5.1.0-rpm.patch | 30 +++----- php-bartlett-PHP-CompatInfo.spec | 74 +++++++++---------- sources | 2 +- 5 files changed, 54 insertions(+), 59 deletions(-) rename php-bartlett-PHP-CompatInfo-5.0.0-autoload.php => php-bartlett-PHP-CompatInfo-5.1.0-autoload.php (60%) rename php-bartlett-PHP-CompatInfo-5.0.0-rpm.patch => php-bartlett-PHP-CompatInfo-5.1.0-rpm.patch (68%) diff --git a/.gitignore b/.gitignore index 3145d40..29c8457 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ clog /php-compat-info-5.0.10-c2ba1ec.tar.gz /php-bartlett-PHP-CompatInfo-5.0.11-56a9f8b.tar.gz /php-bartlett-PHP-CompatInfo-5.0.12-ecf11cf.tar.gz +/php-bartlett-PHP-CompatInfo-5.1.0-e1239c5.tar.gz diff --git a/php-bartlett-PHP-CompatInfo-5.0.0-autoload.php b/php-bartlett-PHP-CompatInfo-5.1.0-autoload.php similarity index 60% rename from php-bartlett-PHP-CompatInfo-5.0.0-autoload.php rename to php-bartlett-PHP-CompatInfo-5.1.0-autoload.php index 4297383..61e455b 100644 --- a/php-bartlett-PHP-CompatInfo-5.0.0-autoload.php +++ b/php-bartlett-PHP-CompatInfo-5.1.0-autoload.php @@ -9,5 +9,11 @@ require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Dependencies::required(array( '/usr/share/php/Bartlett/Reflect/autoload.php', '/usr/share/php/Bartlett/CompatInfoDb/autoload.php', + '/usr/share/php/PhpParser3/autoload.php', + '/usr/share/php/Psr/Log/autoload.php', + '/usr/share/php/Doctrine/Common/Cache/autoload.php', +)); +\Fedora\Autoloader\Dependencies::optional(array( + '/usr/share/php/Monolog/autoload.php', )); diff --git a/php-bartlett-PHP-CompatInfo-5.0.0-rpm.patch b/php-bartlett-PHP-CompatInfo-5.1.0-rpm.patch similarity index 68% rename from php-bartlett-PHP-CompatInfo-5.0.0-rpm.patch rename to php-bartlett-PHP-CompatInfo-5.1.0-rpm.patch index 55a4c09..d8a8fb7 100644 --- a/php-bartlett-PHP-CompatInfo-5.0.0-rpm.patch +++ b/php-bartlett-PHP-CompatInfo-5.1.0-rpm.patch @@ -1,6 +1,6 @@ diff -up ./bin/phpcompatinfo.json.dist.rpm ./bin/phpcompatinfo.json.dist ---- ./bin/phpcompatinfo.json.dist.rpm 2015-12-05 10:11:45.000000000 +0100 -+++ ./bin/phpcompatinfo.json.dist 2015-12-07 09:08:39.785273332 +0100 +--- ./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 @@ } ], @@ -22,9 +22,9 @@ diff -up ./bin/phpcompatinfo.json.dist.rpm ./bin/phpcompatinfo.json.dist "analysers" : [ ], diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo ---- ./bin/phpcompatinfo.rpm 2015-12-05 10:11:45.000000000 +0100 -+++ ./bin/phpcompatinfo 2015-12-07 09:14:17.072783363 +0100 -@@ -1,52 +1,21 @@ +--- ./bin/phpcompatinfo.rpm 2018-11-28 08:53:47.258278539 +0100 ++++ ./bin/phpcompatinfo 2018-11-28 08:55:38.807878501 +0100 +@@ -1,40 +1,22 @@ #!/usr/bin/env php setUseIncludePath(true); -- --if (\Phar::running()) { -- if ($home) { -- // when optional resources are not embedded in phar distribution, -- // avoid PHP Warnings, and lookup first in global vendor dir (COMPOSER_HOME) if exists -- $classMapfiltered = $fallbackClassMap($loader->getClassMap(), 'Net_Growl'); -- $loader->addClassMap($classMapfiltered); -- -- // try to find PEAR Net_Growl classes package in folder $fallbackNetGrowlDir (see phar-stub.php) -- $loader->add(false, $fallbackNetGrowlDir); -- } +require_once $vendorDir . '/Bartlett/CompatInfo/autoload.php'; ++ +if (!getenv("BARTLETTRC")) { + putenv("BARTLETTRC=" . strtolower($appName) . '.json'); } +-$loader = require_once $vendorDir . '/autoload.php'; +-$loader->setUseIncludePath(true); if (PHP_SAPI !== 'cli') { return; @@ -79,7 +68,6 @@ diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo Environment::setScanDir(); --$application = new Application($appName, '5.0'); +-$application = new Application($appName, '5.1'); +$application = new Application($appName, '@package_version@'); $application->run(); - diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 844b4cd..6822d98 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 ecf11cf73912e56cc91814b540e4789cdc8739c6 +%global gh_commit e1239c5433be4a121ade2ab5aec9bb81faae7134 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville @@ -26,9 +26,9 @@ %endif Name: php-bartlett-PHP-CompatInfo -Version: 5.0.12 +Version: 5.1.0 %global specrel 1 -Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}.2 +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 Group: Development/Libraries @@ -40,39 +40,38 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit Source1: fedora-review-check # Autoloader for RPM - die composer ! -Source2: %{name}-5.0.0-autoload.php +Source2: %{name}-5.1.0-autoload.php # Autoload and sqlite database path -Patch0: %{name}-5.0.0-rpm.patch +Patch0: %{name}-5.1.0-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 5.5 %if %{with_tests} # to run test suite -BuildRequires: %{_bindir}/phpunit BuildRequires: php-pdo_sqlite -%if 0%{?fedora} >= 27 -BuildRequires: (php-composer(bartlett/php-reflect) >= 4.2 with php-composer(bartlett/php-reflect) < 5) -BuildRequires: (php-composer(bartlett/php-compatinfo-db) >= 1.23 with php-composer(bartlett/php-compatinfo-db) < 2) -%else -BuildRequires: php-composer(bartlett/php-reflect) < 5 -BuildRequires: php-composer(bartlett/php-reflect) >= 4.2 -BuildRequires: php-composer(bartlett/php-compatinfo-db) < 2 -BuildRequires: php-composer(bartlett/php-compatinfo-db) >= 1.23 -%endif +%global phpunit %{_bindir}/phpunit7 +BuildRequires: (php-composer(bartlett/php-reflect) >= 4.3 with php-composer(bartlett/php-reflect) < 5) +BuildRequires: (php-composer(nikic/php-parser) >= 3.1 with php-composer(nikic/php-parser) < 4) +BuildRequires: (php-composer(bartlett/php-compatinfo-db) >= 1.23 with php-composer(bartlett/php-compatinfo-db) < 2) +BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) +Requires: (php-composer(doctrine/cache) >= 1.3 with php-composer(doctrine/cache) < 2) +BuildRequires: %{phpunit} # For our patch / autoloader BuildRequires: php-composer(fedora/autoloader) %endif # From composer.json, "require" -# "php": ">=5.5", +# "php": "^5.5|^7.0", # "ext-libxml": "*", # "ext-pcre": "*", # "ext-spl": "*", # "ext-json": "*", # "ext-pdo_sqlite": "*", -# "bartlett/php-reflect": "^4.2", -# "bartlett/php-compatinfo-db": "^1.23" +# "bartlett/php-reflect": "^4.3", +# "nikic/php-parser": "^3.1", +# "bartlett/php-compatinfo-db": "^1.23", +# "psr/log": "^1.0" Requires: php(language) >= 5.5 Requires: php-cli Requires: php-json @@ -80,26 +79,16 @@ Requires: php-libxml Requires: php-pcre Requires: php-pdo_sqlite Requires: php-spl -%if 0%{?fedora} >= 27 -Requires: (php-composer(bartlett/php-reflect) >= 4.2 with php-composer(bartlett/php-reflect) < 5) -Requires: (php-composer(bartlett/php-compatinfo-db) >= 1.23 with php-composer(bartlett/php-compatinfo-db) < 2) -%else -Requires: php-composer(bartlett/php-reflect) < 5 -Requires: php-composer(bartlett/php-reflect) >= 4.2 -Requires: php-composer(bartlett/php-compatinfo-db) < 2 -Requires: php-composer(bartlett/php-compatinfo-db) >= 1.23 -%endif +Requires: (php-composer(bartlett/php-reflect) >= 4.3 with php-composer(bartlett/php-reflect) < 5) +Requires: (php-composer(nikic/php-parser) >= 3.1 with php-composer(nikic/php-parser) < 4) +Requires: (php-composer(bartlett/php-compatinfo-db) >= 1.23 with php-composer(bartlett/php-compatinfo-db) < 2) +Requires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) +# Mandatory for our patch +Requires: (php-composer(doctrine/cache) >= 1.3 with php-composer(doctrine/cache) < 2) # From composer.json, "require-dev": { -# "doctrine/cache": "^1.3", -# "psr/log": "^1.0", # "monolog/monolog": "^1.10", -# "bartlett/monolog-callbackfilterhandler": "^1.0", -# "bartlett/monolog-growlhandler": "^1.0", -# "bartlett/phpunit-loggertestlistener": "^1.5", -# "bartlett/umlwriter": "^1.0" # From composer.json, "suggest" # "doctrine/cache": "Allow caching results, since bartlett/php-reflect 2.2", -# "psr/log": "Allow logging events with the LogPlugin", # "monolog/monolog": "Allow logging events with the LogPlugin", # "bartlett/monolog-callbackfilterhandler": "Advanced filtering strategies for Monolog", # "bartlett/monolog-growlhandler": "Sends notifications to Growl for Monolog", @@ -107,6 +96,7 @@ Requires: php-composer(bartlett/php-compatinfo-db) >= 1.23 # "bartlett/umlwriter": "Allow writing UML class diagrams (Graphviz or PlantUML)" # "doctrine/cache": "Allow caching results, since bartlett/php-reflect 2.2" # "bartlett/umlwriter": "Allow writing UML class diagrams (Graphviz or PlantUML)" +Suggests: php-composer(monolog/monolog) # Required by autoloader Requires: php-composer(fedora/autoloader) @@ -160,9 +150,11 @@ ln -s %{buildroot}%{_datadir}/php/Bartlett/CompatInfo/autoload.php vendor/ ret=0 -for cmd in php php70 php71 php72; do - if which $cmd; then - $cmd %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose || ret=1 +for cmdarg in "php %{phpunit}" "php70 %{_bindir}/phpunit" php71 php72 php73; do + if which $cmdarg; then + set $cmdarg + $1 ${2:-%{_bindir}/phpunit7} \ + --include-path %{buildroot}%{_datadir}/php --verbose || ret=1 fi done exit $ret @@ -188,6 +180,14 @@ fi %changelog +* Wed Nov 28 2018 Remi Collet - 5.1.0-1 +- update to 5.1.0 +- raise dependency on bartlett/php-reflect 4.3 +- add explicit dependency on nikic/php-parser +- add explicit dependency on doctrine/cache +- add dependency on psr/log +- switch to phpunit7 + * Fri Jul 13 2018 Fedora Release Engineering - 5.0.12-1.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 45171fa..8f09d87 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-5.0.12-ecf11cf.tar.gz) = 22dc32283fb5bffa3eb6e77df578e8c0f5d6f0c57da6ea1a9fecd7925b06a5b94f5764629e3ba3e163f1187bae21fbbd737af4fde71d90efe0c7dac4dbd218bb +SHA512 (php-bartlett-PHP-CompatInfo-5.1.0-e1239c5.tar.gz) = 54a4f106b230ed84e8a219e3471232ac94bf141c789c338e3d6fb297dad24c9a60be66a97cdeefec96d4ab091a2d788a9ecbb0a73ab56e6e52a1c3a827a846c5 From 056fa8b3d27765f4f5b71f84052534f1d331ea09 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:10 +0100 Subject: [PATCH 049/111] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- php-bartlett-PHP-CompatInfo.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 6822d98..09ec037 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -31,7 +31,6 @@ Version: 5.1.0 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 -Group: Development/Libraries License: BSD URL: http://php5.laurent-laville.org/compatinfo/ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}%{?prever}-%{gh_short}.tar.gz From 4a6b07ae2baeda72dcc3ff63c5998bdf88ed4dd6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 02:16:02 +0000 Subject: [PATCH 050/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-bartlett-PHP-CompatInfo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 09ec037..fd6b77f 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -28,7 +28,7 @@ Name: php-bartlett-PHP-CompatInfo Version: 5.1.0 %global specrel 1 -Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} +Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}.1 Summary: Find out version and the extensions required for a piece of code to run License: BSD @@ -179,6 +179,9 @@ fi %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 5.1.0-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Wed Nov 28 2018 Remi Collet - 5.1.0-1 - update to 5.1.0 - raise dependency on bartlett/php-reflect 4.3 From 5d9ff078445c87c7edc8561c7e74c7a57977bb3f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 4 Jun 2019 11:39:12 +0200 Subject: [PATCH 051/111] update to 5.2.0 allow bartlett/php-compatinfo-db v2 --- .gitignore | 1 + php-bartlett-PHP-CompatInfo.spec | 24 +++++++++++++++--------- sources | 2 +- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 29c8457..e75c1d7 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ clog /php-bartlett-PHP-CompatInfo-5.0.11-56a9f8b.tar.gz /php-bartlett-PHP-CompatInfo-5.0.12-ecf11cf.tar.gz /php-bartlett-PHP-CompatInfo-5.1.0-e1239c5.tar.gz +/php-bartlett-PHP-CompatInfo-5.2.0-b54d109.tar.gz diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index fd6b77f..cfd647a 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-bartlett-PHP-CompatInfo # -# Copyright (c) 2011-2017 Remi Collet +# Copyright (c) 2011-2019 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -11,7 +11,7 @@ %undefine __brp_mangle_shebangs %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit e1239c5433be4a121ade2ab5aec9bb81faae7134 +%global gh_commit b54d10946b0f10d67be0faffb5dee24d687effd3 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville @@ -19,16 +19,16 @@ #global prever RC2 %global with_tests %{?_without_tests:0}%{!?_without_tests:1} -%if 0%{?fedora} >= 27 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 %global sym_prefix php-symfony3 %else %global sym_prefix php-symfony %endif Name: php-bartlett-PHP-CompatInfo -Version: 5.1.0 +Version: 5.2.0 %global specrel 1 -Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}.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 License: BSD @@ -52,7 +52,7 @@ BuildRequires: php-pdo_sqlite %global phpunit %{_bindir}/phpunit7 BuildRequires: (php-composer(bartlett/php-reflect) >= 4.3 with php-composer(bartlett/php-reflect) < 5) BuildRequires: (php-composer(nikic/php-parser) >= 3.1 with php-composer(nikic/php-parser) < 4) -BuildRequires: (php-composer(bartlett/php-compatinfo-db) >= 1.23 with php-composer(bartlett/php-compatinfo-db) < 2) +BuildRequires: (php-composer(bartlett/php-compatinfo-db) >= 1.23 with php-composer(bartlett/php-compatinfo-db) < 3) BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) Requires: (php-composer(doctrine/cache) >= 1.3 with php-composer(doctrine/cache) < 2) BuildRequires: %{phpunit} @@ -66,21 +66,23 @@ BuildRequires: php-composer(fedora/autoloader) # "ext-pcre": "*", # "ext-spl": "*", # "ext-json": "*", +# "ext-pdo": "*", # "ext-pdo_sqlite": "*", # "bartlett/php-reflect": "^4.3", # "nikic/php-parser": "^3.1", -# "bartlett/php-compatinfo-db": "^1.23", +# "bartlett/php-compatinfo-db": "^1.23|^2.0", # "psr/log": "^1.0" Requires: php(language) >= 5.5 Requires: php-cli Requires: php-json Requires: php-libxml Requires: php-pcre +Requires: php-pdo Requires: php-pdo_sqlite Requires: php-spl Requires: (php-composer(bartlett/php-reflect) >= 4.3 with php-composer(bartlett/php-reflect) < 5) Requires: (php-composer(nikic/php-parser) >= 3.1 with php-composer(nikic/php-parser) < 4) -Requires: (php-composer(bartlett/php-compatinfo-db) >= 1.23 with php-composer(bartlett/php-compatinfo-db) < 2) +Requires: (php-composer(bartlett/php-compatinfo-db) >= 1.23 with php-composer(bartlett/php-compatinfo-db) < 3) Requires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) # Mandatory for our patch Requires: (php-composer(doctrine/cache) >= 1.3 with php-composer(doctrine/cache) < 2) @@ -149,7 +151,7 @@ ln -s %{buildroot}%{_datadir}/php/Bartlett/CompatInfo/autoload.php vendor/ ret=0 -for cmdarg in "php %{phpunit}" "php70 %{_bindir}/phpunit" php71 php72 php73; do +for cmdarg in "php %{phpunit}" "php70 %{_bindir}/phpunit" php71 php72 php73 php74; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit7} \ @@ -179,6 +181,10 @@ fi %changelog +* Mon Jun 3 2019 Remi Collet - 5.2.0-1 +- update to 5.2.0 +- allow bartlett/php-compatinfo-db v2 + * Sat Feb 02 2019 Fedora Release Engineering - 5.1.0-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 8f09d87..8f79902 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-5.1.0-e1239c5.tar.gz) = 54a4f106b230ed84e8a219e3471232ac94bf141c789c338e3d6fb297dad24c9a60be66a97cdeefec96d4ab091a2d788a9ecbb0a73ab56e6e52a1c3a827a846c5 +SHA512 (php-bartlett-PHP-CompatInfo-5.2.0-b54d109.tar.gz) = 8c584d23159664c2cb998e96d52b4b272d83c732d5a693125e809b971d5a1d1579f5cd74c0d6b70911b7db10b37e3dd4c641c72b662b9a9dac0fc8c4782657d6 From beed0635f4c5bfa41e50240452bfe716a57c7b7f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 08:43:32 +0000 Subject: [PATCH 052/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-bartlett-PHP-CompatInfo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index cfd647a..7381842 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -28,7 +28,7 @@ Name: php-bartlett-PHP-CompatInfo Version: 5.2.0 %global specrel 1 -Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} +Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}.1 Summary: Find out version and the extensions required for a piece of code to run License: BSD @@ -181,6 +181,9 @@ fi %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 5.2.0-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Mon Jun 3 2019 Remi Collet - 5.2.0-1 - update to 5.2.0 - allow bartlett/php-compatinfo-db v2 From 576467e8e23fed836775a987b3b4e9f8c0019be5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 22 Oct 2019 14:44:14 +0200 Subject: [PATCH 053/111] update to 5.2.1 (no change) --- .gitignore | 1 + ...ch => php-bartlett-PHP-CompatInfo-5.2.1-rpm.patch | 8 +++++--- php-bartlett-PHP-CompatInfo.spec | 12 +++++++----- sources | 2 +- 4 files changed, 14 insertions(+), 9 deletions(-) rename php-bartlett-PHP-CompatInfo-5.1.0-rpm.patch => php-bartlett-PHP-CompatInfo-5.2.1-rpm.patch (91%) diff --git a/.gitignore b/.gitignore index e75c1d7..fa9b261 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ clog /php-bartlett-PHP-CompatInfo-5.0.12-ecf11cf.tar.gz /php-bartlett-PHP-CompatInfo-5.1.0-e1239c5.tar.gz /php-bartlett-PHP-CompatInfo-5.2.0-b54d109.tar.gz +/php-bartlett-PHP-CompatInfo-5.2.1-287d879.tar.gz diff --git a/php-bartlett-PHP-CompatInfo-5.1.0-rpm.patch b/php-bartlett-PHP-CompatInfo-5.2.1-rpm.patch similarity index 91% rename from php-bartlett-PHP-CompatInfo-5.1.0-rpm.patch rename to php-bartlett-PHP-CompatInfo-5.2.1-rpm.patch index d8a8fb7..e7ed3f5 100644 --- a/php-bartlett-PHP-CompatInfo-5.1.0-rpm.patch +++ b/php-bartlett-PHP-CompatInfo-5.2.1-rpm.patch @@ -24,7 +24,7 @@ diff -up ./bin/phpcompatinfo.json.dist.rpm ./bin/phpcompatinfo.json.dist 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,40 +1,22 @@ +@@ -1,42 +1,22 @@ #!/usr/bin/env php run(); diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 7381842..35c8a9d 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 b54d10946b0f10d67be0faffb5dee24d687effd3 +%global gh_commit 287d879f1b85f49faffdca89088a6b7bffb535d9 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville @@ -26,9 +26,9 @@ %endif Name: php-bartlett-PHP-CompatInfo -Version: 5.2.0 +Version: 5.2.1 %global specrel 1 -Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}.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 License: BSD @@ -42,7 +42,7 @@ Source1: fedora-review-check Source2: %{name}-5.1.0-autoload.php # Autoload and sqlite database path -Patch0: %{name}-5.1.0-rpm.patch +Patch0: %{name}-5.2.1-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 5.5 @@ -170,7 +170,6 @@ fi %files -%{!?_licensedir:%global license %%doc} %license LICENSE %doc composer.json README.* %config(noreplace) %{_sysconfdir}/phpcompatinfo.json @@ -181,6 +180,9 @@ fi %changelog +* Tue Oct 22 2019 Remi Collet - 5.2.1-1 +- update to 5.2.1 (no change) + * Fri Jul 26 2019 Fedora Release Engineering - 5.2.0-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 8f79902..62862d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-5.2.0-b54d109.tar.gz) = 8c584d23159664c2cb998e96d52b4b272d83c732d5a693125e809b971d5a1d1579f5cd74c0d6b70911b7db10b37e3dd4c641c72b662b9a9dac0fc8c4782657d6 +SHA512 (php-bartlett-PHP-CompatInfo-5.2.1-287d879.tar.gz) = 13f79718b43fcaa261162684c0bed989f1880cb43670ac7a4216ae190f02accf59ceab5759ab3d100d5245f6728ae1aff9428ee407f2d47912e6c9aa8f30f91a From 2dacad8a2ad5f94d8a217463fdaa14bfe2663e2b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 06:51:45 +0000 Subject: [PATCH 054/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-bartlett-PHP-CompatInfo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 35c8a9d..8d09b3a 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -28,7 +28,7 @@ Name: php-bartlett-PHP-CompatInfo Version: 5.2.1 %global specrel 1 -Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} +Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}.1 Summary: Find out version and the extensions required for a piece of code to run License: BSD @@ -180,6 +180,9 @@ fi %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 5.2.1-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Oct 22 2019 Remi Collet - 5.2.1-1 - update to 5.2.1 (no change) From 47b698a1187858664bcdc68d53a5ae3643576ea4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 29 Apr 2020 11:26:37 +0200 Subject: [PATCH 055/111] v5.2.3 --- .gitignore | 1 + ... => php-bartlett-PHP-CompatInfo-5.2.3-rpm.patch | 2 +- php-bartlett-PHP-CompatInfo.spec | 14 ++++++++------ sources | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) rename php-bartlett-PHP-CompatInfo-5.2.1-rpm.patch => php-bartlett-PHP-CompatInfo-5.2.3-rpm.patch (97%) diff --git a/.gitignore b/.gitignore index fa9b261..31b2904 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ clog /php-bartlett-PHP-CompatInfo-5.1.0-e1239c5.tar.gz /php-bartlett-PHP-CompatInfo-5.2.0-b54d109.tar.gz /php-bartlett-PHP-CompatInfo-5.2.1-287d879.tar.gz +/php-bartlett-PHP-CompatInfo-5.2.3-ec29a4e.tar.gz diff --git a/php-bartlett-PHP-CompatInfo-5.2.1-rpm.patch b/php-bartlett-PHP-CompatInfo-5.2.3-rpm.patch similarity index 97% rename from php-bartlett-PHP-CompatInfo-5.2.1-rpm.patch rename to php-bartlett-PHP-CompatInfo-5.2.3-rpm.patch index e7ed3f5..5b6798e 100644 --- a/php-bartlett-PHP-CompatInfo-5.2.1-rpm.patch +++ b/php-bartlett-PHP-CompatInfo-5.2.3-rpm.patch @@ -70,6 +70,6 @@ diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo Environment::setScanDir(); --$application = new Application($appName, '5.2.1'); +-$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 8d09b3a..03e2403 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 287d879f1b85f49faffdca89088a6b7bffb535d9 +%global gh_commit ec29a4eea541d3bfdbf00b6ff85700dd926bf6b6 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville @@ -26,9 +26,9 @@ %endif Name: php-bartlett-PHP-CompatInfo -Version: 5.2.1 +Version: 5.2.3 %global specrel 1 -Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}.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 License: BSD @@ -42,7 +42,7 @@ Source1: fedora-review-check Source2: %{name}-5.1.0-autoload.php # Autoload and sqlite database path -Patch0: %{name}-5.2.1-rpm.patch +Patch0: %{name}-5.2.3-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 5.5 @@ -116,7 +116,6 @@ Documentation: http://php5.laurent-laville.org/compatinfo/manual/current/en/ %prep %setup -q -n %{gh_project}-%{gh_commit} -#setup -q -n %{gh_project}-%{version} %patch0 -p1 -b .rpm cp %{SOURCE2} src/Bartlett/CompatInfo/autoload.php @@ -151,7 +150,7 @@ ln -s %{buildroot}%{_datadir}/php/Bartlett/CompatInfo/autoload.php vendor/ ret=0 -for cmdarg in "php %{phpunit}" "php70 %{_bindir}/phpunit" php71 php72 php73 php74; do +for cmdarg in "php %{phpunit}" php72 php73 php74 php80; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit7} \ @@ -180,6 +179,9 @@ fi %changelog +* Wed Apr 29 2020 Remi Collet - 5.2.3-1 +- update to 5.2.3 + * Thu Jan 30 2020 Fedora Release Engineering - 5.2.1-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 62862d3..088b567 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-5.2.1-287d879.tar.gz) = 13f79718b43fcaa261162684c0bed989f1880cb43670ac7a4216ae190f02accf59ceab5759ab3d100d5245f6728ae1aff9428ee407f2d47912e6c9aa8f30f91a +SHA512 (php-bartlett-PHP-CompatInfo-5.2.3-ec29a4e.tar.gz) = c8312894b88730a63bbb732a878fa7e3102782ab3227483bdf386a6ad0a77d5dca57ebaa1c4f1f3b6df9ed0b61a8b3c57e59a93dcd5a8e94c18ade55f6220659 From a689905aaa64ac17477326a506ce654b16c56cf0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 8 Jul 2020 10:40:27 +0200 Subject: [PATCH 056/111] update to 5.3.0 raise dependency on PHP 7.1.3 raise dependency on bartlett/php-reflect 4.4 raise dependency on bartlett/php-compatinfo-db 2.0 switch to phpunit8 --- .gitignore | 1 + ...bartlett-PHP-CompatInfo-5.1.0-autoload.php | 1 - php-bartlett-PHP-CompatInfo-5.2.3-rpm.patch | 75 ----------------- php-bartlett-PHP-CompatInfo-5.3.0-rpm.patch | 80 +++++++++++++++++++ php-bartlett-PHP-CompatInfo.spec | 73 ++++++++--------- sources | 2 +- 6 files changed, 116 insertions(+), 116 deletions(-) delete mode 100644 php-bartlett-PHP-CompatInfo-5.2.3-rpm.patch create mode 100644 php-bartlett-PHP-CompatInfo-5.3.0-rpm.patch diff --git a/.gitignore b/.gitignore index 31b2904..bab09d7 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ clog /php-bartlett-PHP-CompatInfo-5.2.0-b54d109.tar.gz /php-bartlett-PHP-CompatInfo-5.2.1-287d879.tar.gz /php-bartlett-PHP-CompatInfo-5.2.3-ec29a4e.tar.gz +/php-bartlett-PHP-CompatInfo-5.3.0-5b58fb5.tar.gz diff --git a/php-bartlett-PHP-CompatInfo-5.1.0-autoload.php b/php-bartlett-PHP-CompatInfo-5.1.0-autoload.php index 61e455b..9d05d9f 100644 --- a/php-bartlett-PHP-CompatInfo-5.1.0-autoload.php +++ b/php-bartlett-PHP-CompatInfo-5.1.0-autoload.php @@ -9,7 +9,6 @@ require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Dependencies::required(array( '/usr/share/php/Bartlett/Reflect/autoload.php', '/usr/share/php/Bartlett/CompatInfoDb/autoload.php', - '/usr/share/php/PhpParser3/autoload.php', '/usr/share/php/Psr/Log/autoload.php', '/usr/share/php/Doctrine/Common/Cache/autoload.php', )); diff --git a/php-bartlett-PHP-CompatInfo-5.2.3-rpm.patch b/php-bartlett-PHP-CompatInfo-5.2.3-rpm.patch deleted file mode 100644 index 5b6798e..0000000 --- a/php-bartlett-PHP-CompatInfo-5.2.3-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.3'); -+$application = new Application($appName, '@package_version@'); - $application->run(); diff --git a/php-bartlett-PHP-CompatInfo-5.3.0-rpm.patch b/php-bartlett-PHP-CompatInfo-5.3.0-rpm.patch new file mode 100644 index 0000000..e460999 --- /dev/null +++ b/php-bartlett-PHP-CompatInfo-5.3.0-rpm.patch @@ -0,0 +1,80 @@ +diff -up ./bin/phpcompatinfo.json.dist.rpm ./bin/phpcompatinfo.json.dist +--- ./bin/phpcompatinfo.json.dist.rpm 2020-07-07 10:49:03.000000000 +0200 ++++ ./bin/phpcompatinfo.json.dist 2020-07-07 15:10:25.330090185 +0200 +@@ -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 2020-07-07 10:49:03.000000000 +0200 ++++ ./bin/phpcompatinfo 2020-07-07 15:10:25.330090185 +0200 +@@ -1,23 +1,13 @@ + #!/usr/bin/env php + setUseIncludePath(true); + + if (PHP_SAPI !== 'cli') { + return; +diff -up ./src/Bartlett/CompatInfo/Console/Application.php.rpm ./src/Bartlett/CompatInfo/Console/Application.php +--- ./src/Bartlett/CompatInfo/Console/Application.php.rpm 2020-07-07 10:49:03.000000000 +0200 ++++ ./src/Bartlett/CompatInfo/Console/Application.php 2020-07-07 15:10:37.214047839 +0200 +@@ -16,8 +16,6 @@ namespace Bartlett\CompatInfo\Console; + use Bartlett\CompatInfo\Util\Database; + use Bartlett\Reflect\Console\Application as BaseApplication; + +-use Jean85\PrettyVersions; +- + use OutOfBoundsException; + + /** +@@ -48,12 +46,7 @@ class Application extends BaseApplicatio + + public function __construct() + { +- try { +- $version = PrettyVersions::getVersion('bartlett/php-compatinfo')->getPrettyVersion(); +- } catch (OutOfBoundsException $e) { +- $version = self::VERSION; +- } +- parent::__construct(self::NAME, $version); ++ parent::__construct(self::NAME, self::VERSION); + } + + /** diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 03e2403..498220e 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-bartlett-PHP-CompatInfo # -# Copyright (c) 2011-2019 Remi Collet +# Copyright (c) 2011-2020 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -11,13 +11,13 @@ %undefine __brp_mangle_shebangs %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit ec29a4eea541d3bfdbf00b6ff85700dd926bf6b6 +%global gh_commit 5b58fb55f2a759f6c134d1649d1e1df1b8cd5cf2 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville %global gh_project php-compat-info #global prever RC2 -%global with_tests %{?_without_tests:0}%{!?_without_tests:1} +%bcond_without tests %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 %global sym_prefix php-symfony3 @@ -26,7 +26,7 @@ %endif Name: php-bartlett-PHP-CompatInfo -Version: 5.2.3 +Version: 5.3.0 %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 @@ -38,41 +38,41 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit # Script for fedora-review Source1: fedora-review-check -# Autoloader for RPM - die composer ! +# RPM autoloader Source2: %{name}-5.1.0-autoload.php # Autoload and sqlite database path -Patch0: %{name}-5.2.3-rpm.patch +# avoid jean85/pretty-package-versions +Patch0: %{name}-5.3.0-rpm.patch BuildArch: noarch -BuildRequires: php(language) >= 5.5 -%if %{with_tests} +BuildRequires: php(language) >= 7.1.3 +%if %{with tests} # to run test suite BuildRequires: php-pdo_sqlite -%global phpunit %{_bindir}/phpunit7 -BuildRequires: (php-composer(bartlett/php-reflect) >= 4.3 with php-composer(bartlett/php-reflect) < 5) -BuildRequires: (php-composer(nikic/php-parser) >= 3.1 with php-composer(nikic/php-parser) < 4) -BuildRequires: (php-composer(bartlett/php-compatinfo-db) >= 1.23 with php-composer(bartlett/php-compatinfo-db) < 3) +BuildRequires: (php-composer(bartlett/php-reflect) >= 4.4 with php-composer(bartlett/php-reflect) < 5) +BuildRequires: (php-composer(bartlett/php-compatinfo-db) >= 2.0 with php-composer(bartlett/php-compatinfo-db) < 3) BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) -Requires: (php-composer(doctrine/cache) >= 1.3 with php-composer(doctrine/cache) < 2) +BuildRequires: (php-composer(doctrine/cache) >= 1.3 with php-composer(doctrine/cache) < 2) +%global phpunit %{_bindir}/phpunit8 BuildRequires: %{phpunit} # For our patch / autoloader BuildRequires: php-composer(fedora/autoloader) %endif # From composer.json, "require" -# "php": "^5.5|^7.0", +# "php": "^7.1.3", # "ext-libxml": "*", # "ext-pcre": "*", # "ext-spl": "*", # "ext-json": "*", # "ext-pdo": "*", # "ext-pdo_sqlite": "*", -# "bartlett/php-reflect": "^4.3", -# "nikic/php-parser": "^3.1", -# "bartlett/php-compatinfo-db": "^1.23|^2.0", +# "bartlett/php-reflect": "^4.4", +# "bartlett/php-compatinfo-db": "^2.0", +# "jean85/pretty-package-versions": "^1.5", # "psr/log": "^1.0" -Requires: php(language) >= 5.5 +Requires: php(language) >= 7.1.3 Requires: php-cli Requires: php-json Requires: php-libxml @@ -80,25 +80,11 @@ Requires: php-pcre Requires: php-pdo Requires: php-pdo_sqlite Requires: php-spl -Requires: (php-composer(bartlett/php-reflect) >= 4.3 with php-composer(bartlett/php-reflect) < 5) -Requires: (php-composer(nikic/php-parser) >= 3.1 with php-composer(nikic/php-parser) < 4) -Requires: (php-composer(bartlett/php-compatinfo-db) >= 1.23 with php-composer(bartlett/php-compatinfo-db) < 3) +Requires: (php-composer(bartlett/php-reflect) >= 4.4 with php-composer(bartlett/php-reflect) < 5) +Requires: (php-composer(bartlett/php-compatinfo-db) >= 2.0 with php-composer(bartlett/php-compatinfo-db) < 3) Requires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) # Mandatory for our patch Requires: (php-composer(doctrine/cache) >= 1.3 with php-composer(doctrine/cache) < 2) -# From composer.json, "require-dev": { -# "monolog/monolog": "^1.10", -# From composer.json, "suggest" -# "doctrine/cache": "Allow caching results, since bartlett/php-reflect 2.2", -# "monolog/monolog": "Allow logging events with the LogPlugin", -# "bartlett/monolog-callbackfilterhandler": "Advanced filtering strategies for Monolog", -# "bartlett/monolog-growlhandler": "Sends notifications to Growl for Monolog", -# "bartlett/phpunit-loggertestlistener": "Allow logging unit tests to your favorite PSR-3 logger interface", -# "bartlett/umlwriter": "Allow writing UML class diagrams (Graphviz or PlantUML)" -# "doctrine/cache": "Allow caching results, since bartlett/php-reflect 2.2" -# "bartlett/umlwriter": "Allow writing UML class diagrams (Graphviz or PlantUML)" -Suggests: php-composer(monolog/monolog) -# Required by autoloader Requires: php-composer(fedora/autoloader) Provides: phpcompatinfo = %{version} @@ -123,9 +109,11 @@ cp %{SOURCE2} src/Bartlett/CompatInfo/autoload.php # Cleanup patched files find src -name \*rpm -delete -print -# Set package version -sed -e 's/@package_version@/%{version}%{?prever}/' \ - -i $(find src -name \*.php) bin/phpcompatinfo +# Check package version +FILE=src/Bartlett/CompatInfo/Console/Application.php +grep " VERSION" $FILE +sed -e '/VERSION/s/5.3.x-dev/%{version}/' -i $FILE +grep %{version} $FILE %build @@ -143,7 +131,7 @@ install -D -p -m 644 bin/phpcompatinfo.1 %{buildroot}%{_mandir}/man1/php install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/fedora-review-check -%if %{with_tests} +%if %{with tests} %check mkdir vendor ln -s %{buildroot}%{_datadir}/php/Bartlett/CompatInfo/autoload.php vendor/ @@ -153,7 +141,7 @@ ret=0 for cmdarg in "php %{phpunit}" php72 php73 php74 php80; do if which $cmdarg; then set $cmdarg - $1 ${2:-%{_bindir}/phpunit7} \ + $1 ${2:-%{_bindir}/phpunit8} \ --include-path %{buildroot}%{_datadir}/php --verbose || ret=1 fi done @@ -179,6 +167,13 @@ fi %changelog +* Wed Jul 8 2020 Remi Collet - 5.3.0-1 +- update to 5.3.0 +- raise dependency on PHP 7.1.3 +- raise dependency on bartlett/php-reflect 4.4 +- raise dependency on bartlett/php-compatinfo-db 2.0 +- switch to phpunit8 + * Wed Apr 29 2020 Remi Collet - 5.2.3-1 - update to 5.2.3 diff --git a/sources b/sources index 088b567..563b875 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-5.2.3-ec29a4e.tar.gz) = c8312894b88730a63bbb732a878fa7e3102782ab3227483bdf386a6ad0a77d5dca57ebaa1c4f1f3b6df9ed0b61a8b3c57e59a93dcd5a8e94c18ade55f6220659 +SHA512 (php-bartlett-PHP-CompatInfo-5.3.0-5b58fb5.tar.gz) = 84cd9c248a037f263ffdcce41bc9102b208a6faf5654cae554da71f5891a77d9915ba5d32f182a0fe76bd139554867a9ca634557ad73b1d267ae647c93bb056c From fe031126b5600c99e14da459018601301d120245 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 20:41:18 +0000 Subject: [PATCH 057/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-bartlett-PHP-CompatInfo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 498220e..7331808 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -28,7 +28,7 @@ Name: php-bartlett-PHP-CompatInfo Version: 5.3.0 %global specrel 1 -Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} +Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}.1 Summary: Find out version and the extensions required for a piece of code to run License: BSD @@ -167,6 +167,9 @@ fi %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 5.3.0-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 8 2020 Remi Collet - 5.3.0-1 - update to 5.3.0 - raise dependency on PHP 7.1.3 From d1e89690a427c53dedee8cb879f06369a7cad125 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 6 Nov 2020 16:45:52 +0100 Subject: [PATCH 058/111] update to 5.4.1 switch to phpunit9 add dependency on ramsey/uuid add dependency on symfony components: config, console, dependency-injection, event-dispatcher, finder, serializer and stopwatch add dependency on doctrine/collections drop dependency on doctrine/cache switch to classmap autoloader drop configuration file (no more supported) --- .gitignore | 1 + ...bartlett-PHP-CompatInfo-5.1.0-autoload.php | 18 --- php-bartlett-PHP-CompatInfo-5.3.0-rpm.patch | 80 ----------- php-bartlett-PHP-CompatInfo-5.4.0-rpm.patch | 55 ++++++++ php-bartlett-PHP-CompatInfo.spec | 128 ++++++++++++++---- sources | 2 +- 6 files changed, 156 insertions(+), 128 deletions(-) delete mode 100644 php-bartlett-PHP-CompatInfo-5.1.0-autoload.php delete mode 100644 php-bartlett-PHP-CompatInfo-5.3.0-rpm.patch create mode 100644 php-bartlett-PHP-CompatInfo-5.4.0-rpm.patch diff --git a/.gitignore b/.gitignore index bab09d7..d8ff591 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ clog /php-bartlett-PHP-CompatInfo-5.2.1-287d879.tar.gz /php-bartlett-PHP-CompatInfo-5.2.3-ec29a4e.tar.gz /php-bartlett-PHP-CompatInfo-5.3.0-5b58fb5.tar.gz +/php-bartlett-PHP-CompatInfo-5.4.1-3e79a1a.tar.gz diff --git a/php-bartlett-PHP-CompatInfo-5.1.0-autoload.php b/php-bartlett-PHP-CompatInfo-5.1.0-autoload.php deleted file mode 100644 index 9d05d9f..0000000 --- a/php-bartlett-PHP-CompatInfo-5.1.0-autoload.php +++ /dev/null @@ -1,18 +0,0 @@ -setUseIncludePath(true); - - if (PHP_SAPI !== 'cli') { - return; -diff -up ./src/Bartlett/CompatInfo/Console/Application.php.rpm ./src/Bartlett/CompatInfo/Console/Application.php ---- ./src/Bartlett/CompatInfo/Console/Application.php.rpm 2020-07-07 10:49:03.000000000 +0200 -+++ ./src/Bartlett/CompatInfo/Console/Application.php 2020-07-07 15:10:37.214047839 +0200 -@@ -16,8 +16,6 @@ namespace Bartlett\CompatInfo\Console; - use Bartlett\CompatInfo\Util\Database; - use Bartlett\Reflect\Console\Application as BaseApplication; - --use Jean85\PrettyVersions; -- - use OutOfBoundsException; - - /** -@@ -48,12 +46,7 @@ class Application extends BaseApplicatio - - public function __construct() - { -- try { -- $version = PrettyVersions::getVersion('bartlett/php-compatinfo')->getPrettyVersion(); -- } catch (OutOfBoundsException $e) { -- $version = self::VERSION; -- } -- parent::__construct(self::NAME, $version); -+ parent::__construct(self::NAME, self::VERSION); - } - - /** diff --git a/php-bartlett-PHP-CompatInfo-5.4.0-rpm.patch b/php-bartlett-PHP-CompatInfo-5.4.0-rpm.patch new file mode 100644 index 0000000..6626bdf --- /dev/null +++ b/php-bartlett-PHP-CompatInfo-5.4.0-rpm.patch @@ -0,0 +1,55 @@ +diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo +--- ./bin/phpcompatinfo.rpm 2020-10-01 11:23:52.000000000 +0200 ++++ ./bin/phpcompatinfo 2020-10-02 12:29:00.346660651 +0200 +@@ -5,22 +5,13 @@ if (PHP_SAPI !== 'cli') { + return; + } + +-if (\Phar::running()) { +- $vendorDir = 'phar://phpcompatinfo.phar/vendor'; +-} else { +- $baseDir = dirname(__DIR__); +- $vendorDir = $baseDir . '/vendor'; +- +- if (!file_exists($vendorDir . '/autoload.php')) { +- $vendorDir = dirname(dirname($baseDir)); +- } +-} ++$vendorDir = '/usr/share/php/Bartlett/CompatInfo'; + require_once $vendorDir . '/autoload.php'; + + use Bartlett\CompatInfo\Console\ApplicationInterface; + + /** @var \Symfony\Component\DependencyInjection\ContainerBuilder $container */ +-$container = require dirname(__DIR__) . '/config/container.php'; ++$container = require $vendorDir . '/config/container.php'; + + $app = $container->get(ApplicationInterface::class); + $app->setContainer($container); +diff -up ./src/Bartlett/CompatInfo/Console/Application.php.rpm ./src/Bartlett/CompatInfo/Console/Application.php +--- ./src/Bartlett/CompatInfo/Console/Application.php.rpm 2020-10-02 12:05:49.767768616 +0200 ++++ ./src/Bartlett/CompatInfo/Console/Application.php 2020-10-02 12:10:02.129841590 +0200 +@@ -30,8 +30,6 @@ use Symfony\Component\DependencyInjectio + use Symfony\Component\EventDispatcher\EventDispatcher; + use Symfony\Component\EventDispatcher\EventDispatcherInterface ; + +-use PackageVersions\Versions; +- + use function substr_count; + + /** +@@ -77,14 +75,6 @@ class Application extends BaseApplicatio + $version = self::VERSION; + } elseif (substr_count($version, '.') === 2) { + // release is in X.Y.Z format +- } else { +- // composer or git strategy +- $version = Versions::getVersion('bartlett/php-compatinfo'); +- list($ver, ) = explode('@', $version); +- +- if (strpos($ver, 'dev') === false) { +- $version = $ver; +- } + } + parent::__construct(self::NAME, $version); + diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 7331808..cc82751 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 5b58fb55f2a759f6c134d1649d1e1df1b8cd5cf2 +%global gh_commit 3e79a1ac353774b0a3eedac8f0239dafd3e3eedb %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville @@ -26,9 +26,9 @@ %endif Name: php-bartlett-PHP-CompatInfo -Version: 5.3.0 +Version: 5.4.1 %global specrel 1 -Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}.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 License: BSD @@ -38,30 +38,35 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit # Script for fedora-review Source1: fedora-review-check -# RPM autoloader -Source2: %{name}-5.1.0-autoload.php - # Autoload and sqlite database path # avoid jean85/pretty-package-versions -Patch0: %{name}-5.3.0-rpm.patch +Patch0: %{name}-5.4.0-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 7.1.3 %if %{with tests} # to run test suite BuildRequires: php-pdo_sqlite -BuildRequires: (php-composer(bartlett/php-reflect) >= 4.4 with php-composer(bartlett/php-reflect) < 5) -BuildRequires: (php-composer(bartlett/php-compatinfo-db) >= 2.0 with php-composer(bartlett/php-compatinfo-db) < 3) -BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) -BuildRequires: (php-composer(doctrine/cache) >= 1.3 with php-composer(doctrine/cache) < 2) +BuildRequires: (php-composer(bartlett/php-reflect) >= 4.4 with php-composer(bartlett/php-reflect) < 5) +BuildRequires: (php-composer(bartlett/php-compatinfo-db) >= 2.0 with php-composer(bartlett/php-compatinfo-db) < 3) +BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) +BuildRequires: (php-composer(ramsey/uuid) >= 4.0 with php-composer(ramsey/uuid) < 5) +BuildRequires: (php-composer(symfony/config) >= 4.4 with php-composer(symfony/config) < 6) +BuildRequires: (php-composer(symfony/console) >= 4.4 with php-composer(symfony/console) < 6) +BuildRequires: (php-composer(symfony/dependency-injection) >= 4.4 with php-composer(symfony/dependency-injection) < 6) +BuildRequires: (php-composer(symfony/event-dispatcher) >= 4.4 with php-composer(symfony/event-dispatcher) < 6) +BuildRequires: (php-composer(symfony/finder) >= 4.4 with php-composer(symfony/finder) < 6) +BuildRequires: (php-composer(symfony/serializer) >= 4.4 with php-composer(symfony/serializer) < 6) +BuildRequires: (php-composer(symfony/stopwatch) >= 4.4 with php-composer(symfony/stopwatch) < 6) +BuildRequires: (php-composer(doctrine/collections) >= 1.4 with php-composer(doctrine/collections) < 2) %global phpunit %{_bindir}/phpunit8 BuildRequires: %{phpunit} # For our patch / autoloader -BuildRequires: php-composer(fedora/autoloader) +BuildRequires: php-fedora-autoloader-devel %endif # From composer.json, "require" -# "php": "^7.1.3", +# "php": "^7.1.3|^8.0", # "ext-libxml": "*", # "ext-pcre": "*", # "ext-spl": "*", @@ -70,8 +75,12 @@ BuildRequires: php-composer(fedora/autoloader) # "ext-pdo_sqlite": "*", # "bartlett/php-reflect": "^4.4", # "bartlett/php-compatinfo-db": "^2.0", -# "jean85/pretty-package-versions": "^1.5", -# "psr/log": "^1.0" +# "doctrine/collections": "^1.4", +# "composer/package-versions-deprecated": "^1.8", +# "ramsey/uuid": "^3.9|^4.0", +# "symfony/serializer": "^4.4|^5.0", +# "symfony/config": "^4.4|^5.0", +# "symfony/dependency-injection": "^4.4|^5.0" Requires: php(language) >= 7.1.3 Requires: php-cli Requires: php-json @@ -80,11 +89,19 @@ Requires: php-pcre Requires: php-pdo Requires: php-pdo_sqlite Requires: php-spl -Requires: (php-composer(bartlett/php-reflect) >= 4.4 with php-composer(bartlett/php-reflect) < 5) -Requires: (php-composer(bartlett/php-compatinfo-db) >= 2.0 with php-composer(bartlett/php-compatinfo-db) < 3) -Requires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) -# Mandatory for our patch -Requires: (php-composer(doctrine/cache) >= 1.3 with php-composer(doctrine/cache) < 2) +Requires: (php-composer(bartlett/php-reflect) >= 4.4 with php-composer(bartlett/php-reflect) < 5) +Requires: (php-composer(bartlett/php-compatinfo-db) >= 2.0 with php-composer(bartlett/php-compatinfo-db) < 3) +Requires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) +Requires: (php-composer(ramsey/uuid) >= 4.0 with php-composer(ramsey/uuid) < 5) +Requires: (php-composer(symfony/config) >= 4.4 with php-composer(symfony/config) < 6) +Requires: (php-composer(symfony/console) >= 4.4 with php-composer(symfony/console) < 6) +Requires: (php-composer(symfony/dependency-injection) >= 4.4 with php-composer(symfony/dependency-injection) < 6) +Requires: (php-composer(symfony/event-dispatcher) >= 4.4 with php-composer(symfony/event-dispatcher) < 6) +Requires: (php-composer(symfony/finder) >= 4.4 with php-composer(symfony/finder) < 6) +Requires: (php-composer(symfony/serializer) >= 4.4 with php-composer(symfony/serializer) < 6) +Requires: (php-composer(symfony/stopwatch) >= 4.4 with php-composer(symfony/stopwatch) < 6) +Requires: (php-composer(doctrine/collections) >= 1.4 with php-composer(doctrine/collections) < 2) +# Required by autoloader Requires: php-composer(fedora/autoloader) Provides: phpcompatinfo = %{version} @@ -104,15 +121,56 @@ Documentation: http://php5.laurent-laville.org/compatinfo/manual/current/en/ %setup -q -n %{gh_project}-%{gh_commit} %patch0 -p1 -b .rpm -cp %{SOURCE2} src/Bartlett/CompatInfo/autoload.php + +phpab \ + --template fedora \ + --output src/Bartlett/CompatInfo/autoload.php \ + src/Bartlett/CompatInfo +cat << 'EOF' | tee -a src/Bartlett/CompatInfo/autoload.php + +\Fedora\Autoloader\Dependencies::required([ + '%{_datadir}/php/Bartlett/Reflect/autoload.php', + '%{_datadir}/php/Bartlett/CompatInfoDb/autoload.php', + '%{_datadir}/php/Psr/Log/autoload.php', + '%{_datadir}/php/Ramsey/Uuid/autoload.php', + [ + '%{_datadir}/php/Symfony5/Component/Config/autoload.php', + '%{_datadir}/php/Symfony4/Component/Config/autoload.php', + ], [ + '%{_datadir}/php/Symfony5/Component/Console/autoload.php', + '%{_datadir}/php/Symfony4/Component/Console/autoload.php', + ], [ + '%{_datadir}/php/Symfony5/Component/DependencyInjection/autoload.php', + '%{_datadir}/php/Symfony4/Component/DependencyInjection/autoload.php', + ], [ + '%{_datadir}/php/Symfony5/Component/EventDispatcher/autoload.php', + '%{_datadir}/php/Symfony4/Component/EventDispatcher/autoload.php', + ], [ + '%{_datadir}/php/Symfony5/Component/Finder/autoload.php', + '%{_datadir}/php/Symfony4/Component/Finder/autoload.php', + ], [ + '%{_datadir}/php/Symfony5/Component/Serializer/autoload.php', + '%{_datadir}/php/Symfony4/Component/Serializer/autoload.php', + ], [ + '%{_datadir}/php/Symfony5/Component/Stopwatch/autoload.php', + '%{_datadir}/php/Symfony4/Component/Stopwatch/autoload.php', + ], + '%{_datadir}/php/Doctrine/Common/Collections/autoload.php', +]); +EOF # Cleanup patched files find src -name \*rpm -delete -print +# fix path in configuration +sed -e 's:src/Bartlett/CompatInfo/::' -i config/set/*php +mv config src/Bartlett/CompatInfo/config +# for tests +ln -s src/Bartlett/CompatInfo/config config + # Check package version FILE=src/Bartlett/CompatInfo/Console/Application.php grep " VERSION" $FILE -sed -e '/VERSION/s/5.3.x-dev/%{version}/' -i $FILE grep %{version} $FILE @@ -125,7 +183,6 @@ mkdir -p %{buildroot}%{_datadir}/php cp -pr src/Bartlett %{buildroot}%{_datadir}/php/Bartlett install -D -p -m 755 bin/phpcompatinfo %{buildroot}%{_bindir}/phpcompatinfo -install -D -p -m 644 bin/phpcompatinfo.json.dist %{buildroot}%{_sysconfdir}/phpcompatinfo.json install -D -p -m 644 bin/phpcompatinfo.1 %{buildroot}%{_mandir}/man1/phpcompatinfo.1 install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/fedora-review-check @@ -134,15 +191,18 @@ install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name} %if %{with tests} %check mkdir vendor -ln -s %{buildroot}%{_datadir}/php/Bartlett/CompatInfo/autoload.php vendor/ - +cat << 'EOF' | tee vendor/autoload.php + - 5.4.1-1 +- update to 5.4.1 +- switch to phpunit9 +- add dependency on ramsey/uuid +- add dependency on symfony components: config, console, dependency-injection, + event-dispatcher, finder, serializer and stopwatch +- add dependency on doctrine/collections +- drop dependency on doctrine/cache +- switch to classmap autoloader +- drop configuration file (no more supported) + * Tue Jul 28 2020 Fedora Release Engineering - 5.3.0-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 563b875..604e03b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-5.3.0-5b58fb5.tar.gz) = 84cd9c248a037f263ffdcce41bc9102b208a6faf5654cae554da71f5891a77d9915ba5d32f182a0fe76bd139554867a9ca634557ad73b1d267ae647c93bb056c +SHA512 (php-bartlett-PHP-CompatInfo-5.4.1-3e79a1a.tar.gz) = 79d6465e4215be0a73201d2c19530ba72b50b14f6b0a556174d92da5c4090eac6d64d68f8c2841d4c09b6338fb27af10f81a705d4bfc2eba774c5eafb13069ad From 8f11b552f00263c4e93c97613da21125926a6b99 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 23 Nov 2020 09:38:45 +0100 Subject: [PATCH 059/111] v5.4.2 --- .gitignore | 1 + ...hp-bartlett-PHP-CompatInfo-5.4.2-rpm.patch | 48 +++++++++++++------ php-bartlett-PHP-CompatInfo.spec | 18 +++++-- sources | 2 +- 4 files changed, 48 insertions(+), 21 deletions(-) rename php-bartlett-PHP-CompatInfo-5.4.0-rpm.patch => php-bartlett-PHP-CompatInfo-5.4.2-rpm.patch (54%) diff --git a/.gitignore b/.gitignore index d8ff591..890f63b 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ clog /php-bartlett-PHP-CompatInfo-5.2.3-ec29a4e.tar.gz /php-bartlett-PHP-CompatInfo-5.3.0-5b58fb5.tar.gz /php-bartlett-PHP-CompatInfo-5.4.1-3e79a1a.tar.gz +/php-bartlett-PHP-CompatInfo-5.4.2-456308c.tar.gz diff --git a/php-bartlett-PHP-CompatInfo-5.4.0-rpm.patch b/php-bartlett-PHP-CompatInfo-5.4.2-rpm.patch similarity index 54% rename from php-bartlett-PHP-CompatInfo-5.4.0-rpm.patch rename to php-bartlett-PHP-CompatInfo-5.4.2-rpm.patch index 6626bdf..d77f69b 100644 --- a/php-bartlett-PHP-CompatInfo-5.4.0-rpm.patch +++ b/php-bartlett-PHP-CompatInfo-5.4.2-rpm.patch @@ -1,22 +1,40 @@ diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo ---- ./bin/phpcompatinfo.rpm 2020-10-01 11:23:52.000000000 +0200 -+++ ./bin/phpcompatinfo 2020-10-02 12:29:00.346660651 +0200 -@@ -5,22 +5,13 @@ if (PHP_SAPI !== 'cli') { - return; - } +--- ./bin/phpcompatinfo.rpm 2020-11-23 09:20:15.949928560 +0100 ++++ ./bin/phpcompatinfo 2020-11-23 09:23:44.418075703 +0100 +@@ -8,39 +8,13 @@ if (PHP_SAPI !== 'cli') { + + gc_disable(); // performance boost -if (\Phar::running()) { -- $vendorDir = 'phar://phpcompatinfo.phar/vendor'; +- $possibleAutoloadPaths = [ +- 'phar://phpcompatinfo.phar/vendor/autoload.php' +- ]; -} else { -- $baseDir = dirname(__DIR__); -- $vendorDir = $baseDir . '/vendor'; +- $possibleAutoloadPaths = [ +- // local dev repository +- __DIR__ . '/../vendor/autoload.php', +- // dependency +- __DIR__ . '/../../../../vendor/autoload.php', +- ]; +-} - -- if (!file_exists($vendorDir . '/autoload.php')) { -- $vendorDir = dirname(dirname($baseDir)); +-$isAutoloadFound = false; +-foreach ($possibleAutoloadPaths as $possibleAutoloadPath) { +- if (file_exists($possibleAutoloadPath)) { +- require_once $possibleAutoloadPath; +- $isAutoloadFound = true; +- break; - } -} +- +-if ($isAutoloadFound === false) { +- throw new RuntimeException(sprintf( +- 'Unable to find "vendor/autoload.php" in "%s" paths.', +- implode('", "', $possibleAutoloadPaths) +- )); +-} +$vendorDir = '/usr/share/php/Bartlett/CompatInfo'; - require_once $vendorDir . '/autoload.php'; ++require_once $vendorDir . '/autoload.php'; use Bartlett\CompatInfo\Console\ApplicationInterface; @@ -27,18 +45,18 @@ diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo $app = $container->get(ApplicationInterface::class); $app->setContainer($container); diff -up ./src/Bartlett/CompatInfo/Console/Application.php.rpm ./src/Bartlett/CompatInfo/Console/Application.php ---- ./src/Bartlett/CompatInfo/Console/Application.php.rpm 2020-10-02 12:05:49.767768616 +0200 -+++ ./src/Bartlett/CompatInfo/Console/Application.php 2020-10-02 12:10:02.129841590 +0200 +--- ./src/Bartlett/CompatInfo/Console/Application.php.rpm 2020-11-20 13:00:53.000000000 +0100 ++++ ./src/Bartlett/CompatInfo/Console/Application.php 2020-11-23 09:21:14.242121292 +0100 @@ -30,8 +30,6 @@ use Symfony\Component\DependencyInjectio use Symfony\Component\EventDispatcher\EventDispatcher; use Symfony\Component\EventDispatcher\EventDispatcherInterface ; -use PackageVersions\Versions; - + use Phar; use function substr_count; - /** -@@ -77,14 +75,6 @@ class Application extends BaseApplicatio +@@ -78,14 +76,6 @@ class Application extends BaseApplicatio $version = self::VERSION; } elseif (substr_count($version, '.') === 2) { // release is in X.Y.Z format diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index cc82751..5862466 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 3e79a1ac353774b0a3eedac8f0239dafd3e3eedb +%global gh_commit 456308cc09f2c78903195bbbf09886314950a083 %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.4.1 +Version: 5.4.2 %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 @@ -40,7 +40,7 @@ Source1: fedora-review-check # Autoload and sqlite database path # avoid jean85/pretty-package-versions -Patch0: %{name}-5.4.0-rpm.patch +Patch0: %{name}-5.4.2-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 7.1.3 @@ -77,10 +77,15 @@ BuildRequires: php-fedora-autoloader-devel # "bartlett/php-compatinfo-db": "^2.0", # "doctrine/collections": "^1.4", # "composer/package-versions-deprecated": "^1.8", +# "psr/log": "^1.0", # "ramsey/uuid": "^3.9|^4.0", -# "symfony/serializer": "^4.4|^5.0", # "symfony/config": "^4.4|^5.0", -# "symfony/dependency-injection": "^4.4|^5.0" +# "symfony/console": "^4.4|^5.0", +# "symfony/event-dispatcher": "^4.4|^5.0", +# "symfony/finder": "^4.4|^5.0", +# "symfony/dependency-injection": "^4.4|^5.0", +# "symfony/serializer": "^4.4|^5.0", +# "symfony/stopwatch": "^4.4|^5.0" Requires: php(language) >= 7.1.3 Requires: php-cli Requires: php-json @@ -226,6 +231,9 @@ fi %changelog +* Mon Nov 23 2020 Remi Collet - 5.4.2-1 +- update to 5.4.2 + * Tue Oct 6 2020 Remi Collet - 5.4.1-1 - update to 5.4.1 - switch to phpunit9 diff --git a/sources b/sources index 604e03b..5ad4082 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-5.4.1-3e79a1a.tar.gz) = 79d6465e4215be0a73201d2c19530ba72b50b14f6b0a556174d92da5c4090eac6d64d68f8c2841d4c09b6338fb27af10f81a705d4bfc2eba774c5eafb13069ad +SHA512 (php-bartlett-PHP-CompatInfo-5.4.2-456308c.tar.gz) = d44aa858c4a7d5ac8581056ea772f745e7a3c395c575f2d77a4130412935645cb06dd7135e196ceec1ca249bcd0c546e55f3126a75d83160ee2cb2cf094303a1 From ff4dbf8c1472ce4087c9844898efb7f5d25ac1f5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 06:24:04 +0000 Subject: [PATCH 060/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-bartlett-PHP-CompatInfo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 5862466..485ed15 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -28,7 +28,7 @@ Name: php-bartlett-PHP-CompatInfo Version: 5.4.2 %global specrel 1 -Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} +Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}.1 Summary: Find out version and the extensions required for a piece of code to run License: BSD @@ -231,6 +231,9 @@ fi %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 5.4.2-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Nov 23 2020 Remi Collet - 5.4.2-1 - update to 5.4.2 From 4ea39816fe14be29778231ca0b417acfd3b3e4be Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 15 Feb 2021 11:57:25 +0100 Subject: [PATCH 061/111] v5.4.3 --- .gitignore | 1 + php-bartlett-PHP-CompatInfo.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 890f63b..69ddb24 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ clog /php-bartlett-PHP-CompatInfo-5.3.0-5b58fb5.tar.gz /php-bartlett-PHP-CompatInfo-5.4.1-3e79a1a.tar.gz /php-bartlett-PHP-CompatInfo-5.4.2-456308c.tar.gz +/php-bartlett-PHP-CompatInfo-5.4.3-e4f9846.tar.gz diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 485ed15..aad6aa3 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 456308cc09f2c78903195bbbf09886314950a083 +%global gh_commit e4f9846a409a53b4b095c39386c9c9dbbc903519 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville @@ -26,9 +26,9 @@ %endif Name: php-bartlett-PHP-CompatInfo -Version: 5.4.2 +Version: 5.4.3 %global specrel 1 -Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}.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 License: BSD @@ -231,6 +231,9 @@ fi %changelog +* Mon Feb 15 2021 Remi Collet - 5.4.3-1 +- update to 5.4.3 + * Wed Jan 27 2021 Fedora Release Engineering - 5.4.2-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 5ad4082..166e7f3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-5.4.2-456308c.tar.gz) = d44aa858c4a7d5ac8581056ea772f745e7a3c395c575f2d77a4130412935645cb06dd7135e196ceec1ca249bcd0c546e55f3126a75d83160ee2cb2cf094303a1 +SHA512 (php-bartlett-PHP-CompatInfo-5.4.3-e4f9846.tar.gz) = 8092c6dd1e18e73dfae52438275943c71e798b7793fb78ac7c0231d1744f24d7c609c6c1c4ae97067dc47a540f36b44ca88016657601489d012d70560cadbeb1 From aa87996bbcbd69b492f8eabb39bf7e90871e628b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 22 Feb 2021 11:42:34 +0100 Subject: [PATCH 062/111] v5.4.4 --- .gitignore | 1 + php-bartlett-PHP-CompatInfo.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 69ddb24..35cd823 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ clog /php-bartlett-PHP-CompatInfo-5.4.1-3e79a1a.tar.gz /php-bartlett-PHP-CompatInfo-5.4.2-456308c.tar.gz /php-bartlett-PHP-CompatInfo-5.4.3-e4f9846.tar.gz +/php-bartlett-PHP-CompatInfo-5.4.4-85f8a27.tar.gz diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index aad6aa3..e32dd00 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-bartlett-PHP-CompatInfo # -# Copyright (c) 2011-2020 Remi Collet +# Copyright (c) 2011-2021 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -11,7 +11,7 @@ %undefine __brp_mangle_shebangs %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit e4f9846a409a53b4b095c39386c9c9dbbc903519 +%global gh_commit 85f8a27a74c88e38895c65f6e5250030a97a9b4b %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.4.3 +Version: 5.4.4 %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 @@ -231,6 +231,9 @@ fi %changelog +* Mon Feb 22 2021 Remi Collet - 5.4.4-1 +- update to 5.4.4 (no change) + * Mon Feb 15 2021 Remi Collet - 5.4.3-1 - update to 5.4.3 diff --git a/sources b/sources index 166e7f3..c9df186 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-5.4.3-e4f9846.tar.gz) = 8092c6dd1e18e73dfae52438275943c71e798b7793fb78ac7c0231d1744f24d7c609c6c1c4ae97067dc47a540f36b44ca88016657601489d012d70560cadbeb1 +SHA512 (php-bartlett-PHP-CompatInfo-5.4.4-85f8a27.tar.gz) = 53297baef08b35902989cea689b254dfd4a5e94b52cc36ff09ceeaf2088c119ee29f7b9ea92148daea9bdd6d1b63a6774e8f85be525482640d4ae7f01d636dc4 From a950b4e8ad6a2fd7601df42180ae5ef4fc076acd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 17 Mar 2021 07:46:52 +0100 Subject: [PATCH 063/111] update to 5.5.1 raise dependency on PHP 7.2 raise dependency on bartlett/php-compatinfo-db 3.4 --- .gitignore | 1 + php-bartlett-PHP-CompatInfo-5.4.2-rpm.patch | 73 -------------- php-bartlett-PHP-CompatInfo-5.5-rpm.patch | 105 ++++++++++++++++++++ php-bartlett-PHP-CompatInfo.spec | 55 +++++----- sources | 2 +- 5 files changed, 135 insertions(+), 101 deletions(-) delete mode 100644 php-bartlett-PHP-CompatInfo-5.4.2-rpm.patch create mode 100644 php-bartlett-PHP-CompatInfo-5.5-rpm.patch diff --git a/.gitignore b/.gitignore index 35cd823..fe85675 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ clog /php-bartlett-PHP-CompatInfo-5.4.2-456308c.tar.gz /php-bartlett-PHP-CompatInfo-5.4.3-e4f9846.tar.gz /php-bartlett-PHP-CompatInfo-5.4.4-85f8a27.tar.gz +/php-bartlett-PHP-CompatInfo-5.5.1-3829490.tar.gz diff --git a/php-bartlett-PHP-CompatInfo-5.4.2-rpm.patch b/php-bartlett-PHP-CompatInfo-5.4.2-rpm.patch deleted file mode 100644 index d77f69b..0000000 --- a/php-bartlett-PHP-CompatInfo-5.4.2-rpm.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo ---- ./bin/phpcompatinfo.rpm 2020-11-23 09:20:15.949928560 +0100 -+++ ./bin/phpcompatinfo 2020-11-23 09:23:44.418075703 +0100 -@@ -8,39 +8,13 @@ if (PHP_SAPI !== 'cli') { - - gc_disable(); // performance boost - --if (\Phar::running()) { -- $possibleAutoloadPaths = [ -- 'phar://phpcompatinfo.phar/vendor/autoload.php' -- ]; --} else { -- $possibleAutoloadPaths = [ -- // local dev repository -- __DIR__ . '/../vendor/autoload.php', -- // dependency -- __DIR__ . '/../../../../vendor/autoload.php', -- ]; --} -- --$isAutoloadFound = false; --foreach ($possibleAutoloadPaths as $possibleAutoloadPath) { -- if (file_exists($possibleAutoloadPath)) { -- require_once $possibleAutoloadPath; -- $isAutoloadFound = true; -- break; -- } --} -- --if ($isAutoloadFound === false) { -- throw new RuntimeException(sprintf( -- 'Unable to find "vendor/autoload.php" in "%s" paths.', -- implode('", "', $possibleAutoloadPaths) -- )); --} -+$vendorDir = '/usr/share/php/Bartlett/CompatInfo'; -+require_once $vendorDir . '/autoload.php'; - - use Bartlett\CompatInfo\Console\ApplicationInterface; - - /** @var \Symfony\Component\DependencyInjection\ContainerBuilder $container */ --$container = require dirname(__DIR__) . '/config/container.php'; -+$container = require $vendorDir . '/config/container.php'; - - $app = $container->get(ApplicationInterface::class); - $app->setContainer($container); -diff -up ./src/Bartlett/CompatInfo/Console/Application.php.rpm ./src/Bartlett/CompatInfo/Console/Application.php ---- ./src/Bartlett/CompatInfo/Console/Application.php.rpm 2020-11-20 13:00:53.000000000 +0100 -+++ ./src/Bartlett/CompatInfo/Console/Application.php 2020-11-23 09:21:14.242121292 +0100 -@@ -30,8 +30,6 @@ use Symfony\Component\DependencyInjectio - use Symfony\Component\EventDispatcher\EventDispatcher; - use Symfony\Component\EventDispatcher\EventDispatcherInterface ; - --use PackageVersions\Versions; -- - use Phar; - use function substr_count; - -@@ -78,14 +76,6 @@ class Application extends BaseApplicatio - $version = self::VERSION; - } elseif (substr_count($version, '.') === 2) { - // release is in X.Y.Z format -- } else { -- // composer or git strategy -- $version = Versions::getVersion('bartlett/php-compatinfo'); -- list($ver, ) = explode('@', $version); -- -- if (strpos($ver, 'dev') === false) { -- $version = $ver; -- } - } - parent::__construct(self::NAME, $version); - diff --git a/php-bartlett-PHP-CompatInfo-5.5-rpm.patch b/php-bartlett-PHP-CompatInfo-5.5-rpm.patch new file mode 100644 index 0000000..f84d1bb --- /dev/null +++ b/php-bartlett-PHP-CompatInfo-5.5-rpm.patch @@ -0,0 +1,105 @@ +diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo +--- ./bin/phpcompatinfo.rpm 2021-03-15 08:24:33.926051485 +0100 ++++ ./bin/phpcompatinfo 2021-03-15 08:27:12.457422097 +0100 +@@ -8,12 +8,12 @@ if (PHP_SAPI !== 'cli') { + + gc_disable(); // performance boost + +-require_once dirname(__DIR__) . '/config/bootstrap.php'; ++require_once '/usr/share/php/Bartlett/CompatInfo/config/bootstrap.php'; + + use Bartlett\CompatInfo\Console\ApplicationInterface; + + /** @var \Symfony\Component\DependencyInjection\ContainerBuilder $container */ +-$container = require dirname(__DIR__) . '/config/container.php'; ++$container = require '/usr/share/php/Bartlett/CompatInfo/config/container.php'; + + $app = $container->get(ApplicationInterface::class); + $app->setContainer($container); +diff -up ./config/bootstrap.php.rpm ./config/bootstrap.php +--- ./config/bootstrap.php.rpm 2021-03-15 08:25:20.386867027 +0100 ++++ ./config/bootstrap.php 2021-03-15 08:26:06.587683611 +0100 +@@ -6,6 +6,8 @@ if (\Phar::running()) { + ]; + } else { + $possibleAutoloadPaths = [ ++ // RPM ++ __DIR__ . '/../autoload.php', + // local dev repository + __DIR__ . '/../vendor/autoload.php', + // dependency +diff -up ./config/set/default.php.rpm ./config/set/default.php +--- ./config/set/default.php.rpm 2021-03-13 11:18:56.000000000 +0100 ++++ ./config/set/default.php 2021-03-15 08:24:33.926051485 +0100 +@@ -33,7 +33,7 @@ use function Symfony\Component\Dependenc + */ + return static function (ContainerConfigurator $containerConfigurator): void + { +- $containerConfigurator->import(dirname(__DIR__,2) . '/vendor/bartlett/php-compatinfo-db/config/set/default.php'); ++ $containerConfigurator->import('/usr/share/php/Bartlett/CompatInfoDb/config/set/default.php'); + $containerConfigurator->import(__DIR__ . '/common.php'); + + $parameters = $containerConfigurator->parameters(); +diff -up ./src/Bartlett/CompatInfo/Console/Application.php.rpm ./src/Bartlett/CompatInfo/Console/Application.php +--- ./src/Bartlett/CompatInfo/Console/Application.php.rpm 2021-03-13 11:18:56.000000000 +0100 ++++ ./src/Bartlett/CompatInfo/Console/Application.php 2021-03-15 08:24:33.926051485 +0100 +@@ -30,8 +30,6 @@ use Symfony\Component\DependencyInjectio + use Symfony\Component\EventDispatcher\EventDispatcher; + use Symfony\Component\EventDispatcher\EventDispatcherInterface ; + +-use PackageVersions\Versions; +- + use Phar; + use function substr_count; + +@@ -78,14 +76,6 @@ class Application extends BaseApplicatio + $version = self::VERSION; + } elseif (substr_count($version, '.') === 2) { + // release is in X.Y.Z format +- } else { +- // composer or git strategy +- $version = Versions::getVersion('bartlett/php-compatinfo'); +- list($ver, ) = explode('@', $version); +- +- if (strpos($ver, 'dev') === false) { +- $version = $ver; +- } + } + parent::__construct(self::NAME, $version); + +diff -up ./tests/Reference/ParameterTest.php.rpm ./tests/Reference/ParameterTest.php +--- ./tests/Reference/ParameterTest.php.rpm 2021-03-15 08:33:56.677816772 +0100 ++++ ./tests/Reference/ParameterTest.php 2021-03-15 08:35:06.718538322 +0100 +@@ -42,7 +42,7 @@ final class ParameterTest extends SniffT + */ + public function functionProvider() + { +- $container = require __DIR__ . '/../../config/container.php'; ++ $container = require '@BUILDPATH@/config/container.php'; + $repository = $container->get(FunctionRepository::class); + $functions = []; + foreach ($repository->getAll() as $function) { +diff -up ./tests/Sniffs/SniffTestCase.php.rpm ./tests/Sniffs/SniffTestCase.php +--- ./tests/Sniffs/SniffTestCase.php.rpm 2021-03-15 08:33:50.789840180 +0100 ++++ ./tests/Sniffs/SniffTestCase.php 2021-03-15 08:34:48.304611521 +0100 +@@ -21,7 +21,7 @@ abstract class SniffTestCase extends Tes + + self::$fixtures .= 'sniffs' . DIRECTORY_SEPARATOR; + +- $container = require __DIR__ . '/../../config/container.php'; ++ $container = require '@BUILDPATH@/config/container.php'; + self::$sniffs = $container->get(SniffCollection::class); + } + } +diff -up ./tests/TestCase.php.rpm ./tests/TestCase.php +--- ./tests/TestCase.php.rpm 2021-03-15 08:33:45.726860307 +0100 ++++ ./tests/TestCase.php 2021-03-15 08:34:30.666681640 +0100 +@@ -38,7 +38,7 @@ abstract class TestCase extends \PHPUnit + // request for a Bartlett\CompatInfo\Api\Analyser + self::$api = $client->api('analyser'); + +- $container = require __DIR__ . '/../config/container.php'; ++ $container = require '@BUILDPATH@/config/container.php'; + self::$references = $container->get(ReferenceCollectionInterface::class); + } + diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index e32dd00..81e2956 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 85f8a27a74c88e38895c65f6e5250030a97a9b4b +%global gh_commit 38294902ae898ae4d29b300a516474330670f33f %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville @@ -19,16 +19,12 @@ #global prever RC2 %bcond_without tests -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -%global sym_prefix php-symfony3 -%else -%global sym_prefix php-symfony -%endif +%global upstream_version 5.5.1 +#global upstream_prever RC1 Name: php-bartlett-PHP-CompatInfo -Version: 5.4.4 -%global specrel 1 -Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} +Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} +Release: 1%{?dist} Summary: Find out version and the extensions required for a piece of code to run License: BSD @@ -38,17 +34,17 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit # Script for fedora-review Source1: fedora-review-check -# Autoload and sqlite database path +# Autoload and config path # avoid jean85/pretty-package-versions -Patch0: %{name}-5.4.2-rpm.patch +Patch0: %{name}-5.5-rpm.patch BuildArch: noarch -BuildRequires: php(language) >= 7.1.3 +BuildRequires: php(language) >= 7.2 %if %{with tests} # to run test suite BuildRequires: php-pdo_sqlite BuildRequires: (php-composer(bartlett/php-reflect) >= 4.4 with php-composer(bartlett/php-reflect) < 5) -BuildRequires: (php-composer(bartlett/php-compatinfo-db) >= 2.0 with php-composer(bartlett/php-compatinfo-db) < 3) +BuildRequires: (php-composer(bartlett/php-compatinfo-db) >= 3.4 with php-composer(bartlett/php-compatinfo-db) < 4) BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) BuildRequires: (php-composer(ramsey/uuid) >= 4.0 with php-composer(ramsey/uuid) < 5) BuildRequires: (php-composer(symfony/config) >= 4.4 with php-composer(symfony/config) < 6) @@ -59,14 +55,14 @@ BuildRequires: (php-composer(symfony/finder) >= 4.4 with php-comp BuildRequires: (php-composer(symfony/serializer) >= 4.4 with php-composer(symfony/serializer) < 6) BuildRequires: (php-composer(symfony/stopwatch) >= 4.4 with php-composer(symfony/stopwatch) < 6) BuildRequires: (php-composer(doctrine/collections) >= 1.4 with php-composer(doctrine/collections) < 2) -%global phpunit %{_bindir}/phpunit8 +%global phpunit %{_bindir}/phpunit9 BuildRequires: %{phpunit} # For our patch / autoloader BuildRequires: php-fedora-autoloader-devel %endif # From composer.json, "require" -# "php": "^7.1.3|^8.0", +# "php": "^7.2|^8.0", # "ext-libxml": "*", # "ext-pcre": "*", # "ext-spl": "*", @@ -74,7 +70,7 @@ BuildRequires: php-fedora-autoloader-devel # "ext-pdo": "*", # "ext-pdo_sqlite": "*", # "bartlett/php-reflect": "^4.4", -# "bartlett/php-compatinfo-db": "^2.0", +# "bartlett/php-compatinfo-db": "^3.4", # "doctrine/collections": "^1.4", # "composer/package-versions-deprecated": "^1.8", # "psr/log": "^1.0", @@ -86,7 +82,7 @@ BuildRequires: php-fedora-autoloader-devel # "symfony/dependency-injection": "^4.4|^5.0", # "symfony/serializer": "^4.4|^5.0", # "symfony/stopwatch": "^4.4|^5.0" -Requires: php(language) >= 7.1.3 +Requires: php(language) >= 7.2 Requires: php-cli Requires: php-json Requires: php-libxml @@ -95,7 +91,7 @@ Requires: php-pdo Requires: php-pdo_sqlite Requires: php-spl Requires: (php-composer(bartlett/php-reflect) >= 4.4 with php-composer(bartlett/php-reflect) < 5) -Requires: (php-composer(bartlett/php-compatinfo-db) >= 2.0 with php-composer(bartlett/php-compatinfo-db) < 3) +Requires: (php-composer(bartlett/php-compatinfo-db) >= 3.4 with php-composer(bartlett/php-compatinfo-db) < 4) Requires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) Requires: (php-composer(ramsey/uuid) >= 4.0 with php-composer(ramsey/uuid) < 5) Requires: (php-composer(symfony/config) >= 4.4 with php-composer(symfony/config) < 6) @@ -105,7 +101,7 @@ Requires: (php-composer(symfony/event-dispatcher) >= 4.4 with php-comp Requires: (php-composer(symfony/finder) >= 4.4 with php-composer(symfony/finder) < 6) Requires: (php-composer(symfony/serializer) >= 4.4 with php-composer(symfony/serializer) < 6) Requires: (php-composer(symfony/stopwatch) >= 4.4 with php-composer(symfony/stopwatch) < 6) -Requires: (php-composer(doctrine/collections) >= 1.4 with php-composer(doctrine/collections) < 2) +Requires: (php-composer(doctrine/collections) >= 1.4 with php-composer(doctrine/collections) < 2) # Required by autoloader Requires: php-composer(fedora/autoloader) @@ -170,8 +166,6 @@ find src -name \*rpm -delete -print # fix path in configuration sed -e 's:src/Bartlett/CompatInfo/::' -i config/set/*php mv config src/Bartlett/CompatInfo/config -# for tests -ln -s src/Bartlett/CompatInfo/config config # Check package version FILE=src/Bartlett/CompatInfo/Console/Application.php @@ -195,19 +189,21 @@ install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name} %if %{with tests} %check -mkdir vendor -cat << 'EOF' | tee vendor/autoload.php +mkdir config +cat << 'EOF' | tee config/bootstrap.php - 5.5.1-1 +- update to 5.5.1 +- raise dependency on PHP 7.2 +- raise dependency on bartlett/php-compatinfo-db 3.4 + * Mon Feb 22 2021 Remi Collet - 5.4.4-1 - update to 5.4.4 (no change) diff --git a/sources b/sources index c9df186..cce85f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-5.4.4-85f8a27.tar.gz) = 53297baef08b35902989cea689b254dfd4a5e94b52cc36ff09ceeaf2088c119ee29f7b9ea92148daea9bdd6d1b63a6774e8f85be525482640d4ae7f01d636dc4 +SHA512 (php-bartlett-PHP-CompatInfo-5.5.1-3829490.tar.gz) = e9e06c73068388acaf8f2f2f5c2e62fae5b07b01c051e31dcc11be77cded72953577e8f4d6d2c540db99454a14911943dc4a23aae1d9720b9996b38774618785 From 6b4ad234dcdaa688ed212bfa5bb049806a7aad49 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 13 Apr 2021 10:49:56 +0200 Subject: [PATCH 064/111] v5.5.2 --- .gitignore | 1 + ...hp-bartlett-PHP-CompatInfo-5.5.2-rpm.patch | 48 +++++++------------ php-bartlett-PHP-CompatInfo.spec | 10 ++-- sources | 2 +- 4 files changed, 27 insertions(+), 34 deletions(-) rename php-bartlett-PHP-CompatInfo-5.5-rpm.patch => php-bartlett-PHP-CompatInfo-5.5.2-rpm.patch (66%) diff --git a/.gitignore b/.gitignore index fe85675..481e978 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ clog /php-bartlett-PHP-CompatInfo-5.4.3-e4f9846.tar.gz /php-bartlett-PHP-CompatInfo-5.4.4-85f8a27.tar.gz /php-bartlett-PHP-CompatInfo-5.5.1-3829490.tar.gz +/php-bartlett-PHP-CompatInfo-5.5.2-547803e.tar.gz diff --git a/php-bartlett-PHP-CompatInfo-5.5-rpm.patch b/php-bartlett-PHP-CompatInfo-5.5.2-rpm.patch similarity index 66% rename from php-bartlett-PHP-CompatInfo-5.5-rpm.patch rename to php-bartlett-PHP-CompatInfo-5.5.2-rpm.patch index f84d1bb..0ada6f5 100644 --- a/php-bartlett-PHP-CompatInfo-5.5-rpm.patch +++ b/php-bartlett-PHP-CompatInfo-5.5.2-rpm.patch @@ -1,6 +1,6 @@ diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo ---- ./bin/phpcompatinfo.rpm 2021-03-15 08:24:33.926051485 +0100 -+++ ./bin/phpcompatinfo 2021-03-15 08:27:12.457422097 +0100 +--- ./bin/phpcompatinfo.rpm 2021-04-12 09:54:09.000000000 +0200 ++++ ./bin/phpcompatinfo 2021-04-13 10:41:27.780928446 +0200 @@ -8,12 +8,12 @@ if (PHP_SAPI !== 'cli') { gc_disable(); // performance boost @@ -17,8 +17,8 @@ diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo $app = $container->get(ApplicationInterface::class); $app->setContainer($container); diff -up ./config/bootstrap.php.rpm ./config/bootstrap.php ---- ./config/bootstrap.php.rpm 2021-03-15 08:25:20.386867027 +0100 -+++ ./config/bootstrap.php 2021-03-15 08:26:06.587683611 +0100 +--- ./config/bootstrap.php.rpm 2021-04-12 09:54:09.000000000 +0200 ++++ ./config/bootstrap.php 2021-04-13 10:41:27.780928446 +0200 @@ -6,6 +6,8 @@ if (\Phar::running()) { ]; } else { @@ -29,8 +29,8 @@ diff -up ./config/bootstrap.php.rpm ./config/bootstrap.php __DIR__ . '/../vendor/autoload.php', // dependency diff -up ./config/set/default.php.rpm ./config/set/default.php ---- ./config/set/default.php.rpm 2021-03-13 11:18:56.000000000 +0100 -+++ ./config/set/default.php 2021-03-15 08:24:33.926051485 +0100 +--- ./config/set/default.php.rpm 2021-04-12 09:54:09.000000000 +0200 ++++ ./config/set/default.php 2021-04-13 10:41:27.780928446 +0200 @@ -33,7 +33,7 @@ use function Symfony\Component\Dependenc */ return static function (ContainerConfigurator $containerConfigurator): void @@ -41,8 +41,8 @@ diff -up ./config/set/default.php.rpm ./config/set/default.php $parameters = $containerConfigurator->parameters(); diff -up ./src/Bartlett/CompatInfo/Console/Application.php.rpm ./src/Bartlett/CompatInfo/Console/Application.php ---- ./src/Bartlett/CompatInfo/Console/Application.php.rpm 2021-03-13 11:18:56.000000000 +0100 -+++ ./src/Bartlett/CompatInfo/Console/Application.php 2021-03-15 08:24:33.926051485 +0100 +--- ./src/Bartlett/CompatInfo/Console/Application.php.rpm 2021-04-12 09:54:09.000000000 +0200 ++++ ./src/Bartlett/CompatInfo/Console/Application.php 2021-04-13 10:41:27.780928446 +0200 @@ -30,8 +30,6 @@ use Symfony\Component\DependencyInjectio use Symfony\Component\EventDispatcher\EventDispatcher; use Symfony\Component\EventDispatcher\EventDispatcherInterface ; @@ -68,8 +68,8 @@ diff -up ./src/Bartlett/CompatInfo/Console/Application.php.rpm ./src/Bartlett/Co parent::__construct(self::NAME, $version); diff -up ./tests/Reference/ParameterTest.php.rpm ./tests/Reference/ParameterTest.php ---- ./tests/Reference/ParameterTest.php.rpm 2021-03-15 08:33:56.677816772 +0100 -+++ ./tests/Reference/ParameterTest.php 2021-03-15 08:35:06.718538322 +0100 +--- ./tests/Reference/ParameterTest.php.rpm 2021-04-12 09:54:09.000000000 +0200 ++++ ./tests/Reference/ParameterTest.php 2021-04-13 10:41:27.780928446 +0200 @@ -42,7 +42,7 @@ final class ParameterTest extends SniffT */ public function functionProvider() @@ -79,27 +79,15 @@ diff -up ./tests/Reference/ParameterTest.php.rpm ./tests/Reference/ParameterTest $repository = $container->get(FunctionRepository::class); $functions = []; foreach ($repository->getAll() as $function) { -diff -up ./tests/Sniffs/SniffTestCase.php.rpm ./tests/Sniffs/SniffTestCase.php ---- ./tests/Sniffs/SniffTestCase.php.rpm 2021-03-15 08:33:50.789840180 +0100 -+++ ./tests/Sniffs/SniffTestCase.php 2021-03-15 08:34:48.304611521 +0100 -@@ -21,7 +21,7 @@ abstract class SniffTestCase extends Tes - - self::$fixtures .= 'sniffs' . DIRECTORY_SEPARATOR; - -- $container = require __DIR__ . '/../../config/container.php'; -+ $container = require '@BUILDPATH@/config/container.php'; - self::$sniffs = $container->get(SniffCollection::class); - } - } diff -up ./tests/TestCase.php.rpm ./tests/TestCase.php ---- ./tests/TestCase.php.rpm 2021-03-15 08:33:45.726860307 +0100 -+++ ./tests/TestCase.php 2021-03-15 08:34:30.666681640 +0100 -@@ -38,7 +38,7 @@ abstract class TestCase extends \PHPUnit - // request for a Bartlett\CompatInfo\Api\Analyser - self::$api = $client->api('analyser'); - +--- ./tests/TestCase.php.rpm 2021-04-13 10:41:27.780928446 +0200 ++++ ./tests/TestCase.php 2021-04-13 10:43:04.778512016 +0200 +@@ -46,7 +46,7 @@ abstract class TestCase extends \PHPUnit + */ + protected function executeAnalysis(string $dataSource): array + { - $container = require __DIR__ . '/../config/container.php'; + $container = require '@BUILDPATH@/config/container.php'; - self::$references = $container->get(ReferenceCollectionInterface::class); - } + $references = $container->get(ReferenceCollectionInterface::class); + $sniffs = $container->get(SniffCollection::class); diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 81e2956..e029aef 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 38294902ae898ae4d29b300a516474330670f33f +%global gh_commit 547803ee1bd9e160bbb99f58273177b497790636 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville @@ -19,7 +19,7 @@ #global prever RC2 %bcond_without tests -%global upstream_version 5.5.1 +%global upstream_version 5.5.2 #global upstream_prever RC1 Name: php-bartlett-PHP-CompatInfo @@ -36,7 +36,7 @@ Source1: fedora-review-check # Autoload and config path # avoid jean85/pretty-package-versions -Patch0: %{name}-5.5-rpm.patch +Patch0: %{name}-5.5.2-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 7.2 @@ -169,6 +169,7 @@ mv config src/Bartlett/CompatInfo/config # Check package version FILE=src/Bartlett/CompatInfo/Console/Application.php +sed -e 's/5.5.1/%{version}/' -i $FILE grep " VERSION" $FILE grep %{version} $FILE @@ -227,6 +228,9 @@ fi %changelog +* Tue Apr 13 2021 Remi Collet - 5.5.2-1 +- update to 5.5.2 + * Mon Mar 15 2021 Remi Collet - 5.5.1-1 - update to 5.5.1 - raise dependency on PHP 7.2 diff --git a/sources b/sources index cce85f2..22ac5bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-5.5.1-3829490.tar.gz) = e9e06c73068388acaf8f2f2f5c2e62fae5b07b01c051e31dcc11be77cded72953577e8f4d6d2c540db99454a14911943dc4a23aae1d9720b9996b38774618785 +SHA512 (php-bartlett-PHP-CompatInfo-5.5.2-547803e.tar.gz) = 9962e17cbeb8334f985ad586aef000b15d98bed72fdcd5a1598cc7ebada3aea935477ba13fca7b0bc5974b5a3cd43231f25fbc4b3ffb213dbe5101a22cf9926b From f424718294632dab5d7f8cf83d6a0bf8b39d888c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 3 May 2021 09:20:07 +0200 Subject: [PATCH 065/111] v5.5.3 --- .gitignore | 1 + php-bartlett-PHP-CompatInfo.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 481e978..4d8593e 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ clog /php-bartlett-PHP-CompatInfo-5.4.4-85f8a27.tar.gz /php-bartlett-PHP-CompatInfo-5.5.1-3829490.tar.gz /php-bartlett-PHP-CompatInfo-5.5.2-547803e.tar.gz +/php-bartlett-PHP-CompatInfo-5.5.3-7353738.tar.gz diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index e029aef..2a29053 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 547803ee1bd9e160bbb99f58273177b497790636 +%global gh_commit 7353738b51e38b0763e2bf154d05c55ad2fdc105 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville @@ -19,7 +19,7 @@ #global prever RC2 %bcond_without tests -%global upstream_version 5.5.2 +%global upstream_version 5.5.3 #global upstream_prever RC1 Name: php-bartlett-PHP-CompatInfo @@ -228,6 +228,9 @@ fi %changelog +* Mon May 3 2021 Remi Collet - 5.5.3-1 +- update to 5.5.3 + * Tue Apr 13 2021 Remi Collet - 5.5.2-1 - update to 5.5.2 diff --git a/sources b/sources index 22ac5bb..054f865 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-5.5.2-547803e.tar.gz) = 9962e17cbeb8334f985ad586aef000b15d98bed72fdcd5a1598cc7ebada3aea935477ba13fca7b0bc5974b5a3cd43231f25fbc4b3ffb213dbe5101a22cf9926b +SHA512 (php-bartlett-PHP-CompatInfo-5.5.3-7353738.tar.gz) = ae0d12353505763a55594d98a9856a277f4badd5f654a031c156f3da45f81de7b05920d076f7d3ebcd396050514d57a8ed3655ebe79a54558af81e6c28a91973 From fe4fe9aaf02f451bc9129bc4817b5ba45fbd9304 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 01:35:59 +0000 Subject: [PATCH 066/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-bartlett-PHP-CompatInfo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 2a29053..3a09fe7 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -24,7 +24,7 @@ Name: php-bartlett-PHP-CompatInfo Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Find out version and the extensions required for a piece of code to run License: BSD @@ -228,6 +228,9 @@ fi %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 5.5.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon May 3 2021 Remi Collet - 5.5.3-1 - update to 5.5.3 From 177421242b037925bf7e7e863b815e769433fcd9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 13 Dec 2021 09:31:25 +0100 Subject: [PATCH 067/111] update to 5.5.4 raise dependency on bartlett/php-compatinfo-db 3.6 --- .gitignore | 1 + ...hp-bartlett-PHP-CompatInfo-5.5.4-rpm.patch | 32 +++++++++---------- php-bartlett-PHP-CompatInfo.spec | 24 ++++++++------ sources | 2 +- 4 files changed, 32 insertions(+), 27 deletions(-) rename php-bartlett-PHP-CompatInfo-5.5.2-rpm.patch => php-bartlett-PHP-CompatInfo-5.5.4-rpm.patch (75%) diff --git a/.gitignore b/.gitignore index 4d8593e..b0b1258 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ clog /php-bartlett-PHP-CompatInfo-5.5.1-3829490.tar.gz /php-bartlett-PHP-CompatInfo-5.5.2-547803e.tar.gz /php-bartlett-PHP-CompatInfo-5.5.3-7353738.tar.gz +/php-bartlett-PHP-CompatInfo-5.5.4-e3b0129.tar.gz diff --git a/php-bartlett-PHP-CompatInfo-5.5.2-rpm.patch b/php-bartlett-PHP-CompatInfo-5.5.4-rpm.patch similarity index 75% rename from php-bartlett-PHP-CompatInfo-5.5.2-rpm.patch rename to php-bartlett-PHP-CompatInfo-5.5.4-rpm.patch index 0ada6f5..80e3196 100644 --- a/php-bartlett-PHP-CompatInfo-5.5.2-rpm.patch +++ b/php-bartlett-PHP-CompatInfo-5.5.4-rpm.patch @@ -1,6 +1,6 @@ diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo ---- ./bin/phpcompatinfo.rpm 2021-04-12 09:54:09.000000000 +0200 -+++ ./bin/phpcompatinfo 2021-04-13 10:41:27.780928446 +0200 +--- ./bin/phpcompatinfo.rpm 2021-12-10 15:36:22.000000000 +0100 ++++ ./bin/phpcompatinfo 2021-12-10 16:26:30.756115071 +0100 @@ -8,12 +8,12 @@ if (PHP_SAPI !== 'cli') { gc_disable(); // performance boost @@ -17,8 +17,8 @@ diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo $app = $container->get(ApplicationInterface::class); $app->setContainer($container); diff -up ./config/bootstrap.php.rpm ./config/bootstrap.php ---- ./config/bootstrap.php.rpm 2021-04-12 09:54:09.000000000 +0200 -+++ ./config/bootstrap.php 2021-04-13 10:41:27.780928446 +0200 +--- ./config/bootstrap.php.rpm 2021-12-10 15:36:22.000000000 +0100 ++++ ./config/bootstrap.php 2021-12-10 16:26:30.757115067 +0100 @@ -6,6 +6,8 @@ if (\Phar::running()) { ]; } else { @@ -29,20 +29,20 @@ diff -up ./config/bootstrap.php.rpm ./config/bootstrap.php __DIR__ . '/../vendor/autoload.php', // dependency diff -up ./config/set/default.php.rpm ./config/set/default.php ---- ./config/set/default.php.rpm 2021-04-12 09:54:09.000000000 +0200 -+++ ./config/set/default.php 2021-04-13 10:41:27.780928446 +0200 -@@ -33,7 +33,7 @@ use function Symfony\Component\Dependenc +--- ./config/set/default.php.rpm 2021-12-10 16:26:30.757115067 +0100 ++++ ./config/set/default.php 2021-12-10 16:28:22.196710654 +0100 +@@ -32,7 +32,7 @@ use function Symfony\Component\Dependenc + * @return void */ - return static function (ContainerConfigurator $containerConfigurator): void - { -- $containerConfigurator->import(dirname(__DIR__,2) . '/vendor/bartlett/php-compatinfo-db/config/set/default.php'); + return static function (ContainerConfigurator $containerConfigurator): void { +- $containerConfigurator->import(dirname(__DIR__, 2) . '/vendor/bartlett/php-compatinfo-db/config/set/default.php'); + $containerConfigurator->import('/usr/share/php/Bartlett/CompatInfoDb/config/set/default.php'); $containerConfigurator->import(__DIR__ . '/common.php'); $parameters = $containerConfigurator->parameters(); diff -up ./src/Bartlett/CompatInfo/Console/Application.php.rpm ./src/Bartlett/CompatInfo/Console/Application.php ---- ./src/Bartlett/CompatInfo/Console/Application.php.rpm 2021-04-12 09:54:09.000000000 +0200 -+++ ./src/Bartlett/CompatInfo/Console/Application.php 2021-04-13 10:41:27.780928446 +0200 +--- ./src/Bartlett/CompatInfo/Console/Application.php.rpm 2021-12-10 15:36:22.000000000 +0100 ++++ ./src/Bartlett/CompatInfo/Console/Application.php 2021-12-10 16:26:30.757115067 +0100 @@ -30,8 +30,6 @@ use Symfony\Component\DependencyInjectio use Symfony\Component\EventDispatcher\EventDispatcher; use Symfony\Component\EventDispatcher\EventDispatcherInterface ; @@ -68,8 +68,8 @@ diff -up ./src/Bartlett/CompatInfo/Console/Application.php.rpm ./src/Bartlett/Co parent::__construct(self::NAME, $version); diff -up ./tests/Reference/ParameterTest.php.rpm ./tests/Reference/ParameterTest.php ---- ./tests/Reference/ParameterTest.php.rpm 2021-04-12 09:54:09.000000000 +0200 -+++ ./tests/Reference/ParameterTest.php 2021-04-13 10:41:27.780928446 +0200 +--- ./tests/Reference/ParameterTest.php.rpm 2021-12-10 15:36:22.000000000 +0100 ++++ ./tests/Reference/ParameterTest.php 2021-12-10 16:26:30.757115067 +0100 @@ -42,7 +42,7 @@ final class ParameterTest extends SniffT */ public function functionProvider() @@ -80,8 +80,8 @@ diff -up ./tests/Reference/ParameterTest.php.rpm ./tests/Reference/ParameterTest $functions = []; foreach ($repository->getAll() as $function) { diff -up ./tests/TestCase.php.rpm ./tests/TestCase.php ---- ./tests/TestCase.php.rpm 2021-04-13 10:41:27.780928446 +0200 -+++ ./tests/TestCase.php 2021-04-13 10:43:04.778512016 +0200 +--- ./tests/TestCase.php.rpm 2021-12-10 15:36:22.000000000 +0100 ++++ ./tests/TestCase.php 2021-12-10 16:26:30.757115067 +0100 @@ -46,7 +46,7 @@ abstract class TestCase extends \PHPUnit */ protected function executeAnalysis(string $dataSource): array diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 3a09fe7..1fde510 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -11,20 +11,20 @@ %undefine __brp_mangle_shebangs %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit 7353738b51e38b0763e2bf154d05c55ad2fdc105 +%global gh_commit e3b01295c0c46c3b751ef4a01dc41ad696815bc6 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville -%global gh_project php-compat-info +%global gh_project php-compatinfo #global prever RC2 %bcond_without tests -%global upstream_version 5.5.3 +%global upstream_version 5.5.4 #global upstream_prever RC1 Name: php-bartlett-PHP-CompatInfo Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Find out version and the extensions required for a piece of code to run License: BSD @@ -36,7 +36,7 @@ Source1: fedora-review-check # Autoload and config path # avoid jean85/pretty-package-versions -Patch0: %{name}-5.5.2-rpm.patch +Patch0: %{name}-5.5.4-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 7.2 @@ -44,7 +44,7 @@ BuildRequires: php(language) >= 7.2 # to run test suite BuildRequires: php-pdo_sqlite BuildRequires: (php-composer(bartlett/php-reflect) >= 4.4 with php-composer(bartlett/php-reflect) < 5) -BuildRequires: (php-composer(bartlett/php-compatinfo-db) >= 3.4 with php-composer(bartlett/php-compatinfo-db) < 4) +BuildRequires: (php-composer(bartlett/php-compatinfo-db) >= 3.6 with php-composer(bartlett/php-compatinfo-db) < 4) BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) BuildRequires: (php-composer(ramsey/uuid) >= 4.0 with php-composer(ramsey/uuid) < 5) BuildRequires: (php-composer(symfony/config) >= 4.4 with php-composer(symfony/config) < 6) @@ -70,7 +70,7 @@ BuildRequires: php-fedora-autoloader-devel # "ext-pdo": "*", # "ext-pdo_sqlite": "*", # "bartlett/php-reflect": "^4.4", -# "bartlett/php-compatinfo-db": "^3.4", +# "bartlett/php-compatinfo-db": "^3.6", # "doctrine/collections": "^1.4", # "composer/package-versions-deprecated": "^1.8", # "psr/log": "^1.0", @@ -91,7 +91,7 @@ Requires: php-pdo Requires: php-pdo_sqlite Requires: php-spl Requires: (php-composer(bartlett/php-reflect) >= 4.4 with php-composer(bartlett/php-reflect) < 5) -Requires: (php-composer(bartlett/php-compatinfo-db) >= 3.4 with php-composer(bartlett/php-compatinfo-db) < 4) +Requires: (php-composer(bartlett/php-compatinfo-db) >= 3.6 with php-composer(bartlett/php-compatinfo-db) < 4) Requires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) Requires: (php-composer(ramsey/uuid) >= 4.0 with php-composer(ramsey/uuid) < 5) Requires: (php-composer(symfony/config) >= 4.4 with php-composer(symfony/config) < 6) @@ -169,7 +169,7 @@ mv config src/Bartlett/CompatInfo/config # Check package version FILE=src/Bartlett/CompatInfo/Console/Application.php -sed -e 's/5.5.1/%{version}/' -i $FILE +#sed -e 's/5.5.1/#{version}/' -i $FILE grep " VERSION" $FILE grep %{version} $FILE @@ -201,7 +201,7 @@ sed -e 's:@BUILDPATH@:%{buildroot}%{_datadir}/php/Bartlett/CompatInfo:' \ -i tests/TestCase.php tests/Sniffs/SniffTestCase.php tests/Reference/ParameterTest.php ret=0 -for cmdarg in "php %{phpunit}" php73 php74 php80; do +for cmdarg in "php %{phpunit}" php74 php80 php81; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} --verbose || ret=1 @@ -228,6 +228,10 @@ fi %changelog +* Fri Dec 10 2021 Remi Collet - 5.5.4-1 +- update to 5.5.4 +- raise dependency on bartlett/php-compatinfo-db 3.6 + * Fri Jul 23 2021 Fedora Release Engineering - 5.5.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 054f865..9c4421a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-5.5.3-7353738.tar.gz) = ae0d12353505763a55594d98a9856a277f4badd5f654a031c156f3da45f81de7b05920d076f7d3ebcd396050514d57a8ed3655ebe79a54558af81e6c28a91973 +SHA512 (php-bartlett-PHP-CompatInfo-5.5.4-e3b0129.tar.gz) = 5f46a4b4444bae3a9804d022c37f9b664b03f38e54b9412746112a4bee85383673a1134cdc54b1dc8c02edd207697b1a006afee260743b58385adc9d78715412 From 48611e0b170ac78f4526c9fa3a16456fef3e1185 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 13 Dec 2021 15:04:38 +0100 Subject: [PATCH 068/111] update to 6.0.1 raise dependency on PHP 7.4 drop dependency on bartlett/php-reflect add dependency on nikic/php-parser --- .gitignore | 1 + php-bartlett-PHP-CompatInfo-5.5.4-rpm.patch | 93 --------------------- php-bartlett-PHP-CompatInfo-6.0.0-rpm.patch | 86 +++++++++++++++++++ php-bartlett-PHP-CompatInfo.spec | 49 ++++++----- sources | 2 +- 5 files changed, 115 insertions(+), 116 deletions(-) delete mode 100644 php-bartlett-PHP-CompatInfo-5.5.4-rpm.patch create mode 100644 php-bartlett-PHP-CompatInfo-6.0.0-rpm.patch diff --git a/.gitignore b/.gitignore index b0b1258..b990b54 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ clog /php-bartlett-PHP-CompatInfo-5.5.2-547803e.tar.gz /php-bartlett-PHP-CompatInfo-5.5.3-7353738.tar.gz /php-bartlett-PHP-CompatInfo-5.5.4-e3b0129.tar.gz +/php-bartlett-PHP-CompatInfo-6.0.1-5978aea.tar.gz diff --git a/php-bartlett-PHP-CompatInfo-5.5.4-rpm.patch b/php-bartlett-PHP-CompatInfo-5.5.4-rpm.patch deleted file mode 100644 index 80e3196..0000000 --- a/php-bartlett-PHP-CompatInfo-5.5.4-rpm.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo ---- ./bin/phpcompatinfo.rpm 2021-12-10 15:36:22.000000000 +0100 -+++ ./bin/phpcompatinfo 2021-12-10 16:26:30.756115071 +0100 -@@ -8,12 +8,12 @@ if (PHP_SAPI !== 'cli') { - - gc_disable(); // performance boost - --require_once dirname(__DIR__) . '/config/bootstrap.php'; -+require_once '/usr/share/php/Bartlett/CompatInfo/config/bootstrap.php'; - - use Bartlett\CompatInfo\Console\ApplicationInterface; - - /** @var \Symfony\Component\DependencyInjection\ContainerBuilder $container */ --$container = require dirname(__DIR__) . '/config/container.php'; -+$container = require '/usr/share/php/Bartlett/CompatInfo/config/container.php'; - - $app = $container->get(ApplicationInterface::class); - $app->setContainer($container); -diff -up ./config/bootstrap.php.rpm ./config/bootstrap.php ---- ./config/bootstrap.php.rpm 2021-12-10 15:36:22.000000000 +0100 -+++ ./config/bootstrap.php 2021-12-10 16:26:30.757115067 +0100 -@@ -6,6 +6,8 @@ if (\Phar::running()) { - ]; - } else { - $possibleAutoloadPaths = [ -+ // RPM -+ __DIR__ . '/../autoload.php', - // local dev repository - __DIR__ . '/../vendor/autoload.php', - // dependency -diff -up ./config/set/default.php.rpm ./config/set/default.php ---- ./config/set/default.php.rpm 2021-12-10 16:26:30.757115067 +0100 -+++ ./config/set/default.php 2021-12-10 16:28:22.196710654 +0100 -@@ -32,7 +32,7 @@ use function Symfony\Component\Dependenc - * @return void - */ - return static function (ContainerConfigurator $containerConfigurator): void { -- $containerConfigurator->import(dirname(__DIR__, 2) . '/vendor/bartlett/php-compatinfo-db/config/set/default.php'); -+ $containerConfigurator->import('/usr/share/php/Bartlett/CompatInfoDb/config/set/default.php'); - $containerConfigurator->import(__DIR__ . '/common.php'); - - $parameters = $containerConfigurator->parameters(); -diff -up ./src/Bartlett/CompatInfo/Console/Application.php.rpm ./src/Bartlett/CompatInfo/Console/Application.php ---- ./src/Bartlett/CompatInfo/Console/Application.php.rpm 2021-12-10 15:36:22.000000000 +0100 -+++ ./src/Bartlett/CompatInfo/Console/Application.php 2021-12-10 16:26:30.757115067 +0100 -@@ -30,8 +30,6 @@ use Symfony\Component\DependencyInjectio - use Symfony\Component\EventDispatcher\EventDispatcher; - use Symfony\Component\EventDispatcher\EventDispatcherInterface ; - --use PackageVersions\Versions; -- - use Phar; - use function substr_count; - -@@ -78,14 +76,6 @@ class Application extends BaseApplicatio - $version = self::VERSION; - } elseif (substr_count($version, '.') === 2) { - // release is in X.Y.Z format -- } else { -- // composer or git strategy -- $version = Versions::getVersion('bartlett/php-compatinfo'); -- list($ver, ) = explode('@', $version); -- -- if (strpos($ver, 'dev') === false) { -- $version = $ver; -- } - } - parent::__construct(self::NAME, $version); - -diff -up ./tests/Reference/ParameterTest.php.rpm ./tests/Reference/ParameterTest.php ---- ./tests/Reference/ParameterTest.php.rpm 2021-12-10 15:36:22.000000000 +0100 -+++ ./tests/Reference/ParameterTest.php 2021-12-10 16:26:30.757115067 +0100 -@@ -42,7 +42,7 @@ final class ParameterTest extends SniffT - */ - public function functionProvider() - { -- $container = require __DIR__ . '/../../config/container.php'; -+ $container = require '@BUILDPATH@/config/container.php'; - $repository = $container->get(FunctionRepository::class); - $functions = []; - foreach ($repository->getAll() as $function) { -diff -up ./tests/TestCase.php.rpm ./tests/TestCase.php ---- ./tests/TestCase.php.rpm 2021-12-10 15:36:22.000000000 +0100 -+++ ./tests/TestCase.php 2021-12-10 16:26:30.757115067 +0100 -@@ -46,7 +46,7 @@ abstract class TestCase extends \PHPUnit - */ - protected function executeAnalysis(string $dataSource): array - { -- $container = require __DIR__ . '/../config/container.php'; -+ $container = require '@BUILDPATH@/config/container.php'; - $references = $container->get(ReferenceCollectionInterface::class); - $sniffs = $container->get(SniffCollection::class); - diff --git a/php-bartlett-PHP-CompatInfo-6.0.0-rpm.patch b/php-bartlett-PHP-CompatInfo-6.0.0-rpm.patch new file mode 100644 index 0000000..e511f63 --- /dev/null +++ b/php-bartlett-PHP-CompatInfo-6.0.0-rpm.patch @@ -0,0 +1,86 @@ +diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo +--- ./bin/phpcompatinfo.rpm 2021-12-13 14:10:12.445234956 +0100 ++++ ./bin/phpcompatinfo 2021-12-13 14:11:01.438091460 +0100 +@@ -8,7 +8,7 @@ if (PHP_SAPI !== 'cli') { + + gc_disable(); // performance boost + +-require_once dirname(__DIR__) . '/config/bootstrap.php'; ++require_once '/usr/share/php/Bartlett/CompatInfo/config/bootstrap.php'; + + use Bartlett\CompatInfo\Infrastructure\Framework\Symfony\DependencyInjection\ContainerFactory; + use Bartlett\CompatInfo\Presentation\Console\ApplicationInterface; +diff -up ./config/bootstrap.php.rpm ./config/bootstrap.php +--- ./config/bootstrap.php.rpm 2021-12-13 13:15:10.000000000 +0100 ++++ ./config/bootstrap.php 2021-12-13 14:10:12.445234956 +0100 +@@ -6,6 +6,8 @@ if (\Phar::running()) { + ]; + } else { + $possibleAutoloadPaths = [ ++ // RPM ++ __DIR__ . '/../autoload.php', + // local dev repository + __DIR__ . '/../vendor/autoload.php', + // dependency +diff -up ./config/set/default.php.rpm ./config/set/default.php +--- ./config/set/default.php.rpm 2021-12-13 14:10:12.445234956 +0100 ++++ ./config/set/default.php 2021-12-13 14:14:41.830445824 +0100 +@@ -32,7 +32,7 @@ use function Symfony\Component\Dependenc + * @return void + */ + return static function (ContainerConfigurator $containerConfigurator): void { +- $containerConfigurator->import(dirname(__DIR__, 2) . '/vendor/bartlett/php-compatinfo-db/config/set/default.php'); ++ $containerConfigurator->import('/usr/share/php/Bartlett/CompatInfoDb/config/set/default.php'); + $containerConfigurator->import(__DIR__ . '/common.php'); + $containerConfigurator->import(__DIR__ . '/../packages/messenger.php'); + +@@ -88,7 +88,9 @@ return static function (ContainerConfigu + ->tag('phpcompatinfo.sniff') + ; + +- $services->load('Bartlett\CompatInfo\\', __DIR__ . '/../../src'); ++ $services->load('Bartlett\CompatInfo\\Application\\', __DIR__ . '/../../Application'); ++ $services->load('Bartlett\CompatInfo\\Infrastructure\\', __DIR__ . '/../../Infrastructure'); ++ $services->load('Bartlett\CompatInfo\\Presentation\\', __DIR__ . '/../../Presentation'); + + // @link https://symfony.com/doc/current/service_container/tags.html#reference-tagged-services + $services->set(SniffCollectionInterface::class, SniffCollection::class) +diff -up ./src/Presentation/Console/Application.php.rpm ./src/Presentation/Console/Application.php +--- ./src/Presentation/Console/Application.php.rpm 2021-12-13 14:16:35.187113793 +0100 ++++ ./src/Presentation/Console/Application.php 2021-12-13 14:16:46.822079705 +0100 +@@ -13,8 +13,6 @@ + + namespace Bartlett\CompatInfo\Presentation\Console; + +-use PackageVersions\Versions; +- + use Symfony\Component\Config\Exception\FileLocatorFileNotFoundException; + use Symfony\Component\Config\FileLocator; + use Symfony\Component\Console\Application as SymfonyApplication; +@@ -71,14 +69,6 @@ class Application extends SymfonyApplica + $version = self::VERSION; + } elseif (substr_count($version, '.') === 2) { + // release is in X.Y.Z format +- } else { +- // composer or git strategy +- $version = Versions::getVersion('bartlett/php-compatinfo'); +- list($ver, ) = explode('@', $version); +- +- if (strpos($ver, 'dev') === false) { +- $version = $ver; +- } + } + parent::__construct(self::NAME, $version); + } +diff -up ./src/Infrastructure/Framework/Symfony/DependencyInjection/ContainerFactory.php.rpm ./src/Infrastructure/Framework/Symfony/DependencyInjection/ContainerFactory.php +--- ./src/Infrastructure/Framework/Symfony/DependencyInjection/ContainerFactory.php.rpm 2021-12-13 14:26:26.391380450 +0100 ++++ ./src/Infrastructure/Framework/Symfony/DependencyInjection/ContainerFactory.php 2021-12-13 14:26:32.148363508 +0100 +@@ -23,7 +23,7 @@ class ContainerFactory + $containerBuilder = new ContainerBuilder(); + $containerBuilder->addCompilerPass(new MessengerPass()); + +- $loader = new PhpFileLoader($containerBuilder, new FileLocator(dirname(__DIR__, 5) . '/config/set')); ++ $loader = new PhpFileLoader($containerBuilder, new FileLocator(dirname(__DIR__, 4) . '/config/set')); + $loader->load($set . '.php'); + $containerBuilder->compile(); // mandatory or the sniffCollection won't be populated + return $containerBuilder; diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 1fde510..6cfb832 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 e3b01295c0c46c3b751ef4a01dc41ad696815bc6 +%global gh_commit 5978aea8eb937157c72b8217dcaac148e6f5ae7d %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville @@ -19,7 +19,7 @@ #global prever RC2 %bcond_without tests -%global upstream_version 5.5.4 +%global upstream_version 6.0.1 #global upstream_prever RC1 Name: php-bartlett-PHP-CompatInfo @@ -36,14 +36,13 @@ Source1: fedora-review-check # Autoload and config path # avoid jean85/pretty-package-versions -Patch0: %{name}-5.5.4-rpm.patch +Patch0: %{name}-6.0.0-rpm.patch BuildArch: noarch -BuildRequires: php(language) >= 7.2 +BuildRequires: php(language) >= 7.4 %if %{with tests} # to run test suite BuildRequires: php-pdo_sqlite -BuildRequires: (php-composer(bartlett/php-reflect) >= 4.4 with php-composer(bartlett/php-reflect) < 5) BuildRequires: (php-composer(bartlett/php-compatinfo-db) >= 3.6 with php-composer(bartlett/php-compatinfo-db) < 4) BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) BuildRequires: (php-composer(ramsey/uuid) >= 4.0 with php-composer(ramsey/uuid) < 5) @@ -55,6 +54,7 @@ BuildRequires: (php-composer(symfony/finder) >= 4.4 with php-comp BuildRequires: (php-composer(symfony/serializer) >= 4.4 with php-composer(symfony/serializer) < 6) BuildRequires: (php-composer(symfony/stopwatch) >= 4.4 with php-composer(symfony/stopwatch) < 6) BuildRequires: (php-composer(doctrine/collections) >= 1.4 with php-composer(doctrine/collections) < 2) +BuildRequires: (php-composer(nikic/php-parser) >= 4.10 with php-composer(nikic/php-parser) < 5) %global phpunit %{_bindir}/phpunit9 BuildRequires: %{phpunit} # For our patch / autoloader @@ -62,16 +62,15 @@ BuildRequires: php-fedora-autoloader-devel %endif # From composer.json, "require" -# "php": "^7.2|^8.0", +# "php": "^7.4|^8.0", +# "ext-json": "*", # "ext-libxml": "*", # "ext-pcre": "*", # "ext-spl": "*", -# "ext-json": "*", -# "ext-pdo": "*", -# "ext-pdo_sqlite": "*", # "bartlett/php-reflect": "^4.4", # "bartlett/php-compatinfo-db": "^3.6", # "doctrine/collections": "^1.4", +# "nikic/php-parser": "^4.10", # "composer/package-versions-deprecated": "^1.8", # "psr/log": "^1.0", # "ramsey/uuid": "^3.9|^4.0", @@ -82,15 +81,13 @@ BuildRequires: php-fedora-autoloader-devel # "symfony/dependency-injection": "^4.4|^5.0", # "symfony/serializer": "^4.4|^5.0", # "symfony/stopwatch": "^4.4|^5.0" -Requires: php(language) >= 7.2 +Requires: php(language) >= 7.4 Requires: php-cli Requires: php-json Requires: php-libxml Requires: php-pcre -Requires: php-pdo Requires: php-pdo_sqlite Requires: php-spl -Requires: (php-composer(bartlett/php-reflect) >= 4.4 with php-composer(bartlett/php-reflect) < 5) Requires: (php-composer(bartlett/php-compatinfo-db) >= 3.6 with php-composer(bartlett/php-compatinfo-db) < 4) Requires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) Requires: (php-composer(ramsey/uuid) >= 4.0 with php-composer(ramsey/uuid) < 5) @@ -102,6 +99,7 @@ Requires: (php-composer(symfony/finder) >= 4.4 with php-comp Requires: (php-composer(symfony/serializer) >= 4.4 with php-composer(symfony/serializer) < 6) Requires: (php-composer(symfony/stopwatch) >= 4.4 with php-composer(symfony/stopwatch) < 6) Requires: (php-composer(doctrine/collections) >= 1.4 with php-composer(doctrine/collections) < 2) +Requires: (php-composer(nikic/php-parser) >= 4.10 with php-composer(nikic/php-parser) < 5) # Required by autoloader Requires: php-composer(fedora/autoloader) @@ -125,12 +123,12 @@ Documentation: http://php5.laurent-laville.org/compatinfo/manual/current/en/ phpab \ --template fedora \ - --output src/Bartlett/CompatInfo/autoload.php \ - src/Bartlett/CompatInfo -cat << 'EOF' | tee -a src/Bartlett/CompatInfo/autoload.php + --output src/autoload.php \ + src +cat << 'EOF' | tee -a src/autoload.php \Fedora\Autoloader\Dependencies::required([ - '%{_datadir}/php/Bartlett/Reflect/autoload.php', + '%{_datadir}/php/PhpParser4/autoload.php', '%{_datadir}/php/Bartlett/CompatInfoDb/autoload.php', '%{_datadir}/php/Psr/Log/autoload.php', '%{_datadir}/php/Ramsey/Uuid/autoload.php', @@ -157,6 +155,7 @@ cat << 'EOF' | tee -a src/Bartlett/CompatInfo/autoload.php '%{_datadir}/php/Symfony4/Component/Stopwatch/autoload.php', ], '%{_datadir}/php/Doctrine/Common/Collections/autoload.php', + __DIR__ . '/Infrastructure/Framework/Symfony/Polyfill.php', ]); EOF @@ -164,11 +163,11 @@ EOF find src -name \*rpm -delete -print # fix path in configuration -sed -e 's:src/Bartlett/CompatInfo/::' -i config/set/*php -mv config src/Bartlett/CompatInfo/config +sed -e 's:/src::' -i config/set/*php +mv config src/config # Check package version -FILE=src/Bartlett/CompatInfo/Console/Application.php +FILE=src/Presentation/Console/ApplicationInterface.php #sed -e 's/5.5.1/#{version}/' -i $FILE grep " VERSION" $FILE grep %{version} $FILE @@ -179,8 +178,8 @@ grep %{version} $FILE %install -mkdir -p %{buildroot}%{_datadir}/php -cp -pr src/Bartlett %{buildroot}%{_datadir}/php/Bartlett +mkdir -p %{buildroot}%{_datadir}/php/Bartlett +cp -pr src %{buildroot}%{_datadir}/php/Bartlett/CompatInfo install -D -p -m 755 bin/phpcompatinfo %{buildroot}%{_bindir}/phpcompatinfo install -D -p -m 644 bin/phpcompatinfo.1 %{buildroot}%{_mandir}/man1/phpcompatinfo.1 @@ -194,7 +193,7 @@ mkdir config cat << 'EOF' | tee config/bootstrap.php - 6.0.1-1 +- update to 6.0.1 +- raise dependency on PHP 7.4 +- drop dependency on bartlett/php-reflect +- add dependency on nikic/php-parser + * Fri Dec 10 2021 Remi Collet - 5.5.4-1 - update to 5.5.4 - raise dependency on bartlett/php-compatinfo-db 3.6 diff --git a/sources b/sources index 9c4421a..4bd81eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-5.5.4-e3b0129.tar.gz) = 5f46a4b4444bae3a9804d022c37f9b664b03f38e54b9412746112a4bee85383673a1134cdc54b1dc8c02edd207697b1a006afee260743b58385adc9d78715412 +SHA512 (php-bartlett-PHP-CompatInfo-6.0.1-5978aea.tar.gz) = abc4a036ed0d3775980219343eb84bb6fd2e6761137fb37151ecab92ff9ab260d98c0406b32104ef3247d89a4bef62268d325d35a61d7bf41f7b2a088e9733b7 From c3435b8afbbf1b0a34856a44e499c54d547d7e3b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 3 Jan 2022 12:41:36 +0100 Subject: [PATCH 069/111] update to 6.0.2 open https://github.com/llaville/php-compatinfo/issues/316 regression, compatibility with Symfony 4 --- .gitignore | 1 + ...hp-bartlett-PHP-CompatInfo-6.0.2-rpm.patch | 54 ++++++++++--------- php-bartlett-PHP-CompatInfo-6.0.2-sf4.patch | 36 +++++++++++++ php-bartlett-PHP-CompatInfo.spec | 19 +++++-- sources | 2 +- 5 files changed, 81 insertions(+), 31 deletions(-) rename php-bartlett-PHP-CompatInfo-6.0.0-rpm.patch => php-bartlett-PHP-CompatInfo-6.0.2-rpm.patch (74%) create mode 100644 php-bartlett-PHP-CompatInfo-6.0.2-sf4.patch diff --git a/.gitignore b/.gitignore index b990b54..7155f85 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ clog /php-bartlett-PHP-CompatInfo-5.5.3-7353738.tar.gz /php-bartlett-PHP-CompatInfo-5.5.4-e3b0129.tar.gz /php-bartlett-PHP-CompatInfo-6.0.1-5978aea.tar.gz +/php-bartlett-PHP-CompatInfo-6.0.2-4beab5e.tar.gz diff --git a/php-bartlett-PHP-CompatInfo-6.0.0-rpm.patch b/php-bartlett-PHP-CompatInfo-6.0.2-rpm.patch similarity index 74% rename from php-bartlett-PHP-CompatInfo-6.0.0-rpm.patch rename to php-bartlett-PHP-CompatInfo-6.0.2-rpm.patch index e511f63..8ef71b1 100644 --- a/php-bartlett-PHP-CompatInfo-6.0.0-rpm.patch +++ b/php-bartlett-PHP-CompatInfo-6.0.2-rpm.patch @@ -1,6 +1,6 @@ diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo ---- ./bin/phpcompatinfo.rpm 2021-12-13 14:10:12.445234956 +0100 -+++ ./bin/phpcompatinfo 2021-12-13 14:11:01.438091460 +0100 +--- ./bin/phpcompatinfo.rpm 2021-12-27 16:34:16.000000000 +0100 ++++ ./bin/phpcompatinfo 2022-01-03 07:54:38.530643005 +0100 @@ -8,7 +8,7 @@ if (PHP_SAPI !== 'cli') { gc_disable(); // performance boost @@ -11,8 +11,8 @@ diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo use Bartlett\CompatInfo\Infrastructure\Framework\Symfony\DependencyInjection\ContainerFactory; use Bartlett\CompatInfo\Presentation\Console\ApplicationInterface; diff -up ./config/bootstrap.php.rpm ./config/bootstrap.php ---- ./config/bootstrap.php.rpm 2021-12-13 13:15:10.000000000 +0100 -+++ ./config/bootstrap.php 2021-12-13 14:10:12.445234956 +0100 +--- ./config/bootstrap.php.rpm 2021-12-27 16:34:16.000000000 +0100 ++++ ./config/bootstrap.php 2022-01-03 07:54:38.530643005 +0100 @@ -6,6 +6,8 @@ if (\Phar::running()) { ]; } else { @@ -23,18 +23,22 @@ diff -up ./config/bootstrap.php.rpm ./config/bootstrap.php __DIR__ . '/../vendor/autoload.php', // dependency diff -up ./config/set/default.php.rpm ./config/set/default.php ---- ./config/set/default.php.rpm 2021-12-13 14:10:12.445234956 +0100 -+++ ./config/set/default.php 2021-12-13 14:14:41.830445824 +0100 -@@ -32,7 +32,7 @@ use function Symfony\Component\Dependenc +--- ./config/set/default.php.rpm 2021-12-27 16:34:16.000000000 +0100 ++++ ./config/set/default.php 2022-01-03 07:56:00.619428733 +0100 +@@ -32,11 +32,7 @@ use function Symfony\Component\Dependenc * @return void */ return static function (ContainerConfigurator $containerConfigurator): void { -- $containerConfigurator->import(dirname(__DIR__, 2) . '/vendor/bartlett/php-compatinfo-db/config/set/default.php'); -+ $containerConfigurator->import('/usr/share/php/Bartlett/CompatInfoDb/config/set/default.php'); +- if (file_exists(dirname(__DIR__, 2) . '/vendor')) { +- $configSet = dirname(__DIR__, 2) . '/vendor/bartlett/php-compatinfo-db/config/set/default.php'; +- } else { +- $configSet = dirname(__DIR__, 3) . '/php-compatinfo-db/config/set/default.php'; +- } ++ $configSet = '/usr/share/php/Bartlett/CompatInfoDb/config/set/default.php'; + $containerConfigurator->import($configSet); $containerConfigurator->import(__DIR__ . '/common.php'); $containerConfigurator->import(__DIR__ . '/../packages/messenger.php'); - -@@ -88,7 +88,9 @@ return static function (ContainerConfigu +@@ -93,7 +89,9 @@ return static function (ContainerConfigu ->tag('phpcompatinfo.sniff') ; @@ -45,9 +49,21 @@ diff -up ./config/set/default.php.rpm ./config/set/default.php // @link https://symfony.com/doc/current/service_container/tags.html#reference-tagged-services $services->set(SniffCollectionInterface::class, SniffCollection::class) +diff -up ./src/Infrastructure/Framework/Symfony/DependencyInjection/ContainerFactory.php.rpm ./src/Infrastructure/Framework/Symfony/DependencyInjection/ContainerFactory.php +--- ./src/Infrastructure/Framework/Symfony/DependencyInjection/ContainerFactory.php.rpm 2021-12-27 16:34:16.000000000 +0100 ++++ ./src/Infrastructure/Framework/Symfony/DependencyInjection/ContainerFactory.php 2022-01-03 07:54:38.530643005 +0100 +@@ -23,7 +23,7 @@ class ContainerFactory + $containerBuilder = new ContainerBuilder(); + $containerBuilder->addCompilerPass(new MessengerPass()); + +- $loader = new PhpFileLoader($containerBuilder, new FileLocator(dirname(__DIR__, 5) . '/config/set')); ++ $loader = new PhpFileLoader($containerBuilder, new FileLocator(dirname(__DIR__, 4) . '/config/set')); + $loader->load($set . '.php'); + $containerBuilder->compile(); // mandatory or the sniffCollection won't be populated + return $containerBuilder; diff -up ./src/Presentation/Console/Application.php.rpm ./src/Presentation/Console/Application.php ---- ./src/Presentation/Console/Application.php.rpm 2021-12-13 14:16:35.187113793 +0100 -+++ ./src/Presentation/Console/Application.php 2021-12-13 14:16:46.822079705 +0100 +--- ./src/Presentation/Console/Application.php.rpm 2021-12-27 16:34:16.000000000 +0100 ++++ ./src/Presentation/Console/Application.php 2022-01-03 07:54:38.530643005 +0100 @@ -13,8 +13,6 @@ namespace Bartlett\CompatInfo\Presentation\Console; @@ -72,15 +88,3 @@ diff -up ./src/Presentation/Console/Application.php.rpm ./src/Presentation/Conso } parent::__construct(self::NAME, $version); } -diff -up ./src/Infrastructure/Framework/Symfony/DependencyInjection/ContainerFactory.php.rpm ./src/Infrastructure/Framework/Symfony/DependencyInjection/ContainerFactory.php ---- ./src/Infrastructure/Framework/Symfony/DependencyInjection/ContainerFactory.php.rpm 2021-12-13 14:26:26.391380450 +0100 -+++ ./src/Infrastructure/Framework/Symfony/DependencyInjection/ContainerFactory.php 2021-12-13 14:26:32.148363508 +0100 -@@ -23,7 +23,7 @@ class ContainerFactory - $containerBuilder = new ContainerBuilder(); - $containerBuilder->addCompilerPass(new MessengerPass()); - -- $loader = new PhpFileLoader($containerBuilder, new FileLocator(dirname(__DIR__, 5) . '/config/set')); -+ $loader = new PhpFileLoader($containerBuilder, new FileLocator(dirname(__DIR__, 4) . '/config/set')); - $loader->load($set . '.php'); - $containerBuilder->compile(); // mandatory or the sniffCollection won't be populated - return $containerBuilder; diff --git a/php-bartlett-PHP-CompatInfo-6.0.2-sf4.patch b/php-bartlett-PHP-CompatInfo-6.0.2-sf4.patch new file mode 100644 index 0000000..298dc70 --- /dev/null +++ b/php-bartlett-PHP-CompatInfo-6.0.2-sf4.patch @@ -0,0 +1,36 @@ +From b110f1e6cebf3e9e0a946ecb64ba2eebb085589f Mon Sep 17 00:00:00 2001 +From: Laurent Laville +Date: Mon, 13 Dec 2021 12:25:26 +0100 +Subject: [PATCH] fix Symfony 4 compatibility (see issue #310) (#311) + +--- + src/Application/Event/Dispatcher/EventDispatcher.php | 2 +- + src/Presentation/Console/Style.php | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/Application/Event/Dispatcher/EventDispatcher.php b/src/Application/Event/Dispatcher/EventDispatcher.php +index 2353e2b8..e6558d03 100644 +--- a/src/Application/Event/Dispatcher/EventDispatcher.php ++++ b/src/Application/Event/Dispatcher/EventDispatcher.php +@@ -75,7 +75,7 @@ public function __construct( + /** + * {@inheritDoc} + */ +- public function dispatch(object $event, string $eventName = null): object ++ public function dispatch($event, string $eventName = null): object + { + $triggered = false; + foreach ($this->extensionLoader->getNames() as $extensionName) { +diff --git a/src/Presentation/Console/Style.php b/src/Presentation/Console/Style.php +index 89bafcd2..14e6c427 100644 +--- a/src/Presentation/Console/Style.php ++++ b/src/Presentation/Console/Style.php +@@ -13,7 +13,7 @@ final class Style extends SymfonyStyle implements StyleInterface + /** + * {@inheritDoc} + */ +- public function createProgressBar(int $max = 0) ++ public function createProgressBar($max = 0) + { + $progressBar = parent::createProgressBar($max); + diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 6cfb832..8328892 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-bartlett-PHP-CompatInfo # -# Copyright (c) 2011-2021 Remi Collet +# Copyright (c) 2011-2022 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -11,7 +11,7 @@ %undefine __brp_mangle_shebangs %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit 5978aea8eb937157c72b8217dcaac148e6f5ae7d +%global gh_commit 4beab5e0a5c27fb81a3ba0b262b3ed85a19500be %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville @@ -19,7 +19,7 @@ #global prever RC2 %bcond_without tests -%global upstream_version 6.0.1 +%global upstream_version 6.0.2 #global upstream_prever RC1 Name: php-bartlett-PHP-CompatInfo @@ -36,7 +36,9 @@ Source1: fedora-review-check # Autoload and config path # avoid jean85/pretty-package-versions -Patch0: %{name}-6.0.0-rpm.patch +Patch0: %{name}-6.0.2-rpm.patch +# upstream patch for Symfony 4 +Patch1: %{name}-6.0.2-sf4.patch BuildArch: noarch BuildRequires: php(language) >= 7.4 @@ -120,6 +122,7 @@ Documentation: http://php5.laurent-laville.org/compatinfo/manual/current/en/ %setup -q -n %{gh_project}-%{gh_commit} %patch0 -p1 -b .rpm +%patch1 -p1 -b .sf4 phpab \ --template fedora \ @@ -160,7 +163,8 @@ cat << 'EOF' | tee -a src/autoload.php EOF # Cleanup patched files -find src -name \*rpm -delete -print +find src -name \*.rpm -delete -print +find src -name \*.sf4 -delete -print # fix path in configuration sed -e 's:/src::' -i config/set/*php @@ -227,6 +231,11 @@ fi %changelog +* Mon Jan 3 2022 Remi Collet - 6.0.2-1 +- update to 6.0.2 +- open https://github.com/llaville/php-compatinfo/issues/316 + regression, compatibility with Symfony 4 + * Mon Dec 13 2021 Remi Collet - 6.0.1-1 - update to 6.0.1 - raise dependency on PHP 7.4 diff --git a/sources b/sources index 4bd81eb..ffdf529 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-6.0.1-5978aea.tar.gz) = abc4a036ed0d3775980219343eb84bb6fd2e6761137fb37151ecab92ff9ab260d98c0406b32104ef3247d89a4bef62268d325d35a61d7bf41f7b2a088e9733b7 +SHA512 (php-bartlett-PHP-CompatInfo-6.0.2-4beab5e.tar.gz) = 039ef2635cfc05f841b48c9479752ce586117cadfdd75686cdd513de447bf77b6e28ee7ca0d32e3f9d353d200b17f71bda863609bde585289c8648cb35090ed9 From 245fd80bc6dca911403647d1f33a0341d4231ae9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 5 Jan 2022 15:55:33 +0100 Subject: [PATCH 070/111] update to 6.0.3 use all PHP bundled libraries instead of system ones --- .gitignore | 1 + makesrc.sh | 50 ++++ php-bartlett-PHP-CompatInfo-6.0.0-rpm.patch | 14 + php-bartlett-PHP-CompatInfo-6.0.2-rpm.patch | 90 ------- php-bartlett-PHP-CompatInfo-6.0.2-sf4.patch | 36 --- php-bartlett-PHP-CompatInfo.spec | 269 ++++++++------------ sources | 2 +- 7 files changed, 175 insertions(+), 287 deletions(-) create mode 100755 makesrc.sh create mode 100644 php-bartlett-PHP-CompatInfo-6.0.0-rpm.patch delete mode 100644 php-bartlett-PHP-CompatInfo-6.0.2-rpm.patch delete mode 100644 php-bartlett-PHP-CompatInfo-6.0.2-sf4.patch diff --git a/.gitignore b/.gitignore index 7155f85..3a672bd 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ clog /php-bartlett-PHP-CompatInfo-5.5.4-e3b0129.tar.gz /php-bartlett-PHP-CompatInfo-6.0.1-5978aea.tar.gz /php-bartlett-PHP-CompatInfo-6.0.2-4beab5e.tar.gz +/php-bartlett-PHP-CompatInfo-6.0.3-7f878c7.tgz diff --git a/makesrc.sh b/makesrc.sh new file mode 100755 index 0000000..c0e118c --- /dev/null +++ b/makesrc.sh @@ -0,0 +1,50 @@ +#!/bin/bash + +NAME=$(basename $PWD) +OWNER=$(sed -n '/^%global gh_owner/{s/.* //;p}' $NAME.spec) +PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec) +VERSION=$(sed -n '/^%global upstream_version/{s/.* //;p}' $NAME.spec) +COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec) +SHORT=${COMMIT:0:7} + +echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION, Commit=$COMMIT\n" + +echo "Cloning..." +git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT + +echo "Getting commit..." + pushd $PROJECT-$COMMIT + git checkout $COMMIT || exit 1 + + cp composer.json vendor/composer/installed.json ../ + sed -e 's/"config": {/"config": {"platform": {"php": "7.4.0"},/' -i composer.json + + composer install --no-dev --optimize-autoloader + + mkdir data + cp ${HOME}/.cache/bartlett/compatinfo-db.sqlite data + + php -r ' + $pkgs = file_get_contents("vendor/composer/installed.json"); + $pkgs = json_decode($pkgs, true); + if (!is_array($pkgs) || !isset($pkgs["packages"])) { + echo "cant decode json file\n"; + exit(3); + } + $lic = []; + foreach($pkgs["packages"] as $pkg) { + printf("Provides: bundled(php-%s) = %s\n", str_replace(["/", "_"], ["-", "-"], $pkg["name"]), $pkg["version"]); + $lic = array_merge($lic, $pkg["license"]); + } + sort($lic); + printf("\nLicense: %s\n", implode(" and ", array_unique($lic)));' + popd + +echo "Archiving..." +tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs $PROJECT-$COMMIT + +echo "Cleaning..." +rm -rf $PROJECT-$COMMIT + +echo "Done." + diff --git a/php-bartlett-PHP-CompatInfo-6.0.0-rpm.patch b/php-bartlett-PHP-CompatInfo-6.0.0-rpm.patch new file mode 100644 index 0000000..92cebab --- /dev/null +++ b/php-bartlett-PHP-CompatInfo-6.0.0-rpm.patch @@ -0,0 +1,14 @@ +diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo +--- ./bin/phpcompatinfo.rpm 2021-12-13 12:09:12.000000000 +0100 ++++ ./bin/phpcompatinfo 2021-12-13 12:12:30.838533965 +0100 +@@ -6,6 +6,10 @@ if (PHP_SAPI !== 'cli') { + return; + } + ++if (!getenv("DATABASE_URL")) { ++ putenv("DATABASE_URL=sqlite:///" . dirname(__DIR__) . "/data/compatinfo-db.sqlite"); ++} ++ + gc_disable(); // performance boost + + require_once dirname(__DIR__) . '/config/bootstrap.php'; diff --git a/php-bartlett-PHP-CompatInfo-6.0.2-rpm.patch b/php-bartlett-PHP-CompatInfo-6.0.2-rpm.patch deleted file mode 100644 index 8ef71b1..0000000 --- a/php-bartlett-PHP-CompatInfo-6.0.2-rpm.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo ---- ./bin/phpcompatinfo.rpm 2021-12-27 16:34:16.000000000 +0100 -+++ ./bin/phpcompatinfo 2022-01-03 07:54:38.530643005 +0100 -@@ -8,7 +8,7 @@ if (PHP_SAPI !== 'cli') { - - gc_disable(); // performance boost - --require_once dirname(__DIR__) . '/config/bootstrap.php'; -+require_once '/usr/share/php/Bartlett/CompatInfo/config/bootstrap.php'; - - use Bartlett\CompatInfo\Infrastructure\Framework\Symfony\DependencyInjection\ContainerFactory; - use Bartlett\CompatInfo\Presentation\Console\ApplicationInterface; -diff -up ./config/bootstrap.php.rpm ./config/bootstrap.php ---- ./config/bootstrap.php.rpm 2021-12-27 16:34:16.000000000 +0100 -+++ ./config/bootstrap.php 2022-01-03 07:54:38.530643005 +0100 -@@ -6,6 +6,8 @@ if (\Phar::running()) { - ]; - } else { - $possibleAutoloadPaths = [ -+ // RPM -+ __DIR__ . '/../autoload.php', - // local dev repository - __DIR__ . '/../vendor/autoload.php', - // dependency -diff -up ./config/set/default.php.rpm ./config/set/default.php ---- ./config/set/default.php.rpm 2021-12-27 16:34:16.000000000 +0100 -+++ ./config/set/default.php 2022-01-03 07:56:00.619428733 +0100 -@@ -32,11 +32,7 @@ use function Symfony\Component\Dependenc - * @return void - */ - return static function (ContainerConfigurator $containerConfigurator): void { -- if (file_exists(dirname(__DIR__, 2) . '/vendor')) { -- $configSet = dirname(__DIR__, 2) . '/vendor/bartlett/php-compatinfo-db/config/set/default.php'; -- } else { -- $configSet = dirname(__DIR__, 3) . '/php-compatinfo-db/config/set/default.php'; -- } -+ $configSet = '/usr/share/php/Bartlett/CompatInfoDb/config/set/default.php'; - $containerConfigurator->import($configSet); - $containerConfigurator->import(__DIR__ . '/common.php'); - $containerConfigurator->import(__DIR__ . '/../packages/messenger.php'); -@@ -93,7 +89,9 @@ return static function (ContainerConfigu - ->tag('phpcompatinfo.sniff') - ; - -- $services->load('Bartlett\CompatInfo\\', __DIR__ . '/../../src'); -+ $services->load('Bartlett\CompatInfo\\Application\\', __DIR__ . '/../../Application'); -+ $services->load('Bartlett\CompatInfo\\Infrastructure\\', __DIR__ . '/../../Infrastructure'); -+ $services->load('Bartlett\CompatInfo\\Presentation\\', __DIR__ . '/../../Presentation'); - - // @link https://symfony.com/doc/current/service_container/tags.html#reference-tagged-services - $services->set(SniffCollectionInterface::class, SniffCollection::class) -diff -up ./src/Infrastructure/Framework/Symfony/DependencyInjection/ContainerFactory.php.rpm ./src/Infrastructure/Framework/Symfony/DependencyInjection/ContainerFactory.php ---- ./src/Infrastructure/Framework/Symfony/DependencyInjection/ContainerFactory.php.rpm 2021-12-27 16:34:16.000000000 +0100 -+++ ./src/Infrastructure/Framework/Symfony/DependencyInjection/ContainerFactory.php 2022-01-03 07:54:38.530643005 +0100 -@@ -23,7 +23,7 @@ class ContainerFactory - $containerBuilder = new ContainerBuilder(); - $containerBuilder->addCompilerPass(new MessengerPass()); - -- $loader = new PhpFileLoader($containerBuilder, new FileLocator(dirname(__DIR__, 5) . '/config/set')); -+ $loader = new PhpFileLoader($containerBuilder, new FileLocator(dirname(__DIR__, 4) . '/config/set')); - $loader->load($set . '.php'); - $containerBuilder->compile(); // mandatory or the sniffCollection won't be populated - return $containerBuilder; -diff -up ./src/Presentation/Console/Application.php.rpm ./src/Presentation/Console/Application.php ---- ./src/Presentation/Console/Application.php.rpm 2021-12-27 16:34:16.000000000 +0100 -+++ ./src/Presentation/Console/Application.php 2022-01-03 07:54:38.530643005 +0100 -@@ -13,8 +13,6 @@ - - namespace Bartlett\CompatInfo\Presentation\Console; - --use PackageVersions\Versions; -- - use Symfony\Component\Config\Exception\FileLocatorFileNotFoundException; - use Symfony\Component\Config\FileLocator; - use Symfony\Component\Console\Application as SymfonyApplication; -@@ -71,14 +69,6 @@ class Application extends SymfonyApplica - $version = self::VERSION; - } elseif (substr_count($version, '.') === 2) { - // release is in X.Y.Z format -- } else { -- // composer or git strategy -- $version = Versions::getVersion('bartlett/php-compatinfo'); -- list($ver, ) = explode('@', $version); -- -- if (strpos($ver, 'dev') === false) { -- $version = $ver; -- } - } - parent::__construct(self::NAME, $version); - } diff --git a/php-bartlett-PHP-CompatInfo-6.0.2-sf4.patch b/php-bartlett-PHP-CompatInfo-6.0.2-sf4.patch deleted file mode 100644 index 298dc70..0000000 --- a/php-bartlett-PHP-CompatInfo-6.0.2-sf4.patch +++ /dev/null @@ -1,36 +0,0 @@ -From b110f1e6cebf3e9e0a946ecb64ba2eebb085589f Mon Sep 17 00:00:00 2001 -From: Laurent Laville -Date: Mon, 13 Dec 2021 12:25:26 +0100 -Subject: [PATCH] fix Symfony 4 compatibility (see issue #310) (#311) - ---- - src/Application/Event/Dispatcher/EventDispatcher.php | 2 +- - src/Presentation/Console/Style.php | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Application/Event/Dispatcher/EventDispatcher.php b/src/Application/Event/Dispatcher/EventDispatcher.php -index 2353e2b8..e6558d03 100644 ---- a/src/Application/Event/Dispatcher/EventDispatcher.php -+++ b/src/Application/Event/Dispatcher/EventDispatcher.php -@@ -75,7 +75,7 @@ public function __construct( - /** - * {@inheritDoc} - */ -- public function dispatch(object $event, string $eventName = null): object -+ public function dispatch($event, string $eventName = null): object - { - $triggered = false; - foreach ($this->extensionLoader->getNames() as $extensionName) { -diff --git a/src/Presentation/Console/Style.php b/src/Presentation/Console/Style.php -index 89bafcd2..14e6c427 100644 ---- a/src/Presentation/Console/Style.php -+++ b/src/Presentation/Console/Style.php -@@ -13,7 +13,7 @@ final class Style extends SymfonyStyle implements StyleInterface - /** - * {@inheritDoc} - */ -- public function createProgressBar(int $max = 0) -+ public function createProgressBar($max = 0) - { - $progressBar = parent::createProgressBar($max); - diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 8328892..7500ca9 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -11,15 +11,13 @@ %undefine __brp_mangle_shebangs %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit 4beab5e0a5c27fb81a3ba0b262b3ed85a19500be +%global gh_commit 7f878c7b534f3c4bb4d2200267678d53324b5d08 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville %global gh_project php-compatinfo -#global prever RC2 -%bcond_without tests -%global upstream_version 6.0.2 +%global upstream_version 6.0.3 #global upstream_prever RC1 Name: php-bartlett-PHP-CompatInfo @@ -27,86 +25,100 @@ Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} Release: 1%{?dist} Summary: Find out version and the extensions required for a piece of code to run -License: BSD -URL: http://php5.laurent-laville.org/compatinfo/ -Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}%{?prever}-%{gh_short}.tar.gz - +License: BSD and MIT +URL: https://github.com/llaville/php-compatinfo +Source0: %{name}-%{version}-%{gh_short}.tgz # Script for fedora-review Source1: fedora-review-check +# Generate the archive will all dependencies +Source9: makesrc.sh -# Autoload and config path -# avoid jean85/pretty-package-versions -Patch0: %{name}-6.0.2-rpm.patch -# upstream patch for Symfony 4 -Patch1: %{name}-6.0.2-sf4.patch +# Relocate the database +Patch0: %{name}-6.0.0-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 7.4 -%if %{with tests} -# to run test suite +BuildRequires: php-cli +BuildRequires: php-dom +BuildRequires: php-json +BuildRequires: php-libxml +BuildRequires: php-pcre +BuildRequires: php-phar +BuildRequires: php-pdo BuildRequires: php-pdo_sqlite -BuildRequires: (php-composer(bartlett/php-compatinfo-db) >= 3.6 with php-composer(bartlett/php-compatinfo-db) < 4) -BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) -BuildRequires: (php-composer(ramsey/uuid) >= 4.0 with php-composer(ramsey/uuid) < 5) -BuildRequires: (php-composer(symfony/config) >= 4.4 with php-composer(symfony/config) < 6) -BuildRequires: (php-composer(symfony/console) >= 4.4 with php-composer(symfony/console) < 6) -BuildRequires: (php-composer(symfony/dependency-injection) >= 4.4 with php-composer(symfony/dependency-injection) < 6) -BuildRequires: (php-composer(symfony/event-dispatcher) >= 4.4 with php-composer(symfony/event-dispatcher) < 6) -BuildRequires: (php-composer(symfony/finder) >= 4.4 with php-composer(symfony/finder) < 6) -BuildRequires: (php-composer(symfony/serializer) >= 4.4 with php-composer(symfony/serializer) < 6) -BuildRequires: (php-composer(symfony/stopwatch) >= 4.4 with php-composer(symfony/stopwatch) < 6) -BuildRequires: (php-composer(doctrine/collections) >= 1.4 with php-composer(doctrine/collections) < 2) -BuildRequires: (php-composer(nikic/php-parser) >= 4.10 with php-composer(nikic/php-parser) < 5) -%global phpunit %{_bindir}/phpunit9 -BuildRequires: %{phpunit} -# For our patch / autoloader -BuildRequires: php-fedora-autoloader-devel -%endif +BuildRequires: php-simplexml +BuildRequires: php-spl +BuildRequires: php-xmlreader -# From composer.json, "require" -# "php": "^7.4|^8.0", -# "ext-json": "*", -# "ext-libxml": "*", -# "ext-pcre": "*", -# "ext-spl": "*", -# "bartlett/php-reflect": "^4.4", -# "bartlett/php-compatinfo-db": "^3.6", -# "doctrine/collections": "^1.4", -# "nikic/php-parser": "^4.10", -# "composer/package-versions-deprecated": "^1.8", -# "psr/log": "^1.0", -# "ramsey/uuid": "^3.9|^4.0", -# "symfony/config": "^4.4|^5.0", -# "symfony/console": "^4.4|^5.0", -# "symfony/event-dispatcher": "^4.4|^5.0", -# "symfony/finder": "^4.4|^5.0", -# "symfony/dependency-injection": "^4.4|^5.0", -# "symfony/serializer": "^4.4|^5.0", -# "symfony/stopwatch": "^4.4|^5.0" Requires: php(language) >= 7.4 Requires: php-cli +Requires: php-dom Requires: php-json Requires: php-libxml Requires: php-pcre +Requires: php-phar +Requires: php-pdo Requires: php-pdo_sqlite +Requires: php-simplexml Requires: php-spl -Requires: (php-composer(bartlett/php-compatinfo-db) >= 3.6 with php-composer(bartlett/php-compatinfo-db) < 4) -Requires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) -Requires: (php-composer(ramsey/uuid) >= 4.0 with php-composer(ramsey/uuid) < 5) -Requires: (php-composer(symfony/config) >= 4.4 with php-composer(symfony/config) < 6) -Requires: (php-composer(symfony/console) >= 4.4 with php-composer(symfony/console) < 6) -Requires: (php-composer(symfony/dependency-injection) >= 4.4 with php-composer(symfony/dependency-injection) < 6) -Requires: (php-composer(symfony/event-dispatcher) >= 4.4 with php-composer(symfony/event-dispatcher) < 6) -Requires: (php-composer(symfony/finder) >= 4.4 with php-composer(symfony/finder) < 6) -Requires: (php-composer(symfony/serializer) >= 4.4 with php-composer(symfony/serializer) < 6) -Requires: (php-composer(symfony/stopwatch) >= 4.4 with php-composer(symfony/stopwatch) < 6) -Requires: (php-composer(doctrine/collections) >= 1.4 with php-composer(doctrine/collections) < 2) -Requires: (php-composer(nikic/php-parser) >= 4.10 with php-composer(nikic/php-parser) < 5) -# Required by autoloader -Requires: php-composer(fedora/autoloader) +Requires: php-xmlreader -Provides: phpcompatinfo = %{version} -Provides: php-composer(bartlett/php-compatinfo) = %{version} +# Bundled libraries +Provides: bundled(php-bartlett-php-compatinfo-db) = 3.16.1 +Provides: bundled(php-brick-math) = 0.9.3 +Provides: bundled(php-composer-package-versions-deprecated) = 1.11.99.4 +Provides: bundled(php-composer-semver) = 3.2.7 +Provides: bundled(php-doctrine-annotations) = 1.13.2 +Provides: bundled(php-doctrine-cache) = 2.1.1 +Provides: bundled(php-doctrine-collections) = 1.6.8 +Provides: bundled(php-doctrine-common) = 3.2.1 +Provides: bundled(php-doctrine-dbal) = 3.2.0 +Provides: bundled(php-doctrine-deprecations) = v0.5.3 +Provides: bundled(php-doctrine-event-manager) = 1.1.1 +Provides: bundled(php-doctrine-inflector) = 2.0.4 +Provides: bundled(php-doctrine-instantiator) = 1.4.0 +Provides: bundled(php-doctrine-lexer) = 1.2.1 +Provides: bundled(php-doctrine-orm) = 2.10.4 +Provides: bundled(php-doctrine-persistence) = 2.2.3 +Provides: bundled(php-nikic-php-parser) = v4.13.2 +Provides: bundled(php-psr-cache) = 2.0.0 +Provides: bundled(php-psr-container) = 1.1.2 +Provides: bundled(php-psr-event-dispatcher) = 1.0.0 +Provides: bundled(php-psr-log) = 1.1.4 +Provides: bundled(php-ramsey-collection) = 1.2.2 +Provides: bundled(php-ramsey-uuid) = 4.2.3 +Provides: bundled(php-symfony-amqp-messenger) = v5.4.0 +Provides: bundled(php-symfony-cache) = v5.4.2 +Provides: bundled(php-symfony-cache-contracts) = v2.5.0 +Provides: bundled(php-symfony-config) = v5.4.2 +Provides: bundled(php-symfony-console) = v5.4.2 +Provides: bundled(php-symfony-dependency-injection) = v5.4.2 +Provides: bundled(php-symfony-deprecation-contracts) = v3.0.0 +Provides: bundled(php-symfony-doctrine-messenger) = v6.0.2 +Provides: bundled(php-symfony-event-dispatcher) = v5.4.0 +Provides: bundled(php-symfony-event-dispatcher-contracts) = v3.0.0 +Provides: bundled(php-symfony-filesystem) = v6.0.0 +Provides: bundled(php-symfony-finder) = v5.4.2 +Provides: bundled(php-symfony-messenger) = v5.4.2 +Provides: bundled(php-symfony-polyfill-ctype) = v1.24.0 +Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.24.0 +Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.24.0 +Provides: bundled(php-symfony-polyfill-mbstring) = v1.24.0 +Provides: bundled(php-symfony-polyfill-php72) = v1.24.0 +Provides: bundled(php-symfony-polyfill-php73) = v1.24.0 +Provides: bundled(php-symfony-polyfill-php80) = v1.24.0 +Provides: bundled(php-symfony-polyfill-php81) = v1.24.0 +Provides: bundled(php-symfony-process) = v5.4.2 +Provides: bundled(php-symfony-redis-messenger) = v6.0.2 +Provides: bundled(php-symfony-requirements-checker) = v2.0.1 +Provides: bundled(php-symfony-serializer) = v5.4.2 +Provides: bundled(php-symfony-service-contracts) = v2.4.1 +Provides: bundled(php-symfony-stopwatch) = v5.4.0 +Provides: bundled(php-symfony-string) = v6.0.2 +Provides: bundled(php-symfony-var-exporter) = v6.0.0 + +Provides: phpcompatinfo = %{version} +Provides: php-composer(bartlett/php-compatinfo) = %{version} %description @@ -115,122 +127,59 @@ version and extensions required for it to run. CLI version has many reports (extension, interface, class, function, constant) to display and ability to show content of dictionary references. -Documentation: http://php5.laurent-laville.org/compatinfo/manual/current/en/ - %prep %setup -q -n %{gh_project}-%{gh_commit} - %patch0 -p1 -b .rpm -%patch1 -p1 -b .sf4 - -phpab \ - --template fedora \ - --output src/autoload.php \ - src -cat << 'EOF' | tee -a src/autoload.php - -\Fedora\Autoloader\Dependencies::required([ - '%{_datadir}/php/PhpParser4/autoload.php', - '%{_datadir}/php/Bartlett/CompatInfoDb/autoload.php', - '%{_datadir}/php/Psr/Log/autoload.php', - '%{_datadir}/php/Ramsey/Uuid/autoload.php', - [ - '%{_datadir}/php/Symfony5/Component/Config/autoload.php', - '%{_datadir}/php/Symfony4/Component/Config/autoload.php', - ], [ - '%{_datadir}/php/Symfony5/Component/Console/autoload.php', - '%{_datadir}/php/Symfony4/Component/Console/autoload.php', - ], [ - '%{_datadir}/php/Symfony5/Component/DependencyInjection/autoload.php', - '%{_datadir}/php/Symfony4/Component/DependencyInjection/autoload.php', - ], [ - '%{_datadir}/php/Symfony5/Component/EventDispatcher/autoload.php', - '%{_datadir}/php/Symfony4/Component/EventDispatcher/autoload.php', - ], [ - '%{_datadir}/php/Symfony5/Component/Finder/autoload.php', - '%{_datadir}/php/Symfony4/Component/Finder/autoload.php', - ], [ - '%{_datadir}/php/Symfony5/Component/Serializer/autoload.php', - '%{_datadir}/php/Symfony4/Component/Serializer/autoload.php', - ], [ - '%{_datadir}/php/Symfony5/Component/Stopwatch/autoload.php', - '%{_datadir}/php/Symfony4/Component/Stopwatch/autoload.php', - ], - '%{_datadir}/php/Doctrine/Common/Collections/autoload.php', - __DIR__ . '/Infrastructure/Framework/Symfony/Polyfill.php', -]); -EOF - -# Cleanup patched files -find src -name \*.rpm -delete -print -find src -name \*.sf4 -delete -print - -# fix path in configuration -sed -e 's:/src::' -i config/set/*php -mv config src/config - -# Check package version -FILE=src/Presentation/Console/ApplicationInterface.php -#sed -e 's/5.5.1/#{version}/' -i $FILE -grep " VERSION" $FILE -grep %{version} $FILE +# Gather all license files and cleanup tests +mv vendor/composer/LICENSE composer_LICENSE +for vendor in $(ls vendor) +do + for proj in $(ls vendor/$vendor) + do + [ -d vendor/$vendor/$proj/tests ] && rm -r vendor/$vendor/$proj/tests + [ -f vendor/$vendor/$proj/LICENSE ] && mv vendor/$vendor/$proj/LICENSE ${vendor}_${proj}_LICENSE + done +done +rm -r tests %build # Nothing %install -mkdir -p %{buildroot}%{_datadir}/php/Bartlett -cp -pr src %{buildroot}%{_datadir}/php/Bartlett/CompatInfo +mkdir -p %{buildroot}%{_datadir} +cp -pr . %{buildroot}%{_datadir}/%{name} +rm %{buildroot}%{_datadir}/%{name}/*LICENSE -install -D -p -m 755 bin/phpcompatinfo %{buildroot}%{_bindir}/phpcompatinfo -install -D -p -m 644 bin/phpcompatinfo.1 %{buildroot}%{_mandir}/man1/phpcompatinfo.1 +mkdir -p %{buildroot}%{_bindir} +ln -s ../share/%{name}/bin/phpcompatinfo %{buildroot}%{_bindir}/phpcompatinfo -install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/fedora-review-check +mkdir -p %{buildroot}%{_mandir}/man1 +mv %{buildroot}%{_datadir}/%{name}/bin/phpcompatinfo.1 \ + %{buildroot}%{_mandir}/man1/phpcompatinfo.1 + +install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/fedora-review-check -%if %{with tests} %check -mkdir config -cat << 'EOF' | tee config/bootstrap.php -/dev/null || : -fi +%{buildroot}%{_bindir}/phpcompatinfo --version || grep %{version} %files -%license LICENSE -%doc composer.json README.* +%license *LICENSE +%doc README.* %{_bindir}/phpcompatinfo -%{_datadir}/php/Bartlett/CompatInfo -%{_mandir}/man1/phpcompatinfo.1* %{_datadir}/%{name} +%{_mandir}/man1/phpcompatinfo.1* %changelog +* Wed Jan 5 2022 Remi Collet - 6.0.3-1 +- update to 6.0.3 +- use all PHP bundled libraries instead of system ones + * Mon Jan 3 2022 Remi Collet - 6.0.2-1 - update to 6.0.2 - open https://github.com/llaville/php-compatinfo/issues/316 diff --git a/sources b/sources index ffdf529..2b2503c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-6.0.2-4beab5e.tar.gz) = 039ef2635cfc05f841b48c9479752ce586117cadfdd75686cdd513de447bf77b6e28ee7ca0d32e3f9d353d200b17f71bda863609bde585289c8648cb35090ed9 +SHA512 (php-bartlett-PHP-CompatInfo-6.0.3-7f878c7.tgz) = 025435331c9a804d477902e78aa1e36b4b7a76d273a5bf546dc12d5ce22fc6b9a9ef954e59bbad8bf6edc2d5a6df99e2cc032f4131cccc27fe9ee07c0600ed54 From 5591debf191249507b4b8e404a7d824617cc1ecc Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 6 Jan 2022 12:05:41 +0100 Subject: [PATCH 071/111] v6.1.0 --- .gitignore | 1 + makesrc.sh | 2 -- php-bartlett-PHP-CompatInfo.spec | 30 +++++++++++++++++------------- sources | 2 +- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 3a672bd..40c59b5 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ clog /php-bartlett-PHP-CompatInfo-6.0.1-5978aea.tar.gz /php-bartlett-PHP-CompatInfo-6.0.2-4beab5e.tar.gz /php-bartlett-PHP-CompatInfo-6.0.3-7f878c7.tgz +/php-bartlett-PHP-CompatInfo-6.1.0-e40303a.tgz diff --git a/makesrc.sh b/makesrc.sh index c0e118c..f912313 100755 --- a/makesrc.sh +++ b/makesrc.sh @@ -17,8 +17,6 @@ echo "Getting commit..." git checkout $COMMIT || exit 1 cp composer.json vendor/composer/installed.json ../ - sed -e 's/"config": {/"config": {"platform": {"php": "7.4.0"},/' -i composer.json - composer install --no-dev --optimize-autoloader mkdir data diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 7500ca9..8502ffa 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -11,13 +11,13 @@ %undefine __brp_mangle_shebangs %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit 7f878c7b534f3c4bb4d2200267678d53324b5d08 +%global gh_commit e40303a34d7657a92c82cc7cc61c50b5a1f095bd %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville %global gh_project php-compatinfo -%global upstream_version 6.0.3 +%global upstream_version 6.1.0 #global upstream_prever RC1 Name: php-bartlett-PHP-CompatInfo @@ -64,7 +64,8 @@ Requires: php-spl Requires: php-xmlreader # Bundled libraries -Provides: bundled(php-bartlett-php-compatinfo-db) = 3.16.1 +Provides: bundled(php-bartlett-php-compatinfo-db) = 3.17.0 +Provides: bundled(php-bartlett-sarif-php-sdk) = 1.0.1 Provides: bundled(php-brick-math) = 0.9.3 Provides: bundled(php-composer-package-versions-deprecated) = 1.11.99.4 Provides: bundled(php-composer-semver) = 3.2.7 @@ -72,7 +73,7 @@ Provides: bundled(php-doctrine-annotations) = 1.13.2 Provides: bundled(php-doctrine-cache) = 2.1.1 Provides: bundled(php-doctrine-collections) = 1.6.8 Provides: bundled(php-doctrine-common) = 3.2.1 -Provides: bundled(php-doctrine-dbal) = 3.2.0 +Provides: bundled(php-doctrine-dbal) = 3.2.1 Provides: bundled(php-doctrine-deprecations) = v0.5.3 Provides: bundled(php-doctrine-event-manager) = 1.1.1 Provides: bundled(php-doctrine-inflector) = 2.0.4 @@ -81,7 +82,7 @@ Provides: bundled(php-doctrine-lexer) = 1.2.1 Provides: bundled(php-doctrine-orm) = 2.10.4 Provides: bundled(php-doctrine-persistence) = 2.2.3 Provides: bundled(php-nikic-php-parser) = v4.13.2 -Provides: bundled(php-psr-cache) = 2.0.0 +Provides: bundled(php-psr-cache) = 1.0.1 Provides: bundled(php-psr-container) = 1.1.2 Provides: bundled(php-psr-event-dispatcher) = 1.0.0 Provides: bundled(php-psr-log) = 1.1.4 @@ -93,11 +94,11 @@ Provides: bundled(php-symfony-cache-contracts) = v2.5.0 Provides: bundled(php-symfony-config) = v5.4.2 Provides: bundled(php-symfony-console) = v5.4.2 Provides: bundled(php-symfony-dependency-injection) = v5.4.2 -Provides: bundled(php-symfony-deprecation-contracts) = v3.0.0 -Provides: bundled(php-symfony-doctrine-messenger) = v6.0.2 +Provides: bundled(php-symfony-deprecation-contracts) = v2.5.0 +Provides: bundled(php-symfony-doctrine-messenger) = v5.4.0 Provides: bundled(php-symfony-event-dispatcher) = v5.4.0 -Provides: bundled(php-symfony-event-dispatcher-contracts) = v3.0.0 -Provides: bundled(php-symfony-filesystem) = v6.0.0 +Provides: bundled(php-symfony-event-dispatcher-contracts) = v2.5.0 +Provides: bundled(php-symfony-filesystem) = v5.4.0 Provides: bundled(php-symfony-finder) = v5.4.2 Provides: bundled(php-symfony-messenger) = v5.4.2 Provides: bundled(php-symfony-polyfill-ctype) = v1.24.0 @@ -109,13 +110,13 @@ Provides: bundled(php-symfony-polyfill-php73) = v1.24.0 Provides: bundled(php-symfony-polyfill-php80) = v1.24.0 Provides: bundled(php-symfony-polyfill-php81) = v1.24.0 Provides: bundled(php-symfony-process) = v5.4.2 -Provides: bundled(php-symfony-redis-messenger) = v6.0.2 +Provides: bundled(php-symfony-redis-messenger) = v5.4.2 Provides: bundled(php-symfony-requirements-checker) = v2.0.1 Provides: bundled(php-symfony-serializer) = v5.4.2 -Provides: bundled(php-symfony-service-contracts) = v2.4.1 +Provides: bundled(php-symfony-service-contracts) = v2.5.0 Provides: bundled(php-symfony-stopwatch) = v5.4.0 -Provides: bundled(php-symfony-string) = v6.0.2 -Provides: bundled(php-symfony-var-exporter) = v6.0.0 +Provides: bundled(php-symfony-string) = v5.4.2 +Provides: bundled(php-symfony-var-exporter) = v5.4.2 Provides: phpcompatinfo = %{version} Provides: php-composer(bartlett/php-compatinfo) = %{version} @@ -176,6 +177,9 @@ install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/fedora- %changelog +* Thu Jan 6 2022 Remi Collet - 6.1.0-1 +- update to 6.1.0 + * Wed Jan 5 2022 Remi Collet - 6.0.3-1 - update to 6.0.3 - use all PHP bundled libraries instead of system ones diff --git a/sources b/sources index 2b2503c..1166c21 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-6.0.3-7f878c7.tgz) = 025435331c9a804d477902e78aa1e36b4b7a76d273a5bf546dc12d5ce22fc6b9a9ef954e59bbad8bf6edc2d5a6df99e2cc032f4131cccc27fe9ee07c0600ed54 +SHA512 (php-bartlett-PHP-CompatInfo-6.1.0-e40303a.tgz) = 8b0f5c6277540d3b2d3babb2f5cca5fb876729b7cebc4674e1be56a35be0fd3e1d75d69aecc9dc7dab29d920c066d2d5bcdff5c5bccb46302f52d782ee3a8d65 From df1867d39476514bb8730c65952fc559d0e3104d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 18 Jan 2022 11:44:53 +0100 Subject: [PATCH 072/111] update to 6.1.1 update bundled bartlett/php-compatinfo-db 3.17.1 --- .gitignore | 1 + makesrc.sh | 20 ++----------- php-bartlett-PHP-CompatInfo.spec | 49 ++++++++++++++++++++------------ sources | 2 +- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/.gitignore b/.gitignore index 40c59b5..280ada2 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ clog /php-bartlett-PHP-CompatInfo-6.0.2-4beab5e.tar.gz /php-bartlett-PHP-CompatInfo-6.0.3-7f878c7.tgz /php-bartlett-PHP-CompatInfo-6.1.0-e40303a.tgz +/php-bartlett-PHP-CompatInfo-6.1.1-553a953.tgz diff --git a/makesrc.sh b/makesrc.sh index f912313..048f267 100755 --- a/makesrc.sh +++ b/makesrc.sh @@ -16,26 +16,12 @@ echo "Getting commit..." pushd $PROJECT-$COMMIT git checkout $COMMIT || exit 1 - cp composer.json vendor/composer/installed.json ../ - composer install --no-dev --optimize-autoloader + cp composer.json ../ + composer install --no-interaction --no-progress --no-dev --optimize-autoloader + cp vendor/composer/installed.json ../ mkdir data cp ${HOME}/.cache/bartlett/compatinfo-db.sqlite data - - php -r ' - $pkgs = file_get_contents("vendor/composer/installed.json"); - $pkgs = json_decode($pkgs, true); - if (!is_array($pkgs) || !isset($pkgs["packages"])) { - echo "cant decode json file\n"; - exit(3); - } - $lic = []; - foreach($pkgs["packages"] as $pkg) { - printf("Provides: bundled(php-%s) = %s\n", str_replace(["/", "_"], ["-", "-"], $pkg["name"]), $pkg["version"]); - $lic = array_merge($lic, $pkg["license"]); - } - sort($lic); - printf("\nLicense: %s\n", implode(" and ", array_unique($lic)));' popd echo "Archiving..." diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 8502ffa..e3a2966 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -11,13 +11,13 @@ %undefine __brp_mangle_shebangs %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit e40303a34d7657a92c82cc7cc61c50b5a1f095bd +%global gh_commit 553a953cf4e823700aff8660a4cf6d354fc4aafd %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville %global gh_project php-compatinfo -%global upstream_version 6.1.0 +%global upstream_version 6.1.1 #global upstream_prever RC1 Name: php-bartlett-PHP-CompatInfo @@ -39,16 +39,7 @@ Patch0: %{name}-6.0.0-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 7.4 BuildRequires: php-cli -BuildRequires: php-dom BuildRequires: php-json -BuildRequires: php-libxml -BuildRequires: php-pcre -BuildRequires: php-phar -BuildRequires: php-pdo -BuildRequires: php-pdo_sqlite -BuildRequires: php-simplexml -BuildRequires: php-spl -BuildRequires: php-xmlreader Requires: php(language) >= 7.4 Requires: php-cli @@ -64,23 +55,22 @@ Requires: php-spl Requires: php-xmlreader # Bundled libraries -Provides: bundled(php-bartlett-php-compatinfo-db) = 3.17.0 +Provides: bundled(php-bartlett-php-compatinfo-db) = 3.17.1 Provides: bundled(php-bartlett-sarif-php-sdk) = 1.0.1 Provides: bundled(php-brick-math) = 0.9.3 -Provides: bundled(php-composer-package-versions-deprecated) = 1.11.99.4 Provides: bundled(php-composer-semver) = 3.2.7 Provides: bundled(php-doctrine-annotations) = 1.13.2 Provides: bundled(php-doctrine-cache) = 2.1.1 Provides: bundled(php-doctrine-collections) = 1.6.8 Provides: bundled(php-doctrine-common) = 3.2.1 -Provides: bundled(php-doctrine-dbal) = 3.2.1 +Provides: bundled(php-doctrine-dbal) = 3.3.0 Provides: bundled(php-doctrine-deprecations) = v0.5.3 Provides: bundled(php-doctrine-event-manager) = 1.1.1 Provides: bundled(php-doctrine-inflector) = 2.0.4 Provides: bundled(php-doctrine-instantiator) = 1.4.0 -Provides: bundled(php-doctrine-lexer) = 1.2.1 -Provides: bundled(php-doctrine-orm) = 2.10.4 -Provides: bundled(php-doctrine-persistence) = 2.2.3 +Provides: bundled(php-doctrine-lexer) = 1.2.2 +Provides: bundled(php-doctrine-orm) = 2.11.0 +Provides: bundled(php-doctrine-persistence) = 2.3.0 Provides: bundled(php-nikic-php-parser) = v4.13.2 Provides: bundled(php-psr-cache) = 1.0.1 Provides: bundled(php-psr-container) = 1.1.2 @@ -133,7 +123,7 @@ show content of dictionary references. %setup -q -n %{gh_project}-%{gh_commit} %patch0 -p1 -b .rpm -# Gather all license files and cleanup tests +: Gather all license files and cleanup tests mv vendor/composer/LICENSE composer_LICENSE for vendor in $(ls vendor) do @@ -145,6 +135,23 @@ do done rm -r tests +: List bundled libraries and Licenses +php -r ' + $pkgs = file_get_contents("vendor/composer/installed.json"); + $pkgs = json_decode($pkgs, true); + if (!is_array($pkgs) || !isset($pkgs["packages"])) { + echo "cant decode json file\n"; + exit(3); + } + $lic = []; + foreach($pkgs["packages"] as $pkg) { + printf("Provides: bundled(php-%s) = %s\n", str_replace(["/", "_"], ["-", "-"], $pkg["name"]), $pkg["version"]); + $lic = array_merge($lic, $pkg["license"]); + } + sort($lic); + printf("\nLicense: %s\n", implode(" and ", array_unique($lic)));' + + %build # Nothing @@ -171,12 +178,18 @@ install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/fedora- %files %license *LICENSE %doc README.* +%doc composer.json +%doc vendor/composer/installed.json %{_bindir}/phpcompatinfo %{_datadir}/%{name} %{_mandir}/man1/phpcompatinfo.1* %changelog +* Tue Jan 18 2022 Remi Collet - 6.1.1-1 +- update to 6.1.1 +- update bundled bartlett/php-compatinfo-db 3.17.1 + * Thu Jan 6 2022 Remi Collet - 6.1.0-1 - update to 6.1.0 diff --git a/sources b/sources index 1166c21..f67ee57 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-6.1.0-e40303a.tgz) = 8b0f5c6277540d3b2d3babb2f5cca5fb876729b7cebc4674e1be56a35be0fd3e1d75d69aecc9dc7dab29d920c066d2d5bcdff5c5bccb46302f52d782ee3a8d65 +SHA512 (php-bartlett-PHP-CompatInfo-6.1.1-553a953.tgz) = aea64d7008e75e586d0f2c19310fc24b44a4fe20101efe08834205ef891278d162fada342b4119f5d89d51de135b6c9473514c4171e5a0754a0d99e2d15f7e02 From 76fb3e2584360a458d6b9c12952ed5ec17cf5a80 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 07:18:51 +0000 Subject: [PATCH 073/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-bartlett-PHP-CompatInfo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index e3a2966..68f96e8 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -22,7 +22,7 @@ Name: php-bartlett-PHP-CompatInfo Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Find out version and the extensions required for a piece of code to run License: BSD and MIT @@ -186,6 +186,9 @@ install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/fedora- %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 6.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Jan 18 2022 Remi Collet - 6.1.1-1 - update to 6.1.1 - update bundled bartlett/php-compatinfo-db 3.17.1 From 8f8a46629c3377c7eaa0d817ea6596d8ee51ad80 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 27 Jan 2022 10:39:58 +0100 Subject: [PATCH 074/111] update bundled bartlett/php-compatinfo-db 3.18.0 use better process to create the database, as discussed on https://github.com/llaville/php-compatinfo-db/issues/113 silent touch on read only database, reported as https://github.com/llaville/php-compatinfo-db/issues/112 --- makesrc.sh | 7 +++++-- php-bartlett-PHP-CompatInfo.spec | 14 ++++++++++++-- sources | 2 +- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/makesrc.sh b/makesrc.sh index 048f267..0d03210 100755 --- a/makesrc.sh +++ b/makesrc.sh @@ -20,8 +20,11 @@ echo "Getting commit..." composer install --no-interaction --no-progress --no-dev --optimize-autoloader cp vendor/composer/installed.json ../ - mkdir data - cp ${HOME}/.cache/bartlett/compatinfo-db.sqlite data + export DATABASE_URL=sqlite:///$PWD/data/compatinfo-db.sqlite + mkdir data + bin/phpcompatinfo db:create + bin/phpcompatinfo diag + bin/phpcompatinfo db:list popd echo "Archiving..." diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 68f96e8..e02cc77 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -22,7 +22,7 @@ Name: php-bartlett-PHP-CompatInfo Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 2%{?dist} +Release: 5%{?dist} Summary: Find out version and the extensions required for a piece of code to run License: BSD and MIT @@ -55,7 +55,7 @@ Requires: php-spl Requires: php-xmlreader # Bundled libraries -Provides: bundled(php-bartlett-php-compatinfo-db) = 3.17.1 +Provides: bundled(php-bartlett-php-compatinfo-db) = 3.18.0 Provides: bundled(php-bartlett-sarif-php-sdk) = 1.0.1 Provides: bundled(php-brick-math) = 0.9.3 Provides: bundled(php-composer-semver) = 3.2.7 @@ -123,6 +123,9 @@ show content of dictionary references. %setup -q -n %{gh_project}-%{gh_commit} %patch0 -p1 -b .rpm +# https://github.com/llaville/php-compatinfo-db/issues/112 +sed -e 's/touch/@touch/' -i vendor/bartlett/php-compatinfo-db/config/set/default.php + : Gather all license files and cleanup tests mv vendor/composer/LICENSE composer_LICENSE for vendor in $(ls vendor) @@ -186,6 +189,13 @@ install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/fedora- %changelog +* Thu Jan 27 2022 Remi Collet - 6.1.1-5 +- update bundled bartlett/php-compatinfo-db 3.18.0 +- use better process to create the database, as discussed on + https://github.com/llaville/php-compatinfo-db/issues/113 +- silent touch on read only database, reported as + https://github.com/llaville/php-compatinfo-db/issues/112 + * Fri Jan 21 2022 Fedora Release Engineering - 6.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index f67ee57..8680cc4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-6.1.1-553a953.tgz) = aea64d7008e75e586d0f2c19310fc24b44a4fe20101efe08834205ef891278d162fada342b4119f5d89d51de135b6c9473514c4171e5a0754a0d99e2d15f7e02 +SHA512 (php-bartlett-PHP-CompatInfo-6.1.1-553a953.tgz) = e5a3f750382da6f0486bfa20e52ed4a86eee2c931e636bcf134ef9d70139edf612a635f962fbec25a91c003b5d8bf5323ded394cfc2f4a38d858609ee1e22262 From 2c685a276c4704e654929c4b2aa06186125481f3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 28 Jan 2022 10:13:25 +0100 Subject: [PATCH 075/111] v6.1.2 --- .gitignore | 1 + php-bartlett-PHP-CompatInfo.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 280ada2..76c8f53 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ clog /php-bartlett-PHP-CompatInfo-6.0.3-7f878c7.tgz /php-bartlett-PHP-CompatInfo-6.1.0-e40303a.tgz /php-bartlett-PHP-CompatInfo-6.1.1-553a953.tgz +/php-bartlett-PHP-CompatInfo-6.1.2-df38ea6.tgz diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index e02cc77..443e5e5 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -11,18 +11,18 @@ %undefine __brp_mangle_shebangs %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit 553a953cf4e823700aff8660a4cf6d354fc4aafd +%global gh_commit df38ea655bde34affa35d10cbc176428b1812b35 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville %global gh_project php-compatinfo -%global upstream_version 6.1.1 +%global upstream_version 6.1.2 #global upstream_prever RC1 Name: php-bartlett-PHP-CompatInfo Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 5%{?dist} +Release: 1%{?dist} Summary: Find out version and the extensions required for a piece of code to run License: BSD and MIT @@ -189,6 +189,9 @@ install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/fedora- %changelog +* Fri Jan 28 2022 Remi Collet - 6.1.2-1 +- update to 6.1.2 + * Thu Jan 27 2022 Remi Collet - 6.1.1-5 - update bundled bartlett/php-compatinfo-db 3.18.0 - use better process to create the database, as discussed on diff --git a/sources b/sources index 8680cc4..5b0212a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-6.1.1-553a953.tgz) = e5a3f750382da6f0486bfa20e52ed4a86eee2c931e636bcf134ef9d70139edf612a635f962fbec25a91c003b5d8bf5323ded394cfc2f4a38d858609ee1e22262 +SHA512 (php-bartlett-PHP-CompatInfo-6.1.2-df38ea6.tgz) = dd1f9360e5a40efa5d9e4b98b450d686d4f57ad9373e4f984be1701b1b709c987824f777372e25a8af983fb19609f5b8532667ef908580253e24e5009422f359 From 13cb37357e15883bf67ed888ad8c1de9c6bd58e2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 7 Feb 2022 11:00:46 +0100 Subject: [PATCH 076/111] update to 6.2.0 update bundled bartlett/php-compatinfo-db to 4.0.0 --- .gitignore | 1 + makesrc.sh | 2 +- php-bartlett-PHP-CompatInfo.spec | 50 +++++++++++++++++--------------- sources | 2 +- 4 files changed, 30 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index 76c8f53..fbd6a66 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ clog /php-bartlett-PHP-CompatInfo-6.1.0-e40303a.tgz /php-bartlett-PHP-CompatInfo-6.1.1-553a953.tgz /php-bartlett-PHP-CompatInfo-6.1.2-df38ea6.tgz +/php-bartlett-PHP-CompatInfo-6.2.0-dcb0d52.tgz diff --git a/makesrc.sh b/makesrc.sh index 0d03210..cfb4a17 100755 --- a/makesrc.sh +++ b/makesrc.sh @@ -23,8 +23,8 @@ echo "Getting commit..." export DATABASE_URL=sqlite:///$PWD/data/compatinfo-db.sqlite mkdir data bin/phpcompatinfo db:create + bin/phpcompatinfo db:init bin/phpcompatinfo diag - bin/phpcompatinfo db:list popd echo "Archiving..." diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 443e5e5..a610a1e 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -11,13 +11,13 @@ %undefine __brp_mangle_shebangs %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit df38ea655bde34affa35d10cbc176428b1812b35 +%global gh_commit dcb0d522b1916933a5d5a00ca64dbb6d5ae34041 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville %global gh_project php-compatinfo -%global upstream_version 6.1.2 +%global upstream_version 6.2.0 #global upstream_prever RC1 Name: php-bartlett-PHP-CompatInfo @@ -55,21 +55,21 @@ Requires: php-spl Requires: php-xmlreader # Bundled libraries -Provides: bundled(php-bartlett-php-compatinfo-db) = 3.18.0 +Provides: bundled(php-bartlett-php-compatinfo-db) = 4.0.0 Provides: bundled(php-bartlett-sarif-php-sdk) = 1.0.1 Provides: bundled(php-brick-math) = 0.9.3 -Provides: bundled(php-composer-semver) = 3.2.7 +Provides: bundled(php-composer-semver) = 3.2.9 Provides: bundled(php-doctrine-annotations) = 1.13.2 Provides: bundled(php-doctrine-cache) = 2.1.1 Provides: bundled(php-doctrine-collections) = 1.6.8 -Provides: bundled(php-doctrine-common) = 3.2.1 -Provides: bundled(php-doctrine-dbal) = 3.3.0 +Provides: bundled(php-doctrine-common) = 3.2.2 +Provides: bundled(php-doctrine-dbal) = 3.3.2 Provides: bundled(php-doctrine-deprecations) = v0.5.3 Provides: bundled(php-doctrine-event-manager) = 1.1.1 Provides: bundled(php-doctrine-inflector) = 2.0.4 Provides: bundled(php-doctrine-instantiator) = 1.4.0 Provides: bundled(php-doctrine-lexer) = 1.2.2 -Provides: bundled(php-doctrine-orm) = 2.11.0 +Provides: bundled(php-doctrine-orm) = 2.11.1 Provides: bundled(php-doctrine-persistence) = 2.3.0 Provides: bundled(php-nikic-php-parser) = v4.13.2 Provides: bundled(php-psr-cache) = 1.0.1 @@ -78,19 +78,19 @@ Provides: bundled(php-psr-event-dispatcher) = 1.0.0 Provides: bundled(php-psr-log) = 1.1.4 Provides: bundled(php-ramsey-collection) = 1.2.2 Provides: bundled(php-ramsey-uuid) = 4.2.3 -Provides: bundled(php-symfony-amqp-messenger) = v5.4.0 -Provides: bundled(php-symfony-cache) = v5.4.2 +Provides: bundled(php-symfony-amqp-messenger) = v5.4.3 +Provides: bundled(php-symfony-cache) = v5.4.3 Provides: bundled(php-symfony-cache-contracts) = v2.5.0 -Provides: bundled(php-symfony-config) = v5.4.2 -Provides: bundled(php-symfony-console) = v5.4.2 -Provides: bundled(php-symfony-dependency-injection) = v5.4.2 +Provides: bundled(php-symfony-config) = v5.4.3 +Provides: bundled(php-symfony-console) = v5.4.3 +Provides: bundled(php-symfony-dependency-injection) = v5.4.3 Provides: bundled(php-symfony-deprecation-contracts) = v2.5.0 -Provides: bundled(php-symfony-doctrine-messenger) = v5.4.0 -Provides: bundled(php-symfony-event-dispatcher) = v5.4.0 +Provides: bundled(php-symfony-doctrine-messenger) = v5.4.3 +Provides: bundled(php-symfony-event-dispatcher) = v5.4.3 Provides: bundled(php-symfony-event-dispatcher-contracts) = v2.5.0 -Provides: bundled(php-symfony-filesystem) = v5.4.0 -Provides: bundled(php-symfony-finder) = v5.4.2 -Provides: bundled(php-symfony-messenger) = v5.4.2 +Provides: bundled(php-symfony-filesystem) = v5.4.3 +Provides: bundled(php-symfony-finder) = v5.4.3 +Provides: bundled(php-symfony-messenger) = v5.4.3 Provides: bundled(php-symfony-polyfill-ctype) = v1.24.0 Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.24.0 Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.24.0 @@ -99,14 +99,14 @@ Provides: bundled(php-symfony-polyfill-php72) = v1.24.0 Provides: bundled(php-symfony-polyfill-php73) = v1.24.0 Provides: bundled(php-symfony-polyfill-php80) = v1.24.0 Provides: bundled(php-symfony-polyfill-php81) = v1.24.0 -Provides: bundled(php-symfony-process) = v5.4.2 -Provides: bundled(php-symfony-redis-messenger) = v5.4.2 +Provides: bundled(php-symfony-process) = v5.4.3 +Provides: bundled(php-symfony-redis-messenger) = v5.4.3 Provides: bundled(php-symfony-requirements-checker) = v2.0.1 -Provides: bundled(php-symfony-serializer) = v5.4.2 +Provides: bundled(php-symfony-serializer) = v5.4.3 Provides: bundled(php-symfony-service-contracts) = v2.5.0 -Provides: bundled(php-symfony-stopwatch) = v5.4.0 -Provides: bundled(php-symfony-string) = v5.4.2 -Provides: bundled(php-symfony-var-exporter) = v5.4.2 +Provides: bundled(php-symfony-stopwatch) = v5.4.3 +Provides: bundled(php-symfony-string) = v5.4.3 +Provides: bundled(php-symfony-var-exporter) = v5.4.3 Provides: phpcompatinfo = %{version} Provides: php-composer(bartlett/php-compatinfo) = %{version} @@ -189,6 +189,10 @@ install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/fedora- %changelog +* Mon Feb 7 2022 Remi Collet - 6.2.0-1 +- update to 6.2.0 +- update bundled bartlett/php-compatinfo-db to 4.0.0 + * Fri Jan 28 2022 Remi Collet - 6.1.2-1 - update to 6.1.2 diff --git a/sources b/sources index 5b0212a..a8c72b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-6.1.2-df38ea6.tgz) = dd1f9360e5a40efa5d9e4b98b450d686d4f57ad9373e4f984be1701b1b709c987824f777372e25a8af983fb19609f5b8532667ef908580253e24e5009422f359 +SHA512 (php-bartlett-PHP-CompatInfo-6.2.0-dcb0d52.tgz) = d2441a3bd51a5b062043d9e19c1d325f98528b7e5776815baedbf632598f1579f77cc03d3fce46b483eabf7f3341dd3fa10aedd741baf145790dcfafad85e196 From a9a219dc9e41c019b7927a96ab551dc327142f9b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 7 Mar 2022 10:10:53 +0100 Subject: [PATCH 077/111] update to 6.3.0 update bundled bartlett/php-compatinfo-db to 4.1.0 --- .gitignore | 1 + php-bartlett-PHP-CompatInfo.spec | 50 +++++++++++++++++--------------- sources | 2 +- 3 files changed, 29 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index fbd6a66..76efb80 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,4 @@ clog /php-bartlett-PHP-CompatInfo-6.1.1-553a953.tgz /php-bartlett-PHP-CompatInfo-6.1.2-df38ea6.tgz /php-bartlett-PHP-CompatInfo-6.2.0-dcb0d52.tgz +/php-bartlett-PHP-CompatInfo-6.3.0-2b7c3f9.tgz diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index a610a1e..2aae408 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -11,13 +11,13 @@ %undefine __brp_mangle_shebangs %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit dcb0d522b1916933a5d5a00ca64dbb6d5ae34041 +%global gh_commit 2b7c3f9b9819f26882667c612d8882132381ca1e %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville %global gh_project php-compatinfo -%global upstream_version 6.2.0 +%global upstream_version 6.3.0 #global upstream_prever RC1 Name: php-bartlett-PHP-CompatInfo @@ -55,7 +55,7 @@ Requires: php-spl Requires: php-xmlreader # Bundled libraries -Provides: bundled(php-bartlett-php-compatinfo-db) = 4.0.0 +Provides: bundled(php-bartlett-php-compatinfo-db) = 4.1.0 Provides: bundled(php-bartlett-sarif-php-sdk) = 1.0.1 Provides: bundled(php-brick-math) = 0.9.3 Provides: bundled(php-composer-semver) = 3.2.9 @@ -67,8 +67,8 @@ Provides: bundled(php-doctrine-dbal) = 3.3.2 Provides: bundled(php-doctrine-deprecations) = v0.5.3 Provides: bundled(php-doctrine-event-manager) = 1.1.1 Provides: bundled(php-doctrine-inflector) = 2.0.4 -Provides: bundled(php-doctrine-instantiator) = 1.4.0 -Provides: bundled(php-doctrine-lexer) = 1.2.2 +Provides: bundled(php-doctrine-instantiator) = 1.4.1 +Provides: bundled(php-doctrine-lexer) = 1.2.3 Provides: bundled(php-doctrine-orm) = 2.11.1 Provides: bundled(php-doctrine-persistence) = 2.3.0 Provides: bundled(php-nikic-php-parser) = v4.13.2 @@ -78,35 +78,35 @@ Provides: bundled(php-psr-event-dispatcher) = 1.0.0 Provides: bundled(php-psr-log) = 1.1.4 Provides: bundled(php-ramsey-collection) = 1.2.2 Provides: bundled(php-ramsey-uuid) = 4.2.3 -Provides: bundled(php-symfony-amqp-messenger) = v5.4.3 -Provides: bundled(php-symfony-cache) = v5.4.3 +Provides: bundled(php-symfony-amqp-messenger) = v5.4.5 +Provides: bundled(php-symfony-cache) = v5.4.6 Provides: bundled(php-symfony-cache-contracts) = v2.5.0 Provides: bundled(php-symfony-config) = v5.4.3 -Provides: bundled(php-symfony-console) = v5.4.3 -Provides: bundled(php-symfony-dependency-injection) = v5.4.3 +Provides: bundled(php-symfony-console) = v5.4.5 +Provides: bundled(php-symfony-dependency-injection) = v5.4.6 Provides: bundled(php-symfony-deprecation-contracts) = v2.5.0 Provides: bundled(php-symfony-doctrine-messenger) = v5.4.3 Provides: bundled(php-symfony-event-dispatcher) = v5.4.3 Provides: bundled(php-symfony-event-dispatcher-contracts) = v2.5.0 -Provides: bundled(php-symfony-filesystem) = v5.4.3 +Provides: bundled(php-symfony-filesystem) = v5.4.6 Provides: bundled(php-symfony-finder) = v5.4.3 Provides: bundled(php-symfony-messenger) = v5.4.3 -Provides: bundled(php-symfony-polyfill-ctype) = v1.24.0 -Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.24.0 -Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.24.0 -Provides: bundled(php-symfony-polyfill-mbstring) = v1.24.0 -Provides: bundled(php-symfony-polyfill-php72) = v1.24.0 -Provides: bundled(php-symfony-polyfill-php73) = v1.24.0 -Provides: bundled(php-symfony-polyfill-php80) = v1.24.0 -Provides: bundled(php-symfony-polyfill-php81) = v1.24.0 -Provides: bundled(php-symfony-process) = v5.4.3 -Provides: bundled(php-symfony-redis-messenger) = v5.4.3 +Provides: bundled(php-symfony-polyfill-ctype) = v1.25.0 +Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.25.0 +Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.25.0 +Provides: bundled(php-symfony-polyfill-mbstring) = v1.25.0 +Provides: bundled(php-symfony-polyfill-php72) = v1.25.0 +Provides: bundled(php-symfony-polyfill-php73) = v1.25.0 +Provides: bundled(php-symfony-polyfill-php80) = v1.25.0 +Provides: bundled(php-symfony-polyfill-php81) = v1.25.0 +Provides: bundled(php-symfony-process) = v5.4.5 +Provides: bundled(php-symfony-redis-messenger) = v5.4.6 Provides: bundled(php-symfony-requirements-checker) = v2.0.1 -Provides: bundled(php-symfony-serializer) = v5.4.3 +Provides: bundled(php-symfony-serializer) = v5.4.6 Provides: bundled(php-symfony-service-contracts) = v2.5.0 -Provides: bundled(php-symfony-stopwatch) = v5.4.3 +Provides: bundled(php-symfony-stopwatch) = v5.4.5 Provides: bundled(php-symfony-string) = v5.4.3 -Provides: bundled(php-symfony-var-exporter) = v5.4.3 +Provides: bundled(php-symfony-var-exporter) = v5.4.6 Provides: phpcompatinfo = %{version} Provides: php-composer(bartlett/php-compatinfo) = %{version} @@ -189,6 +189,10 @@ install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/fedora- %changelog +* Mon Mar 7 2022 Remi Collet - 6.3.0-1 +- update to 6.3.0 +- update bundled bartlett/php-compatinfo-db to 4.1.0 + * Mon Feb 7 2022 Remi Collet - 6.2.0-1 - update to 6.2.0 - update bundled bartlett/php-compatinfo-db to 4.0.0 diff --git a/sources b/sources index a8c72b5..a3fecb2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-6.2.0-dcb0d52.tgz) = d2441a3bd51a5b062043d9e19c1d325f98528b7e5776815baedbf632598f1579f77cc03d3fce46b483eabf7f3341dd3fa10aedd741baf145790dcfafad85e196 +SHA512 (php-bartlett-PHP-CompatInfo-6.3.0-2b7c3f9.tgz) = 19df98da80753ef8e86f9838280afcbd4622ab5be1e94d0c1249b842558471cdcaee56404fe5c1e7ae3ab77a5bebc430999190a7db6fd7d9275a088adaf41dc6 From caa29e20e470d9e763e27f638436d6bcdd83d4ff Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 6 Apr 2022 14:07:33 +0200 Subject: [PATCH 078/111] update to 6.4.0 update bundled bartlett/php-compatinfo-db to 4.2.0 --- .gitignore | 1 + php-bartlett-PHP-CompatInfo.spec | 46 ++++++++++++++++++-------------- sources | 2 +- 3 files changed, 28 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 76efb80..f2b370d 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ clog /php-bartlett-PHP-CompatInfo-6.1.2-df38ea6.tgz /php-bartlett-PHP-CompatInfo-6.2.0-dcb0d52.tgz /php-bartlett-PHP-CompatInfo-6.3.0-2b7c3f9.tgz +/php-bartlett-PHP-CompatInfo-6.4.0-3e23268.tgz diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 2aae408..bb5614e 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -11,13 +11,13 @@ %undefine __brp_mangle_shebangs %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit 2b7c3f9b9819f26882667c612d8882132381ca1e +%global gh_commit 3e23268c2c486c8ea1a6e63694c77ade7715c397 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville %global gh_project php-compatinfo -%global upstream_version 6.3.0 +%global upstream_version 6.4.0 #global upstream_prever RC1 Name: php-bartlett-PHP-CompatInfo @@ -55,22 +55,22 @@ Requires: php-spl Requires: php-xmlreader # Bundled libraries -Provides: bundled(php-bartlett-php-compatinfo-db) = 4.1.0 +Provides: bundled(php-bartlett-php-compatinfo-db) = 4.2.0 Provides: bundled(php-bartlett-sarif-php-sdk) = 1.0.1 Provides: bundled(php-brick-math) = 0.9.3 -Provides: bundled(php-composer-semver) = 3.2.9 +Provides: bundled(php-composer-semver) = 3.3.2 Provides: bundled(php-doctrine-annotations) = 1.13.2 Provides: bundled(php-doctrine-cache) = 2.1.1 Provides: bundled(php-doctrine-collections) = 1.6.8 Provides: bundled(php-doctrine-common) = 3.2.2 -Provides: bundled(php-doctrine-dbal) = 3.3.2 +Provides: bundled(php-doctrine-dbal) = 3.3.5 Provides: bundled(php-doctrine-deprecations) = v0.5.3 Provides: bundled(php-doctrine-event-manager) = 1.1.1 Provides: bundled(php-doctrine-inflector) = 2.0.4 Provides: bundled(php-doctrine-instantiator) = 1.4.1 Provides: bundled(php-doctrine-lexer) = 1.2.3 -Provides: bundled(php-doctrine-orm) = 2.11.1 -Provides: bundled(php-doctrine-persistence) = 2.3.0 +Provides: bundled(php-doctrine-orm) = 2.11.2 +Provides: bundled(php-doctrine-persistence) = 2.4.1 Provides: bundled(php-nikic-php-parser) = v4.13.2 Provides: bundled(php-psr-cache) = 1.0.1 Provides: bundled(php-psr-container) = 1.1.2 @@ -79,17 +79,19 @@ Provides: bundled(php-psr-log) = 1.1.4 Provides: bundled(php-ramsey-collection) = 1.2.2 Provides: bundled(php-ramsey-uuid) = 4.2.3 Provides: bundled(php-symfony-amqp-messenger) = v5.4.5 -Provides: bundled(php-symfony-cache) = v5.4.6 -Provides: bundled(php-symfony-cache-contracts) = v2.5.0 -Provides: bundled(php-symfony-config) = v5.4.3 -Provides: bundled(php-symfony-console) = v5.4.5 -Provides: bundled(php-symfony-dependency-injection) = v5.4.6 -Provides: bundled(php-symfony-deprecation-contracts) = v2.5.0 -Provides: bundled(php-symfony-doctrine-messenger) = v5.4.3 +Provides: bundled(php-symfony-cache) = v5.4.7 +Provides: bundled(php-symfony-cache-contracts) = v2.5.1 +Provides: bundled(php-symfony-config) = v5.4.7 +Provides: bundled(php-symfony-console) = v5.4.7 +Provides: bundled(php-symfony-dependency-injection) = v5.4.7 +Provides: bundled(php-symfony-deprecation-contracts) = v2.5.1 +Provides: bundled(php-symfony-doctrine-messenger) = v5.4.7 Provides: bundled(php-symfony-event-dispatcher) = v5.4.3 -Provides: bundled(php-symfony-event-dispatcher-contracts) = v2.5.0 -Provides: bundled(php-symfony-filesystem) = v5.4.6 +Provides: bundled(php-symfony-event-dispatcher-contracts) = v2.5.1 +Provides: bundled(php-symfony-filesystem) = v5.4.7 Provides: bundled(php-symfony-finder) = v5.4.3 +Provides: bundled(php-symfony-http-client) = v5.4.7 +Provides: bundled(php-symfony-http-client-contracts) = v2.5.1 Provides: bundled(php-symfony-messenger) = v5.4.3 Provides: bundled(php-symfony-polyfill-ctype) = v1.25.0 Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.25.0 @@ -99,14 +101,14 @@ Provides: bundled(php-symfony-polyfill-php72) = v1.25.0 Provides: bundled(php-symfony-polyfill-php73) = v1.25.0 Provides: bundled(php-symfony-polyfill-php80) = v1.25.0 Provides: bundled(php-symfony-polyfill-php81) = v1.25.0 -Provides: bundled(php-symfony-process) = v5.4.5 +Provides: bundled(php-symfony-process) = v5.4.7 Provides: bundled(php-symfony-redis-messenger) = v5.4.6 Provides: bundled(php-symfony-requirements-checker) = v2.0.1 -Provides: bundled(php-symfony-serializer) = v5.4.6 -Provides: bundled(php-symfony-service-contracts) = v2.5.0 +Provides: bundled(php-symfony-serializer) = v5.4.7 +Provides: bundled(php-symfony-service-contracts) = v2.5.1 Provides: bundled(php-symfony-stopwatch) = v5.4.5 Provides: bundled(php-symfony-string) = v5.4.3 -Provides: bundled(php-symfony-var-exporter) = v5.4.6 +Provides: bundled(php-symfony-var-exporter) = v5.4.7 Provides: phpcompatinfo = %{version} Provides: php-composer(bartlett/php-compatinfo) = %{version} @@ -189,6 +191,10 @@ install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/fedora- %changelog +* Wed Apr 6 2022 Remi Collet - 6.4.0-1 +- update to 6.4.0 +- update bundled bartlett/php-compatinfo-db to 4.2.0 + * Mon Mar 7 2022 Remi Collet - 6.3.0-1 - update to 6.3.0 - update bundled bartlett/php-compatinfo-db to 4.1.0 diff --git a/sources b/sources index a3fecb2..1a20bd1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-6.3.0-2b7c3f9.tgz) = 19df98da80753ef8e86f9838280afcbd4622ab5be1e94d0c1249b842558471cdcaee56404fe5c1e7ae3ab77a5bebc430999190a7db6fd7d9275a088adaf41dc6 +SHA512 (php-bartlett-PHP-CompatInfo-6.4.0-3e23268.tgz) = f38e260ff844fc2cfa8faf59b16970b90c5c7bec5a0539b99486265ac402842e52533ae177c25f5256d889d61eb854941cb1126136667c3c57855364d56519d3 From 66422b4e3a690ac5faadb86fedfe00bf4645d365 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 7 Apr 2022 13:57:27 +0200 Subject: [PATCH 079/111] v6.4.1 --- .gitignore | 1 + php-bartlett-PHP-CompatInfo.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f2b370d..d9be001 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,4 @@ clog /php-bartlett-PHP-CompatInfo-6.2.0-dcb0d52.tgz /php-bartlett-PHP-CompatInfo-6.3.0-2b7c3f9.tgz /php-bartlett-PHP-CompatInfo-6.4.0-3e23268.tgz +/php-bartlett-PHP-CompatInfo-6.4.1-07bb648.tgz diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index bb5614e..77488e7 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -11,13 +11,13 @@ %undefine __brp_mangle_shebangs %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit 3e23268c2c486c8ea1a6e63694c77ade7715c397 +%global gh_commit 07bb648c3b0e853bac78e8e4b946a3aafa0271ac %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville %global gh_project php-compatinfo -%global upstream_version 6.4.0 +%global upstream_version 6.4.1 #global upstream_prever RC1 Name: php-bartlett-PHP-CompatInfo @@ -191,6 +191,9 @@ install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/fedora- %changelog +* Thu Apr 7 2022 Remi Collet - 6.4.1-1 +- update to 6.4.1 + * Wed Apr 6 2022 Remi Collet - 6.4.0-1 - update to 6.4.0 - update bundled bartlett/php-compatinfo-db to 4.2.0 diff --git a/sources b/sources index 1a20bd1..9156559 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-6.4.0-3e23268.tgz) = f38e260ff844fc2cfa8faf59b16970b90c5c7bec5a0539b99486265ac402842e52533ae177c25f5256d889d61eb854941cb1126136667c3c57855364d56519d3 +SHA512 (php-bartlett-PHP-CompatInfo-6.4.1-07bb648.tgz) = a607426fcd25494e41ded618917f9645b4054ba959505b48551c2d8d3bff5486c6ce6ce3670eef0874d6cdbafc39dbf410756bc6c3b4541da1ef3f8e99de7916 From e1e8d17107507e8797b216fa219a95b4ee876333 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 20 Apr 2022 14:43:50 +0200 Subject: [PATCH 080/111] update bundled bartlett/php-compatinfo-db to 4.2.0 --- php-bartlett-PHP-CompatInfo.spec | 32 ++++++++++++++++++++------------ sources | 2 +- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 77488e7..7070813 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -22,7 +22,7 @@ Name: php-bartlett-PHP-CompatInfo Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Find out version and the extensions required for a piece of code to run License: BSD and MIT @@ -55,23 +55,25 @@ Requires: php-spl Requires: php-xmlreader # Bundled libraries -Provides: bundled(php-bartlett-php-compatinfo-db) = 4.2.0 +# License BSD-3-Clause +Provides: bundled(php-bartlett-php-compatinfo-db) = 4.3.0 +Provides: bundled(php-nikic-php-parser) = v4.13.2 +# License MIT Provides: bundled(php-bartlett-sarif-php-sdk) = 1.0.1 Provides: bundled(php-brick-math) = 0.9.3 Provides: bundled(php-composer-semver) = 3.3.2 Provides: bundled(php-doctrine-annotations) = 1.13.2 Provides: bundled(php-doctrine-cache) = 2.1.1 Provides: bundled(php-doctrine-collections) = 1.6.8 -Provides: bundled(php-doctrine-common) = 3.2.2 +Provides: bundled(php-doctrine-common) = 3.3.0 Provides: bundled(php-doctrine-dbal) = 3.3.5 Provides: bundled(php-doctrine-deprecations) = v0.5.3 Provides: bundled(php-doctrine-event-manager) = 1.1.1 Provides: bundled(php-doctrine-inflector) = 2.0.4 Provides: bundled(php-doctrine-instantiator) = 1.4.1 Provides: bundled(php-doctrine-lexer) = 1.2.3 -Provides: bundled(php-doctrine-orm) = 2.11.2 -Provides: bundled(php-doctrine-persistence) = 2.4.1 -Provides: bundled(php-nikic-php-parser) = v4.13.2 +Provides: bundled(php-doctrine-orm) = 2.12.0 +Provides: bundled(php-doctrine-persistence) = 3.0.0 Provides: bundled(php-psr-cache) = 1.0.1 Provides: bundled(php-psr-container) = 1.1.2 Provides: bundled(php-psr-event-dispatcher) = 1.0.0 @@ -148,14 +150,17 @@ php -r ' echo "cant decode json file\n"; exit(3); } - $lic = []; + $res = []; foreach($pkgs["packages"] as $pkg) { - printf("Provides: bundled(php-%s) = %s\n", str_replace(["/", "_"], ["-", "-"], $pkg["name"]), $pkg["version"]); - $lic = array_merge($lic, $pkg["license"]); + $lic = implode(" and ", $pkg["license"]); + if (!isset($res[$lic])) $res[$lic] = []; + $res[$lic][] = sprintf("Provides: bundled(php-%s) = %s", str_replace(["/", "_"], ["-", "-"], $pkg["name"]), $pkg["version"]); } - sort($lic); - printf("\nLicense: %s\n", implode(" and ", array_unique($lic)));' - + foreach($res as $lic => $lib) { + sort($lib); + printf("# License %s\n%s\n", $lic, implode("\n", $lib)); + } +' %build # Nothing @@ -191,6 +196,9 @@ install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/fedora- %changelog +* Wed Apr 20 2022 Remi Collet - 6.4.1-2 +- update bundled bartlett/php-compatinfo-db to 4.2.0 + * Thu Apr 7 2022 Remi Collet - 6.4.1-1 - update to 6.4.1 diff --git a/sources b/sources index 9156559..f8ef389 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-6.4.1-07bb648.tgz) = a607426fcd25494e41ded618917f9645b4054ba959505b48551c2d8d3bff5486c6ce6ce3670eef0874d6cdbafc39dbf410756bc6c3b4541da1ef3f8e99de7916 +SHA512 (php-bartlett-PHP-CompatInfo-6.4.1-07bb648.tgz) = ca1ba8be6c116418bbf1cbb97178877eb4fa62d260688ebab90e69f644d17a3958d2dce3b42984fdbf4014c81e2dfb8dfb568fc49d6e794da800af8cf20745dd From 074c086621bada50bee5c1fc8fef08fd0fe09934 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 13:12:31 +0000 Subject: [PATCH 081/111] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-bartlett-PHP-CompatInfo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 7070813..360ca44 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -22,7 +22,7 @@ Name: php-bartlett-PHP-CompatInfo Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Find out version and the extensions required for a piece of code to run License: BSD and MIT @@ -196,6 +196,9 @@ install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/fedora- %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 6.4.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Apr 20 2022 Remi Collet - 6.4.1-2 - update bundled bartlett/php-compatinfo-db to 4.2.0 From ae4eb7b26503e79783a842d4720358c2960e7102 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 28 Sep 2022 17:25:14 +0200 Subject: [PATCH 082/111] v6.4.2 --- .gitignore | 1 + php-bartlett-PHP-CompatInfo.spec | 87 +++++++++++++++++--------------- sources | 2 +- 3 files changed, 47 insertions(+), 43 deletions(-) diff --git a/.gitignore b/.gitignore index d9be001..75aa10d 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ clog /php-bartlett-PHP-CompatInfo-6.3.0-2b7c3f9.tgz /php-bartlett-PHP-CompatInfo-6.4.0-3e23268.tgz /php-bartlett-PHP-CompatInfo-6.4.1-07bb648.tgz +/php-bartlett-PHP-CompatInfo-6.4.2-0413526.tgz diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 360ca44..d807baf 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -11,18 +11,18 @@ %undefine __brp_mangle_shebangs %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit 07bb648c3b0e853bac78e8e4b946a3aafa0271ac +%global gh_commit 041352673a390b3e0822fc4b0e295ac6267dffbf %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville %global gh_project php-compatinfo -%global upstream_version 6.4.1 +%global upstream_version 6.4.2 #global upstream_prever RC1 Name: php-bartlett-PHP-CompatInfo Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 3%{?dist} +Release: 1%{?dist} Summary: Find out version and the extensions required for a piece of code to run License: BSD and MIT @@ -57,60 +57,60 @@ Requires: php-xmlreader # Bundled libraries # License BSD-3-Clause Provides: bundled(php-bartlett-php-compatinfo-db) = 4.3.0 -Provides: bundled(php-nikic-php-parser) = v4.13.2 +Provides: bundled(php-nikic-php-parser) = v4.15.1 # License MIT Provides: bundled(php-bartlett-sarif-php-sdk) = 1.0.1 Provides: bundled(php-brick-math) = 0.9.3 Provides: bundled(php-composer-semver) = 3.3.2 -Provides: bundled(php-doctrine-annotations) = 1.13.2 -Provides: bundled(php-doctrine-cache) = 2.1.1 -Provides: bundled(php-doctrine-collections) = 1.6.8 -Provides: bundled(php-doctrine-common) = 3.3.0 -Provides: bundled(php-doctrine-dbal) = 3.3.5 -Provides: bundled(php-doctrine-deprecations) = v0.5.3 -Provides: bundled(php-doctrine-event-manager) = 1.1.1 -Provides: bundled(php-doctrine-inflector) = 2.0.4 +Provides: bundled(php-doctrine-annotations) = 1.13.3 +Provides: bundled(php-doctrine-cache) = 2.2.0 +Provides: bundled(php-doctrine-collections) = 1.7.3 +Provides: bundled(php-doctrine-common) = 3.4.1 +Provides: bundled(php-doctrine-dbal) = 3.4.5 +Provides: bundled(php-doctrine-deprecations) = v1.0.0 +Provides: bundled(php-doctrine-event-manager) = 1.1.2 +Provides: bundled(php-doctrine-inflector) = 2.0.5 Provides: bundled(php-doctrine-instantiator) = 1.4.1 Provides: bundled(php-doctrine-lexer) = 1.2.3 -Provides: bundled(php-doctrine-orm) = 2.12.0 -Provides: bundled(php-doctrine-persistence) = 3.0.0 +Provides: bundled(php-doctrine-orm) = 2.13.2 +Provides: bundled(php-doctrine-persistence) = 3.0.3 Provides: bundled(php-psr-cache) = 1.0.1 Provides: bundled(php-psr-container) = 1.1.2 Provides: bundled(php-psr-event-dispatcher) = 1.0.0 Provides: bundled(php-psr-log) = 1.1.4 Provides: bundled(php-ramsey-collection) = 1.2.2 Provides: bundled(php-ramsey-uuid) = 4.2.3 -Provides: bundled(php-symfony-amqp-messenger) = v5.4.5 -Provides: bundled(php-symfony-cache) = v5.4.7 -Provides: bundled(php-symfony-cache-contracts) = v2.5.1 -Provides: bundled(php-symfony-config) = v5.4.7 -Provides: bundled(php-symfony-console) = v5.4.7 -Provides: bundled(php-symfony-dependency-injection) = v5.4.7 -Provides: bundled(php-symfony-deprecation-contracts) = v2.5.1 -Provides: bundled(php-symfony-doctrine-messenger) = v5.4.7 -Provides: bundled(php-symfony-event-dispatcher) = v5.4.3 -Provides: bundled(php-symfony-event-dispatcher-contracts) = v2.5.1 -Provides: bundled(php-symfony-filesystem) = v5.4.7 -Provides: bundled(php-symfony-finder) = v5.4.3 -Provides: bundled(php-symfony-http-client) = v5.4.7 -Provides: bundled(php-symfony-http-client-contracts) = v2.5.1 -Provides: bundled(php-symfony-messenger) = v5.4.3 -Provides: bundled(php-symfony-polyfill-ctype) = v1.25.0 -Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.25.0 -Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.25.0 -Provides: bundled(php-symfony-polyfill-mbstring) = v1.25.0 -Provides: bundled(php-symfony-polyfill-php72) = v1.25.0 -Provides: bundled(php-symfony-polyfill-php73) = v1.25.0 -Provides: bundled(php-symfony-polyfill-php80) = v1.25.0 -Provides: bundled(php-symfony-polyfill-php81) = v1.25.0 -Provides: bundled(php-symfony-process) = v5.4.7 +Provides: bundled(php-symfony-amqp-messenger) = v5.4.11 +Provides: bundled(php-symfony-cache) = v5.4.11 +Provides: bundled(php-symfony-cache-contracts) = v2.5.2 +Provides: bundled(php-symfony-config) = v5.4.11 +Provides: bundled(php-symfony-console) = v5.4.12 +Provides: bundled(php-symfony-dependency-injection) = v5.4.11 +Provides: bundled(php-symfony-deprecation-contracts) = v2.5.2 +Provides: bundled(php-symfony-doctrine-messenger) = v5.4.12 +Provides: bundled(php-symfony-event-dispatcher) = v5.4.9 +Provides: bundled(php-symfony-event-dispatcher-contracts) = v2.5.2 +Provides: bundled(php-symfony-filesystem) = v5.4.12 +Provides: bundled(php-symfony-finder) = v5.4.11 +Provides: bundled(php-symfony-http-client) = v5.4.12 +Provides: bundled(php-symfony-http-client-contracts) = v2.5.2 +Provides: bundled(php-symfony-messenger) = v5.4.11 +Provides: bundled(php-symfony-polyfill-ctype) = v1.26.0 +Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.26.0 +Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.26.0 +Provides: bundled(php-symfony-polyfill-mbstring) = v1.26.0 +Provides: bundled(php-symfony-polyfill-php72) = v1.26.0 +Provides: bundled(php-symfony-polyfill-php73) = v1.26.0 +Provides: bundled(php-symfony-polyfill-php80) = v1.26.0 +Provides: bundled(php-symfony-polyfill-php81) = v1.26.0 +Provides: bundled(php-symfony-process) = v5.4.11 Provides: bundled(php-symfony-redis-messenger) = v5.4.6 Provides: bundled(php-symfony-requirements-checker) = v2.0.1 -Provides: bundled(php-symfony-serializer) = v5.4.7 -Provides: bundled(php-symfony-service-contracts) = v2.5.1 +Provides: bundled(php-symfony-serializer) = v5.4.12 +Provides: bundled(php-symfony-service-contracts) = v2.5.2 Provides: bundled(php-symfony-stopwatch) = v5.4.5 -Provides: bundled(php-symfony-string) = v5.4.3 -Provides: bundled(php-symfony-var-exporter) = v5.4.7 +Provides: bundled(php-symfony-string) = v5.4.12 +Provides: bundled(php-symfony-var-exporter) = v5.4.10 Provides: phpcompatinfo = %{version} Provides: php-composer(bartlett/php-compatinfo) = %{version} @@ -196,6 +196,9 @@ install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/fedora- %changelog +* Tue Sep 27 2022 Remi Collet - 6.4.2-1 +- update to 6.4.2 + * Fri Jul 22 2022 Fedora Release Engineering - 6.4.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index f8ef389..ca100e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-6.4.1-07bb648.tgz) = ca1ba8be6c116418bbf1cbb97178877eb4fa62d260688ebab90e69f644d17a3958d2dce3b42984fdbf4014c81e2dfb8dfb568fc49d6e794da800af8cf20745dd +SHA512 (php-bartlett-PHP-CompatInfo-6.4.2-0413526.tgz) = 411f65565bf02a6d298095265bb776b435e97058ec28fabaab9ee77a1cb82d2f64a7b55b668fa24c254bf168e6e34fd4260a35b2682fe6e9cdf0c623a699b72e From 43b731511703788fef75bbe3cd9f536011660c79 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 25 Oct 2022 14:59:30 +0200 Subject: [PATCH 083/111] v6.5.2 --- .gitignore | 1 + makesrc.sh | 2 + php-bartlett-PHP-CompatInfo.spec | 76 +++++++++++++++++--------------- sources | 2 +- 4 files changed, 44 insertions(+), 37 deletions(-) diff --git a/.gitignore b/.gitignore index 75aa10d..64f9b29 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,4 @@ clog /php-bartlett-PHP-CompatInfo-6.4.0-3e23268.tgz /php-bartlett-PHP-CompatInfo-6.4.1-07bb648.tgz /php-bartlett-PHP-CompatInfo-6.4.2-0413526.tgz +/php-bartlett-PHP-CompatInfo-6.5.2-832e40e.tgz diff --git a/makesrc.sh b/makesrc.sh index cfb4a17..124d01a 100755 --- a/makesrc.sh +++ b/makesrc.sh @@ -10,6 +10,7 @@ SHORT=${COMMIT:0:7} echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION, Commit=$COMMIT\n" echo "Cloning..." +rm -rf $HOME/.cache/bartlett git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT echo "Getting commit..." @@ -32,6 +33,7 @@ tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs $PROJECT-$COMMIT echo "Cleaning..." rm -rf $PROJECT-$COMMIT +rm -rf $HOME/.cache/bartlett echo "Done." diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index d807baf..6efeea8 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -11,13 +11,13 @@ %undefine __brp_mangle_shebangs %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit 041352673a390b3e0822fc4b0e295ac6267dffbf +%global gh_commit 832e40edc6e818f10f432803ddd9350b37f07d8f %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville %global gh_project php-compatinfo -%global upstream_version 6.4.2 +%global upstream_version 6.5.2 #global upstream_prever RC1 Name: php-bartlett-PHP-CompatInfo @@ -25,7 +25,8 @@ Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} Release: 1%{?dist} Summary: Find out version and the extensions required for a piece of code to run -License: BSD and MIT +# see bundled libraries list below +License: BSD-3-Clause and MIT URL: https://github.com/llaville/php-compatinfo Source0: %{name}-%{version}-%{gh_short}.tgz # Script for fedora-review @@ -56,7 +57,7 @@ Requires: php-xmlreader # Bundled libraries # License BSD-3-Clause -Provides: bundled(php-bartlett-php-compatinfo-db) = 4.3.0 +Provides: bundled(php-bartlett-php-compatinfo-db) = 4.6.1 Provides: bundled(php-nikic-php-parser) = v4.15.1 # License MIT Provides: bundled(php-bartlett-sarif-php-sdk) = 1.0.1 @@ -64,37 +65,37 @@ Provides: bundled(php-brick-math) = 0.9.3 Provides: bundled(php-composer-semver) = 3.3.2 Provides: bundled(php-doctrine-annotations) = 1.13.3 Provides: bundled(php-doctrine-cache) = 2.2.0 -Provides: bundled(php-doctrine-collections) = 1.7.3 -Provides: bundled(php-doctrine-common) = 3.4.1 -Provides: bundled(php-doctrine-dbal) = 3.4.5 +Provides: bundled(php-doctrine-collections) = 1.8.0 +Provides: bundled(php-doctrine-common) = 3.4.3 +Provides: bundled(php-doctrine-dbal) = 3.5.1 Provides: bundled(php-doctrine-deprecations) = v1.0.0 -Provides: bundled(php-doctrine-event-manager) = 1.1.2 -Provides: bundled(php-doctrine-inflector) = 2.0.5 +Provides: bundled(php-doctrine-event-manager) = 1.2.0 +Provides: bundled(php-doctrine-inflector) = 2.0.6 Provides: bundled(php-doctrine-instantiator) = 1.4.1 Provides: bundled(php-doctrine-lexer) = 1.2.3 -Provides: bundled(php-doctrine-orm) = 2.13.2 -Provides: bundled(php-doctrine-persistence) = 3.0.3 +Provides: bundled(php-doctrine-orm) = 2.13.3 +Provides: bundled(php-doctrine-persistence) = 3.0.4 Provides: bundled(php-psr-cache) = 1.0.1 Provides: bundled(php-psr-container) = 1.1.2 Provides: bundled(php-psr-event-dispatcher) = 1.0.0 Provides: bundled(php-psr-log) = 1.1.4 Provides: bundled(php-ramsey-collection) = 1.2.2 Provides: bundled(php-ramsey-uuid) = 4.2.3 -Provides: bundled(php-symfony-amqp-messenger) = v5.4.11 -Provides: bundled(php-symfony-cache) = v5.4.11 +Provides: bundled(php-symfony-amqp-messenger) = v5.4.13 +Provides: bundled(php-symfony-cache) = v5.4.13 Provides: bundled(php-symfony-cache-contracts) = v2.5.2 Provides: bundled(php-symfony-config) = v5.4.11 -Provides: bundled(php-symfony-console) = v5.4.12 -Provides: bundled(php-symfony-dependency-injection) = v5.4.11 +Provides: bundled(php-symfony-console) = v5.4.14 +Provides: bundled(php-symfony-dependency-injection) = v5.4.13 Provides: bundled(php-symfony-deprecation-contracts) = v2.5.2 Provides: bundled(php-symfony-doctrine-messenger) = v5.4.12 Provides: bundled(php-symfony-event-dispatcher) = v5.4.9 Provides: bundled(php-symfony-event-dispatcher-contracts) = v2.5.2 -Provides: bundled(php-symfony-filesystem) = v5.4.12 +Provides: bundled(php-symfony-filesystem) = v5.4.13 Provides: bundled(php-symfony-finder) = v5.4.11 -Provides: bundled(php-symfony-http-client) = v5.4.12 +Provides: bundled(php-symfony-http-client) = v5.4.14 Provides: bundled(php-symfony-http-client-contracts) = v2.5.2 -Provides: bundled(php-symfony-messenger) = v5.4.11 +Provides: bundled(php-symfony-messenger) = v5.4.14 Provides: bundled(php-symfony-polyfill-ctype) = v1.26.0 Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.26.0 Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.26.0 @@ -104,12 +105,12 @@ Provides: bundled(php-symfony-polyfill-php73) = v1.26.0 Provides: bundled(php-symfony-polyfill-php80) = v1.26.0 Provides: bundled(php-symfony-polyfill-php81) = v1.26.0 Provides: bundled(php-symfony-process) = v5.4.11 -Provides: bundled(php-symfony-redis-messenger) = v5.4.6 +Provides: bundled(php-symfony-redis-messenger) = v5.4.13 Provides: bundled(php-symfony-requirements-checker) = v2.0.1 -Provides: bundled(php-symfony-serializer) = v5.4.12 +Provides: bundled(php-symfony-serializer) = v5.4.14 Provides: bundled(php-symfony-service-contracts) = v2.5.2 -Provides: bundled(php-symfony-stopwatch) = v5.4.5 -Provides: bundled(php-symfony-string) = v5.4.12 +Provides: bundled(php-symfony-stopwatch) = v5.4.13 +Provides: bundled(php-symfony-string) = v5.4.14 Provides: bundled(php-symfony-var-exporter) = v5.4.10 Provides: phpcompatinfo = %{version} @@ -144,22 +145,22 @@ rm -r tests : List bundled libraries and Licenses php -r ' - $pkgs = file_get_contents("vendor/composer/installed.json"); - $pkgs = json_decode($pkgs, true); - if (!is_array($pkgs) || !isset($pkgs["packages"])) { + $pkgs = file_get_contents("vendor/composer/installed.json"); + $pkgs = json_decode($pkgs, true); + if (!is_array($pkgs) || !isset($pkgs["packages"])) { echo "cant decode json file\n"; - exit(3); - } - $res = []; + exit(3); + } + $res = []; foreach($pkgs["packages"] as $pkg) { - $lic = implode(" and ", $pkg["license"]); - if (!isset($res[$lic])) $res[$lic] = []; - $res[$lic][] = sprintf("Provides: bundled(php-%s) = %s", str_replace(["/", "_"], ["-", "-"], $pkg["name"]), $pkg["version"]); - } - foreach($res as $lic => $lib) { - sort($lib); - printf("# License %s\n%s\n", $lic, implode("\n", $lib)); - } + $lic = implode(" and ", $pkg["license"]); + if (!isset($res[$lic])) $res[$lic] = []; + $res[$lic][] = sprintf("Provides: bundled(php-%s) = %s", str_replace(["/", "_"], ["-", "-"], $pkg["name"]), $pkg["version"]); + } + foreach($res as $lic => $lib) { + sort($lib); + printf("# License %s\n%s\n", $lic, implode("\n", $lib)); + } ' %build @@ -196,6 +197,9 @@ install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/fedora- %changelog +* Tue Oct 25 2022 Remi Collet - 6.5.2-1 +- update to 6.5.2 + * Tue Sep 27 2022 Remi Collet - 6.4.2-1 - update to 6.4.2 diff --git a/sources b/sources index ca100e1..e841691 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-6.4.2-0413526.tgz) = 411f65565bf02a6d298095265bb776b435e97058ec28fabaab9ee77a1cb82d2f64a7b55b668fa24c254bf168e6e34fd4260a35b2682fe6e9cdf0c623a699b72e +SHA512 (php-bartlett-PHP-CompatInfo-6.5.2-832e40e.tgz) = feb10b8e9b3f4c72ebb373e9316d7c3d0bd79ad1108e834ae74140907de1ed6e6d0fd1e27a9a03b4a9cc5ae0b66d5f36e8aa923c00ca8e47ef6dc0b567e718a7 From bc6ccaf7f637880a10d06cfe22ed04c7096cd662 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 7 Nov 2022 12:16:50 +0100 Subject: [PATCH 084/111] update to 6.5.3 update bundled bartlett/php-compatinfo-db to 4.8.0 --- .gitignore | 1 + php-bartlett-PHP-CompatInfo.spec | 26 +++++++++++++++----------- sources | 2 +- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 64f9b29..c01f64c 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ clog /php-bartlett-PHP-CompatInfo-6.4.1-07bb648.tgz /php-bartlett-PHP-CompatInfo-6.4.2-0413526.tgz /php-bartlett-PHP-CompatInfo-6.5.2-832e40e.tgz +/php-bartlett-PHP-CompatInfo-6.5.3-e2bc72e.tgz diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 6efeea8..dec4927 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -11,13 +11,13 @@ %undefine __brp_mangle_shebangs %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit 832e40edc6e818f10f432803ddd9350b37f07d8f +%global gh_commit e2bc72e017addab11d68e4733d84c77d3ff30b19 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville %global gh_project php-compatinfo -%global upstream_version 6.5.2 +%global upstream_version 6.5.3 #global upstream_prever RC1 Name: php-bartlett-PHP-CompatInfo @@ -25,7 +25,7 @@ Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} Release: 1%{?dist} Summary: Find out version and the extensions required for a piece of code to run -# see bundled libraries list below +# SPDX: see bundled libraries list below License: BSD-3-Clause and MIT URL: https://github.com/llaville/php-compatinfo Source0: %{name}-%{version}-%{gh_short}.tgz @@ -57,7 +57,7 @@ Requires: php-xmlreader # Bundled libraries # License BSD-3-Clause -Provides: bundled(php-bartlett-php-compatinfo-db) = 4.6.1 +Provides: bundled(php-bartlett-php-compatinfo-db) = 4.8.0 Provides: bundled(php-nikic-php-parser) = v4.15.1 # License MIT Provides: bundled(php-bartlett-sarif-php-sdk) = 1.0.1 @@ -81,11 +81,11 @@ Provides: bundled(php-psr-event-dispatcher) = 1.0.0 Provides: bundled(php-psr-log) = 1.1.4 Provides: bundled(php-ramsey-collection) = 1.2.2 Provides: bundled(php-ramsey-uuid) = 4.2.3 -Provides: bundled(php-symfony-amqp-messenger) = v5.4.13 -Provides: bundled(php-symfony-cache) = v5.4.13 +Provides: bundled(php-symfony-amqp-messenger) = v5.4.15 +Provides: bundled(php-symfony-cache) = v5.4.15 Provides: bundled(php-symfony-cache-contracts) = v2.5.2 Provides: bundled(php-symfony-config) = v5.4.11 -Provides: bundled(php-symfony-console) = v5.4.14 +Provides: bundled(php-symfony-console) = v5.4.15 Provides: bundled(php-symfony-dependency-injection) = v5.4.13 Provides: bundled(php-symfony-deprecation-contracts) = v2.5.2 Provides: bundled(php-symfony-doctrine-messenger) = v5.4.12 @@ -93,7 +93,7 @@ Provides: bundled(php-symfony-event-dispatcher) = v5.4.9 Provides: bundled(php-symfony-event-dispatcher-contracts) = v2.5.2 Provides: bundled(php-symfony-filesystem) = v5.4.13 Provides: bundled(php-symfony-finder) = v5.4.11 -Provides: bundled(php-symfony-http-client) = v5.4.14 +Provides: bundled(php-symfony-http-client) = v5.4.15 Provides: bundled(php-symfony-http-client-contracts) = v2.5.2 Provides: bundled(php-symfony-messenger) = v5.4.14 Provides: bundled(php-symfony-polyfill-ctype) = v1.26.0 @@ -105,12 +105,12 @@ Provides: bundled(php-symfony-polyfill-php73) = v1.26.0 Provides: bundled(php-symfony-polyfill-php80) = v1.26.0 Provides: bundled(php-symfony-polyfill-php81) = v1.26.0 Provides: bundled(php-symfony-process) = v5.4.11 -Provides: bundled(php-symfony-redis-messenger) = v5.4.13 +Provides: bundled(php-symfony-redis-messenger) = v5.4.15 Provides: bundled(php-symfony-requirements-checker) = v2.0.1 -Provides: bundled(php-symfony-serializer) = v5.4.14 +Provides: bundled(php-symfony-serializer) = v5.4.15 Provides: bundled(php-symfony-service-contracts) = v2.5.2 Provides: bundled(php-symfony-stopwatch) = v5.4.13 -Provides: bundled(php-symfony-string) = v5.4.14 +Provides: bundled(php-symfony-string) = v5.4.15 Provides: bundled(php-symfony-var-exporter) = v5.4.10 Provides: phpcompatinfo = %{version} @@ -197,6 +197,10 @@ install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/fedora- %changelog +* Mon Nov 7 2022 Remi Collet - 6.5.3-1 +- update to 6.5.3 +- update bundled bartlett/php-compatinfo-db to 4.8.0 + * Tue Oct 25 2022 Remi Collet - 6.5.2-1 - update to 6.5.2 diff --git a/sources b/sources index e841691..b6c064a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-6.5.2-832e40e.tgz) = feb10b8e9b3f4c72ebb373e9316d7c3d0bd79ad1108e834ae74140907de1ed6e6d0fd1e27a9a03b4a9cc5ae0b66d5f36e8aa923c00ca8e47ef6dc0b567e718a7 +SHA512 (php-bartlett-PHP-CompatInfo-6.5.3-e2bc72e.tgz) = 1a611ceba7ff85e1d2d90617d112347db090e8b51c686087b6e8c56f2a7d76bf2d1c9ec8bf3bc189af07d31e62566d82b3fd9eb04a2d15390eb919966d9105d2 From 5075642278658949171963d603109e9d847c1e37 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 14 Dec 2022 11:17:38 +0100 Subject: [PATCH 085/111] update to 6.5.4 update bundled bartlett/php-compatinfo-db to 4.10.0 --- .gitignore | 1 + php-bartlett-PHP-CompatInfo.spec | 44 +++++++++++++++++--------------- sources | 2 +- 3 files changed, 26 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index c01f64c..6ed0492 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,4 @@ clog /php-bartlett-PHP-CompatInfo-6.4.2-0413526.tgz /php-bartlett-PHP-CompatInfo-6.5.2-832e40e.tgz /php-bartlett-PHP-CompatInfo-6.5.3-e2bc72e.tgz +/php-bartlett-PHP-CompatInfo-6.5.4-d3e9319.tgz diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index dec4927..7f0f98f 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -11,13 +11,13 @@ %undefine __brp_mangle_shebangs %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit e2bc72e017addab11d68e4733d84c77d3ff30b19 +%global gh_commit d3e93196393b6efe6f359d128ed3638d40687574 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville %global gh_project php-compatinfo -%global upstream_version 6.5.3 +%global upstream_version 6.5.4 #global upstream_prever RC1 Name: php-bartlett-PHP-CompatInfo @@ -57,13 +57,13 @@ Requires: php-xmlreader # Bundled libraries # License BSD-3-Clause -Provides: bundled(php-bartlett-php-compatinfo-db) = 4.8.0 -Provides: bundled(php-nikic-php-parser) = v4.15.1 +Provides: bundled(php-bartlett-php-compatinfo-db) = 4.10.0 +Provides: bundled(php-nikic-php-parser) = v4.15.2 # License MIT Provides: bundled(php-bartlett-sarif-php-sdk) = 1.0.1 Provides: bundled(php-brick-math) = 0.9.3 Provides: bundled(php-composer-semver) = 3.3.2 -Provides: bundled(php-doctrine-annotations) = 1.13.3 +Provides: bundled(php-doctrine-annotations) = 1.14.1 Provides: bundled(php-doctrine-cache) = 2.2.0 Provides: bundled(php-doctrine-collections) = 1.8.0 Provides: bundled(php-doctrine-common) = 3.4.3 @@ -73,8 +73,8 @@ Provides: bundled(php-doctrine-event-manager) = 1.2.0 Provides: bundled(php-doctrine-inflector) = 2.0.6 Provides: bundled(php-doctrine-instantiator) = 1.4.1 Provides: bundled(php-doctrine-lexer) = 1.2.3 -Provides: bundled(php-doctrine-orm) = 2.13.3 -Provides: bundled(php-doctrine-persistence) = 3.0.4 +Provides: bundled(php-doctrine-orm) = 2.13.4 +Provides: bundled(php-doctrine-persistence) = 3.1.1 Provides: bundled(php-psr-cache) = 1.0.1 Provides: bundled(php-psr-container) = 1.1.2 Provides: bundled(php-psr-event-dispatcher) = 1.0.0 @@ -85,25 +85,25 @@ Provides: bundled(php-symfony-amqp-messenger) = v5.4.15 Provides: bundled(php-symfony-cache) = v5.4.15 Provides: bundled(php-symfony-cache-contracts) = v2.5.2 Provides: bundled(php-symfony-config) = v5.4.11 -Provides: bundled(php-symfony-console) = v5.4.15 -Provides: bundled(php-symfony-dependency-injection) = v5.4.13 +Provides: bundled(php-symfony-console) = v5.4.16 +Provides: bundled(php-symfony-dependency-injection) = v5.4.16 Provides: bundled(php-symfony-deprecation-contracts) = v2.5.2 -Provides: bundled(php-symfony-doctrine-messenger) = v5.4.12 +Provides: bundled(php-symfony-doctrine-messenger) = v5.4.16 Provides: bundled(php-symfony-event-dispatcher) = v5.4.9 Provides: bundled(php-symfony-event-dispatcher-contracts) = v2.5.2 Provides: bundled(php-symfony-filesystem) = v5.4.13 Provides: bundled(php-symfony-finder) = v5.4.11 -Provides: bundled(php-symfony-http-client) = v5.4.15 +Provides: bundled(php-symfony-http-client) = v5.4.16 Provides: bundled(php-symfony-http-client-contracts) = v2.5.2 -Provides: bundled(php-symfony-messenger) = v5.4.14 -Provides: bundled(php-symfony-polyfill-ctype) = v1.26.0 -Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.26.0 -Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.26.0 -Provides: bundled(php-symfony-polyfill-mbstring) = v1.26.0 -Provides: bundled(php-symfony-polyfill-php72) = v1.26.0 -Provides: bundled(php-symfony-polyfill-php73) = v1.26.0 -Provides: bundled(php-symfony-polyfill-php80) = v1.26.0 -Provides: bundled(php-symfony-polyfill-php81) = v1.26.0 +Provides: bundled(php-symfony-messenger) = v5.4.16 +Provides: bundled(php-symfony-polyfill-ctype) = v1.27.0 +Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.27.0 +Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.27.0 +Provides: bundled(php-symfony-polyfill-mbstring) = v1.27.0 +Provides: bundled(php-symfony-polyfill-php72) = v1.27.0 +Provides: bundled(php-symfony-polyfill-php73) = v1.27.0 +Provides: bundled(php-symfony-polyfill-php80) = v1.27.0 +Provides: bundled(php-symfony-polyfill-php81) = v1.27.0 Provides: bundled(php-symfony-process) = v5.4.11 Provides: bundled(php-symfony-redis-messenger) = v5.4.15 Provides: bundled(php-symfony-requirements-checker) = v2.0.1 @@ -197,6 +197,10 @@ install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/fedora- %changelog +* Wed Dec 14 2022 Remi Collet - 6.5.4-1 +- update to 6.5.4 +- update bundled bartlett/php-compatinfo-db to 4.10.0 + * Mon Nov 7 2022 Remi Collet - 6.5.3-1 - update to 6.5.3 - update bundled bartlett/php-compatinfo-db to 4.8.0 diff --git a/sources b/sources index b6c064a..d767ddb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-6.5.3-e2bc72e.tgz) = 1a611ceba7ff85e1d2d90617d112347db090e8b51c686087b6e8c56f2a7d76bf2d1c9ec8bf3bc189af07d31e62566d82b3fd9eb04a2d15390eb919966d9105d2 +SHA512 (php-bartlett-PHP-CompatInfo-6.5.4-d3e9319.tgz) = 022f503021107acaca67d1f326ff69de0bf4797fc1a9da7bc786b49eceb1d6a5ecdfb069d77701c93e7c1ffa10baca25e9f6d714fad26547816d4cc115b79ec6 From 4da8eb61a8721661b4219521b317b4ae1680013c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 10 Jan 2023 15:14:40 +0100 Subject: [PATCH 086/111] update bundled bartlett/php-compatinfo-db to 4.11.0 --- php-bartlett-PHP-CompatInfo.spec | 45 +++++++++++++++++--------------- sources | 2 +- 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 7f0f98f..f964042 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-bartlett-PHP-CompatInfo # -# Copyright (c) 2011-2022 Remi Collet +# Copyright (c) 2011-2023 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -22,7 +22,7 @@ Name: php-bartlett-PHP-CompatInfo Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Find out version and the extensions required for a piece of code to run # SPDX: see bundled libraries list below @@ -57,45 +57,45 @@ Requires: php-xmlreader # Bundled libraries # License BSD-3-Clause -Provides: bundled(php-bartlett-php-compatinfo-db) = 4.10.0 +Provides: bundled(php-bartlett-php-compatinfo-db) = 4.11.0 Provides: bundled(php-nikic-php-parser) = v4.15.2 # License MIT Provides: bundled(php-bartlett-sarif-php-sdk) = 1.0.1 Provides: bundled(php-brick-math) = 0.9.3 Provides: bundled(php-composer-semver) = 3.3.2 -Provides: bundled(php-doctrine-annotations) = 1.14.1 +Provides: bundled(php-doctrine-annotations) = 1.14.2 Provides: bundled(php-doctrine-cache) = 2.2.0 Provides: bundled(php-doctrine-collections) = 1.8.0 Provides: bundled(php-doctrine-common) = 3.4.3 -Provides: bundled(php-doctrine-dbal) = 3.5.1 +Provides: bundled(php-doctrine-dbal) = 3.5.2 Provides: bundled(php-doctrine-deprecations) = v1.0.0 Provides: bundled(php-doctrine-event-manager) = 1.2.0 Provides: bundled(php-doctrine-inflector) = 2.0.6 -Provides: bundled(php-doctrine-instantiator) = 1.4.1 -Provides: bundled(php-doctrine-lexer) = 1.2.3 -Provides: bundled(php-doctrine-orm) = 2.13.4 -Provides: bundled(php-doctrine-persistence) = 3.1.1 +Provides: bundled(php-doctrine-instantiator) = 1.5.0 +Provides: bundled(php-doctrine-lexer) = 2.1.0 +Provides: bundled(php-doctrine-orm) = 2.14.0 +Provides: bundled(php-doctrine-persistence) = 3.1.2 Provides: bundled(php-psr-cache) = 1.0.1 Provides: bundled(php-psr-container) = 1.1.2 Provides: bundled(php-psr-event-dispatcher) = 1.0.0 Provides: bundled(php-psr-log) = 1.1.4 -Provides: bundled(php-ramsey-collection) = 1.2.2 +Provides: bundled(php-ramsey-collection) = 1.3.0 Provides: bundled(php-ramsey-uuid) = 4.2.3 -Provides: bundled(php-symfony-amqp-messenger) = v5.4.15 -Provides: bundled(php-symfony-cache) = v5.4.15 +Provides: bundled(php-symfony-amqp-messenger) = v5.4.17 +Provides: bundled(php-symfony-cache) = v5.4.18 Provides: bundled(php-symfony-cache-contracts) = v2.5.2 Provides: bundled(php-symfony-config) = v5.4.11 -Provides: bundled(php-symfony-console) = v5.4.16 -Provides: bundled(php-symfony-dependency-injection) = v5.4.16 +Provides: bundled(php-symfony-console) = v5.4.17 +Provides: bundled(php-symfony-dependency-injection) = v5.4.17 Provides: bundled(php-symfony-deprecation-contracts) = v2.5.2 Provides: bundled(php-symfony-doctrine-messenger) = v5.4.16 -Provides: bundled(php-symfony-event-dispatcher) = v5.4.9 +Provides: bundled(php-symfony-event-dispatcher) = v5.4.17 Provides: bundled(php-symfony-event-dispatcher-contracts) = v2.5.2 Provides: bundled(php-symfony-filesystem) = v5.4.13 -Provides: bundled(php-symfony-finder) = v5.4.11 -Provides: bundled(php-symfony-http-client) = v5.4.16 +Provides: bundled(php-symfony-finder) = v5.4.17 +Provides: bundled(php-symfony-http-client) = v5.4.17 Provides: bundled(php-symfony-http-client-contracts) = v2.5.2 -Provides: bundled(php-symfony-messenger) = v5.4.16 +Provides: bundled(php-symfony-messenger) = v5.4.17 Provides: bundled(php-symfony-polyfill-ctype) = v1.27.0 Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.27.0 Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.27.0 @@ -107,11 +107,11 @@ Provides: bundled(php-symfony-polyfill-php81) = v1.27.0 Provides: bundled(php-symfony-process) = v5.4.11 Provides: bundled(php-symfony-redis-messenger) = v5.4.15 Provides: bundled(php-symfony-requirements-checker) = v2.0.1 -Provides: bundled(php-symfony-serializer) = v5.4.15 +Provides: bundled(php-symfony-serializer) = v5.4.17 Provides: bundled(php-symfony-service-contracts) = v2.5.2 Provides: bundled(php-symfony-stopwatch) = v5.4.13 -Provides: bundled(php-symfony-string) = v5.4.15 -Provides: bundled(php-symfony-var-exporter) = v5.4.10 +Provides: bundled(php-symfony-string) = v5.4.17 +Provides: bundled(php-symfony-var-exporter) = v5.4.17 Provides: phpcompatinfo = %{version} Provides: php-composer(bartlett/php-compatinfo) = %{version} @@ -197,6 +197,9 @@ install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/fedora- %changelog +* Tue Jan 10 2023 Remi Collet - 6.5.4-2 +- update bundled bartlett/php-compatinfo-db to 4.11.0 + * Wed Dec 14 2022 Remi Collet - 6.5.4-1 - update to 6.5.4 - update bundled bartlett/php-compatinfo-db to 4.10.0 diff --git a/sources b/sources index d767ddb..a698cb1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-6.5.4-d3e9319.tgz) = 022f503021107acaca67d1f326ff69de0bf4797fc1a9da7bc786b49eceb1d6a5ecdfb069d77701c93e7c1ffa10baca25e9f6d714fad26547816d4cc115b79ec6 +SHA512 (php-bartlett-PHP-CompatInfo-6.5.4-d3e9319.tgz) = d1a84f8ce0c5eaeb4b596e16b99e1f91554e0cf3dbe0df8950ec5db289d5a59e26b8a050f294c361701744e1a6472aec9c94662e462da3a6c667fc86b50e3bb4 From ed90792fc2507243a26ba2a5016f87a4bf7cc1fc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 08:17:57 +0000 Subject: [PATCH 087/111] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-bartlett-PHP-CompatInfo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index f964042..be5a595 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -22,7 +22,7 @@ Name: php-bartlett-PHP-CompatInfo Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Find out version and the extensions required for a piece of code to run # SPDX: see bundled libraries list below @@ -197,6 +197,9 @@ install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/fedora- %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 6.5.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Jan 10 2023 Remi Collet - 6.5.4-2 - update bundled bartlett/php-compatinfo-db to 4.11.0 From 564879ef1f8dab95848b560f7cf23d690f996db8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 16 May 2023 11:51:38 +0200 Subject: [PATCH 088/111] update to 7.0.0 raise dependency on PHP 8.0 update bundled bartlett/php-compatinfo-db to 5.5.0 --- .gitignore | 1 + makesrc.sh | 1 + php-bartlett-PHP-CompatInfo.spec | 87 +++++++++++++++++--------------- sources | 2 +- 4 files changed, 49 insertions(+), 42 deletions(-) diff --git a/.gitignore b/.gitignore index 6ed0492..e38ab10 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,4 @@ clog /php-bartlett-PHP-CompatInfo-6.5.2-832e40e.tgz /php-bartlett-PHP-CompatInfo-6.5.3-e2bc72e.tgz /php-bartlett-PHP-CompatInfo-6.5.4-d3e9319.tgz +/php-bartlett-PHP-CompatInfo-7.0.0-7b05300.tgz diff --git a/makesrc.sh b/makesrc.sh index 124d01a..381e35a 100755 --- a/makesrc.sh +++ b/makesrc.sh @@ -18,6 +18,7 @@ echo "Getting commit..." git checkout $COMMIT || exit 1 cp composer.json ../ + composer config platform.php 8.0.99 composer install --no-interaction --no-progress --no-dev --optimize-autoloader cp vendor/composer/installed.json ../ diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index be5a595..9a054d2 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -1,7 +1,7 @@ # remirepo/fedora spec file for php-bartlett-PHP-CompatInfo # # Copyright (c) 2011-2023 Remi Collet -# License: CC-BY-SA +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries @@ -11,18 +11,18 @@ %undefine __brp_mangle_shebangs %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit d3e93196393b6efe6f359d128ed3638d40687574 +%global gh_commit 7b053000a684d1fa3840e0ab3c5833fecdf02dc3 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville %global gh_project php-compatinfo -%global upstream_version 6.5.4 +%global upstream_version 7.0.0 #global upstream_prever RC1 Name: php-bartlett-PHP-CompatInfo Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 3%{?dist} +Release: 1%{?dist} Summary: Find out version and the extensions required for a piece of code to run # SPDX: see bundled libraries list below @@ -38,11 +38,11 @@ Source9: makesrc.sh Patch0: %{name}-6.0.0-rpm.patch BuildArch: noarch -BuildRequires: php(language) >= 7.4 +BuildRequires: php(language) >= 8.0 BuildRequires: php-cli BuildRequires: php-json -Requires: php(language) >= 7.4 +Requires: php(language) >= 8.0 Requires: php-cli Requires: php-dom Requires: php-json @@ -57,61 +57,57 @@ Requires: php-xmlreader # Bundled libraries # License BSD-3-Clause -Provides: bundled(php-bartlett-php-compatinfo-db) = 4.11.0 -Provides: bundled(php-nikic-php-parser) = v4.15.2 +Provides: bundled(php-bartlett-php-compatinfo-db) = 5.5.0 +Provides: bundled(php-nikic-php-parser) = v4.15.4 # License MIT Provides: bundled(php-bartlett-sarif-php-sdk) = 1.0.1 -Provides: bundled(php-brick-math) = 0.9.3 +Provides: bundled(php-brick-math) = 0.11.0 Provides: bundled(php-composer-semver) = 3.3.2 -Provides: bundled(php-doctrine-annotations) = 1.14.2 +Provides: bundled(php-doctrine-annotations) = 1.14.3 Provides: bundled(php-doctrine-cache) = 2.2.0 Provides: bundled(php-doctrine-collections) = 1.8.0 Provides: bundled(php-doctrine-common) = 3.4.3 -Provides: bundled(php-doctrine-dbal) = 3.5.2 +Provides: bundled(php-doctrine-dbal) = 3.6.2 Provides: bundled(php-doctrine-deprecations) = v1.0.0 Provides: bundled(php-doctrine-event-manager) = 1.2.0 Provides: bundled(php-doctrine-inflector) = 2.0.6 Provides: bundled(php-doctrine-instantiator) = 1.5.0 Provides: bundled(php-doctrine-lexer) = 2.1.0 -Provides: bundled(php-doctrine-orm) = 2.14.0 -Provides: bundled(php-doctrine-persistence) = 3.1.2 -Provides: bundled(php-psr-cache) = 1.0.1 -Provides: bundled(php-psr-container) = 1.1.2 +Provides: bundled(php-doctrine-orm) = 2.15.1 +Provides: bundled(php-doctrine-persistence) = 3.1.4 +Provides: bundled(php-psr-cache) = 3.0.0 +Provides: bundled(php-psr-container) = 2.0.2 Provides: bundled(php-psr-event-dispatcher) = 1.0.0 -Provides: bundled(php-psr-log) = 1.1.4 +Provides: bundled(php-psr-log) = 3.0.0 Provides: bundled(php-ramsey-collection) = 1.3.0 -Provides: bundled(php-ramsey-uuid) = 4.2.3 -Provides: bundled(php-symfony-amqp-messenger) = v5.4.17 -Provides: bundled(php-symfony-cache) = v5.4.18 -Provides: bundled(php-symfony-cache-contracts) = v2.5.2 -Provides: bundled(php-symfony-config) = v5.4.11 -Provides: bundled(php-symfony-console) = v5.4.17 -Provides: bundled(php-symfony-dependency-injection) = v5.4.17 -Provides: bundled(php-symfony-deprecation-contracts) = v2.5.2 -Provides: bundled(php-symfony-doctrine-messenger) = v5.4.16 -Provides: bundled(php-symfony-event-dispatcher) = v5.4.17 -Provides: bundled(php-symfony-event-dispatcher-contracts) = v2.5.2 -Provides: bundled(php-symfony-filesystem) = v5.4.13 -Provides: bundled(php-symfony-finder) = v5.4.17 -Provides: bundled(php-symfony-http-client) = v5.4.17 -Provides: bundled(php-symfony-http-client-contracts) = v2.5.2 -Provides: bundled(php-symfony-messenger) = v5.4.17 +Provides: bundled(php-ramsey-uuid) = 4.7.4 +Provides: bundled(php-symfony-cache) = v6.0.19 +Provides: bundled(php-symfony-cache-contracts) = v3.0.2 +Provides: bundled(php-symfony-config) = v6.0.19 +Provides: bundled(php-symfony-console) = v6.0.19 +Provides: bundled(php-symfony-dependency-injection) = v6.0.20 +Provides: bundled(php-symfony-deprecation-contracts) = v3.0.2 +Provides: bundled(php-symfony-event-dispatcher) = v6.0.19 +Provides: bundled(php-symfony-event-dispatcher-contracts) = v3.0.2 +Provides: bundled(php-symfony-filesystem) = v6.0.19 +Provides: bundled(php-symfony-finder) = v6.0.19 +Provides: bundled(php-symfony-http-client) = v6.0.20 +Provides: bundled(php-symfony-http-client-contracts) = v3.0.2 +Provides: bundled(php-symfony-messenger) = v6.0.19 Provides: bundled(php-symfony-polyfill-ctype) = v1.27.0 Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.27.0 Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.27.0 Provides: bundled(php-symfony-polyfill-mbstring) = v1.27.0 Provides: bundled(php-symfony-polyfill-php72) = v1.27.0 -Provides: bundled(php-symfony-polyfill-php73) = v1.27.0 Provides: bundled(php-symfony-polyfill-php80) = v1.27.0 Provides: bundled(php-symfony-polyfill-php81) = v1.27.0 -Provides: bundled(php-symfony-process) = v5.4.11 -Provides: bundled(php-symfony-redis-messenger) = v5.4.15 +Provides: bundled(php-symfony-process) = v6.0.19 Provides: bundled(php-symfony-requirements-checker) = v2.0.1 -Provides: bundled(php-symfony-serializer) = v5.4.17 -Provides: bundled(php-symfony-service-contracts) = v2.5.2 -Provides: bundled(php-symfony-stopwatch) = v5.4.13 -Provides: bundled(php-symfony-string) = v5.4.17 -Provides: bundled(php-symfony-var-exporter) = v5.4.17 +Provides: bundled(php-symfony-serializer) = v6.0.19 +Provides: bundled(php-symfony-service-contracts) = v3.0.2 +Provides: bundled(php-symfony-stopwatch) = v6.0.19 +Provides: bundled(php-symfony-string) = v6.0.19 +Provides: bundled(php-symfony-var-exporter) = v6.0.19 Provides: phpcompatinfo = %{version} Provides: php-composer(bartlett/php-compatinfo) = %{version} @@ -126,7 +122,7 @@ show content of dictionary references. %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p1 -b .rpm +%patch -P0 -p1 -b .rpm # https://github.com/llaville/php-compatinfo-db/issues/112 sed -e 's/touch/@touch/' -i vendor/bartlett/php-compatinfo-db/config/set/default.php @@ -142,6 +138,10 @@ do done done rm -r tests +rm -r .github +rm -r .changes +rm -r vendor/bartlett/*/.github +rm -r vendor/bartlett/*/.changes : List bundled libraries and Licenses php -r ' @@ -197,6 +197,11 @@ install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/fedora- %changelog +* Tue May 16 2023 Remi Collet - 7.0.0-1 +- update to 7.0.0 +- raise dependency on PHP 8.0 +- update bundled bartlett/php-compatinfo-db to 5.5.0 + * Fri Jan 20 2023 Fedora Release Engineering - 6.5.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index a698cb1..bf22db2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-6.5.4-d3e9319.tgz) = d1a84f8ce0c5eaeb4b596e16b99e1f91554e0cf3dbe0df8950ec5db289d5a59e26b8a050f294c361701744e1a6472aec9c94662e462da3a6c667fc86b50e3bb4 +SHA512 (php-bartlett-PHP-CompatInfo-7.0.0-7b05300.tgz) = 9917308a1e972b846e0daa822656c03d0a3d4e5dffd2db16c2716e195fa07a3abb2bee434f5a6d5e9aa83272c5b99652eedb0a61468c29b87634f0bea369e67b From 1bc9d0e9a15d0c22b88f867c4a036df8ba4aaa8b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 04:05:17 +0000 Subject: [PATCH 089/111] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-bartlett-PHP-CompatInfo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 9a054d2..89cda5f 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -22,7 +22,7 @@ Name: php-bartlett-PHP-CompatInfo Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Find out version and the extensions required for a piece of code to run # SPDX: see bundled libraries list below @@ -197,6 +197,9 @@ install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/fedora- %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 7.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue May 16 2023 Remi Collet - 7.0.0-1 - update to 7.0.0 - raise dependency on PHP 8.0 From e918577e9f6ea82ee1c636a639959ba449467d7c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 13 Nov 2023 12:05:04 +0100 Subject: [PATCH 090/111] update bundled bartlett/php-compatinfo-db to 5.12.0 --- php-bartlett-PHP-CompatInfo.spec | 37 +++++++++++++++++--------------- sources | 2 +- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 89cda5f..67472ab 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -22,7 +22,7 @@ Name: php-bartlett-PHP-CompatInfo Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Find out version and the extensions required for a piece of code to run # SPDX: see bundled libraries list below @@ -57,30 +57,30 @@ Requires: php-xmlreader # Bundled libraries # License BSD-3-Clause -Provides: bundled(php-bartlett-php-compatinfo-db) = 5.5.0 -Provides: bundled(php-nikic-php-parser) = v4.15.4 +Provides: bundled(php-bartlett-php-compatinfo-db) = 5.12.0 +Provides: bundled(php-nikic-php-parser) = v4.17.1 # License MIT Provides: bundled(php-bartlett-sarif-php-sdk) = 1.0.1 Provides: bundled(php-brick-math) = 0.11.0 -Provides: bundled(php-composer-semver) = 3.3.2 +Provides: bundled(php-composer-semver) = 3.4.0 Provides: bundled(php-doctrine-annotations) = 1.14.3 Provides: bundled(php-doctrine-cache) = 2.2.0 Provides: bundled(php-doctrine-collections) = 1.8.0 Provides: bundled(php-doctrine-common) = 3.4.3 -Provides: bundled(php-doctrine-dbal) = 3.6.2 -Provides: bundled(php-doctrine-deprecations) = v1.0.0 +Provides: bundled(php-doctrine-dbal) = 3.7.1 +Provides: bundled(php-doctrine-deprecations) = 1.1.2 Provides: bundled(php-doctrine-event-manager) = 1.2.0 -Provides: bundled(php-doctrine-inflector) = 2.0.6 +Provides: bundled(php-doctrine-inflector) = 2.0.8 Provides: bundled(php-doctrine-instantiator) = 1.5.0 Provides: bundled(php-doctrine-lexer) = 2.1.0 -Provides: bundled(php-doctrine-orm) = 2.15.1 -Provides: bundled(php-doctrine-persistence) = 3.1.4 +Provides: bundled(php-doctrine-orm) = 2.16.2 +Provides: bundled(php-doctrine-persistence) = 3.2.0 Provides: bundled(php-psr-cache) = 3.0.0 Provides: bundled(php-psr-container) = 2.0.2 Provides: bundled(php-psr-event-dispatcher) = 1.0.0 Provides: bundled(php-psr-log) = 3.0.0 Provides: bundled(php-ramsey-collection) = 1.3.0 -Provides: bundled(php-ramsey-uuid) = 4.7.4 +Provides: bundled(php-ramsey-uuid) = 4.7.5 Provides: bundled(php-symfony-cache) = v6.0.19 Provides: bundled(php-symfony-cache-contracts) = v3.0.2 Provides: bundled(php-symfony-config) = v6.0.19 @@ -94,13 +94,13 @@ Provides: bundled(php-symfony-finder) = v6.0.19 Provides: bundled(php-symfony-http-client) = v6.0.20 Provides: bundled(php-symfony-http-client-contracts) = v3.0.2 Provides: bundled(php-symfony-messenger) = v6.0.19 -Provides: bundled(php-symfony-polyfill-ctype) = v1.27.0 -Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.27.0 -Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.27.0 -Provides: bundled(php-symfony-polyfill-mbstring) = v1.27.0 -Provides: bundled(php-symfony-polyfill-php72) = v1.27.0 -Provides: bundled(php-symfony-polyfill-php80) = v1.27.0 -Provides: bundled(php-symfony-polyfill-php81) = v1.27.0 +Provides: bundled(php-symfony-polyfill-ctype) = v1.28.0 +Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.28.0 +Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.28.0 +Provides: bundled(php-symfony-polyfill-mbstring) = v1.28.0 +Provides: bundled(php-symfony-polyfill-php72) = v1.28.0 +Provides: bundled(php-symfony-polyfill-php80) = v1.28.0 +Provides: bundled(php-symfony-polyfill-php81) = v1.28.0 Provides: bundled(php-symfony-process) = v6.0.19 Provides: bundled(php-symfony-requirements-checker) = v2.0.1 Provides: bundled(php-symfony-serializer) = v6.0.19 @@ -197,6 +197,9 @@ install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/fedora- %changelog +* Mon Nov 13 2023 Remi Collet - 7.0.0-3 +- update bundled bartlett/php-compatinfo-db to 5.12.0 + * Fri Jul 21 2023 Fedora Release Engineering - 7.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index bf22db2..2d0a544 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-7.0.0-7b05300.tgz) = 9917308a1e972b846e0daa822656c03d0a3d4e5dffd2db16c2716e195fa07a3abb2bee434f5a6d5e9aa83272c5b99652eedb0a61468c29b87634f0bea369e67b +SHA512 (php-bartlett-PHP-CompatInfo-7.0.0-7b05300.tgz) = d7a67a7f6f9e7568eb079d04b96cdf29f8c53f7b13d76c3886c0f09c779538d4a1437e8b0ad8f1a6d7e59e8b0dab2c7bf853322ec86f6aadb848d72b4ba19e81 From 21c9aaaac548f70ee603484102523f58426d6fa1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 13 Nov 2023 12:13:57 +0100 Subject: [PATCH 091/111] fix check --- php-bartlett-PHP-CompatInfo.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 67472ab..a3719e6 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -183,7 +183,7 @@ install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/fedora- %check -%{buildroot}%{_bindir}/phpcompatinfo --version || grep %{version} +%{buildroot}%{_bindir}/phpcompatinfo --version | grep %{version} && exit 0 %files From 2419c59d4e701ba6f5e8f89806353257e2ea1f17 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 13 Nov 2023 12:29:10 +0100 Subject: [PATCH 092/111] missing file --- php-bartlett-PHP-CompatInfo.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index a3719e6..192c4c7 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -127,6 +127,9 @@ show content of dictionary references. # https://github.com/llaville/php-compatinfo-db/issues/112 sed -e 's/touch/@touch/' -i vendor/bartlett/php-compatinfo-db/config/set/default.php +# https://github.com/llaville/php-compatinfo/issues/364 +[ -f config/set/up-to-php83.php ] || ln -s up-to-php82.php config/set/up-to-php83.php + : Gather all license files and cleanup tests mv vendor/composer/LICENSE composer_LICENSE for vendor in $(ls vendor) From 37b0b9b8b1b1417d7ab8a9fee06dbdcc23a4a02e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 14 Nov 2023 15:46:39 +0100 Subject: [PATCH 093/111] update to 7.0.1 update bundled bartlett/php-compatinfo-db to 5.13.0 --- .gitignore | 1 + php-bartlett-PHP-CompatInfo.spec | 18 +++++++++++------- sources | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index e38ab10..588d93e 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ clog /php-bartlett-PHP-CompatInfo-6.5.3-e2bc72e.tgz /php-bartlett-PHP-CompatInfo-6.5.4-d3e9319.tgz /php-bartlett-PHP-CompatInfo-7.0.0-7b05300.tgz +/php-bartlett-PHP-CompatInfo-7.0.1-c944914.tgz diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 192c4c7..bd7582e 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -11,18 +11,18 @@ %undefine __brp_mangle_shebangs %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit 7b053000a684d1fa3840e0ab3c5833fecdf02dc3 +%global gh_commit c94491403ade577b5a1d6f0a460339394e039f3c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville %global gh_project php-compatinfo -%global upstream_version 7.0.0 +%global upstream_version 7.0.1 #global upstream_prever RC1 Name: php-bartlett-PHP-CompatInfo Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 3%{?dist} +Release: 1%{?dist} Summary: Find out version and the extensions required for a piece of code to run # SPDX: see bundled libraries list below @@ -36,6 +36,8 @@ Source9: makesrc.sh # Relocate the database Patch0: %{name}-6.0.0-rpm.patch +# Allow PHP 8.3 +Patch1: %{name}-7.0.0-php83.patch BuildArch: noarch BuildRequires: php(language) >= 8.0 @@ -57,7 +59,7 @@ Requires: php-xmlreader # Bundled libraries # License BSD-3-Clause -Provides: bundled(php-bartlett-php-compatinfo-db) = 5.12.0 +Provides: bundled(php-bartlett-php-compatinfo-db) = 5.13.0 Provides: bundled(php-nikic-php-parser) = v4.17.1 # License MIT Provides: bundled(php-bartlett-sarif-php-sdk) = 1.0.1 @@ -123,13 +125,11 @@ show content of dictionary references. %prep %setup -q -n %{gh_project}-%{gh_commit} %patch -P0 -p1 -b .rpm +%patch -P1 -p1 # https://github.com/llaville/php-compatinfo-db/issues/112 sed -e 's/touch/@touch/' -i vendor/bartlett/php-compatinfo-db/config/set/default.php -# https://github.com/llaville/php-compatinfo/issues/364 -[ -f config/set/up-to-php83.php ] || ln -s up-to-php82.php config/set/up-to-php83.php - : Gather all license files and cleanup tests mv vendor/composer/LICENSE composer_LICENSE for vendor in $(ls vendor) @@ -200,6 +200,10 @@ install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/fedora- %changelog +* Tue Nov 14 2023 Remi Collet - 7.0.1-1 +- update to 7.0.1 +- update bundled bartlett/php-compatinfo-db to 5.13.0 + * Mon Nov 13 2023 Remi Collet - 7.0.0-3 - update bundled bartlett/php-compatinfo-db to 5.12.0 diff --git a/sources b/sources index 2d0a544..427f18f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-7.0.0-7b05300.tgz) = d7a67a7f6f9e7568eb079d04b96cdf29f8c53f7b13d76c3886c0f09c779538d4a1437e8b0ad8f1a6d7e59e8b0dab2c7bf853322ec86f6aadb848d72b4ba19e81 +SHA512 (php-bartlett-PHP-CompatInfo-7.0.1-c944914.tgz) = 1b95489c5fbbaeca81333d63784bddc6dc314515233fd5034752c83558348aeb5564e0aae6687694de4dd8fa17b9f91c951a3387d16cfda6a2684a69ca96f746 From d59205839e06e8c29ad3f5b96d5174136d0ed12b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 14 Nov 2023 16:10:44 +0100 Subject: [PATCH 094/111] missing patch --- php-bartlett-PHP-CompatInfo-7.0.0-php83.patch | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 php-bartlett-PHP-CompatInfo-7.0.0-php83.patch diff --git a/php-bartlett-PHP-CompatInfo-7.0.0-php83.patch b/php-bartlett-PHP-CompatInfo-7.0.0-php83.patch new file mode 100644 index 0000000..eeb3b98 --- /dev/null +++ b/php-bartlett-PHP-CompatInfo-7.0.0-php83.patch @@ -0,0 +1,70 @@ +From bc069b672d65748fdc257e23c667310946e7837e Mon Sep 17 00:00:00 2001 +From: Laurent Laville +Date: Thu, 2 Nov 2023 06:52:05 +0000 +Subject: [PATCH] initialize PHP 8.3 support + +--- + composer.json | 2 +- + config/set/php83.php | 18 ++++++++++++++++++ + config/set/up-to-php83.php | 14 ++++++++++++++ + 3 files changed, 33 insertions(+), 1 deletion(-) + create mode 100644 config/set/php83.php + create mode 100644 config/set/up-to-php83.php + +diff --git a/composer.json b/composer.json +index 34446906..9afc85cd 100644 +--- a/composer.json ++++ b/composer.json +@@ -70,7 +70,7 @@ + "extra": { + "enable-patching": true, + "branch-alias": { +- "dev-master": "7.0.x-dev" ++ "dev-master": "8.0.x-dev" + } + } + } +diff --git a/config/set/php83.php b/config/set/php83.php +new file mode 100644 +index 00000000..32531fb1 +--- /dev/null ++++ b/config/set/php83.php +@@ -0,0 +1,18 @@ ++import(__DIR__ . '/up-to-php82.php'); ++ $containerConfigurator->import(__DIR__ . '/php83.php'); ++}; From 87a6fa4f3419e29db340648d36f056343228d8a2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 6 Dec 2023 11:47:13 +0100 Subject: [PATCH 095/111] update to 7.0.2 update bundled bartlett/php-compatinfo-db to 6.0.0 open https://github.com/llaville/php-compatinfo/issues/365 8.0 compatibility raise dependency on PHP 8.1 --- .gitignore | 1 + makesrc.sh | 3 +- php-bartlett-PHP-CompatInfo-7.0.0-php83.patch | 13 ---- php-bartlett-PHP-CompatInfo.spec | 69 ++++++++++--------- sources | 2 +- 5 files changed, 42 insertions(+), 46 deletions(-) diff --git a/.gitignore b/.gitignore index 588d93e..c8ff94b 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ clog /php-bartlett-PHP-CompatInfo-6.5.4-d3e9319.tgz /php-bartlett-PHP-CompatInfo-7.0.0-7b05300.tgz /php-bartlett-PHP-CompatInfo-7.0.1-c944914.tgz +/php-bartlett-PHP-CompatInfo-7.0.2-cff8a7a.tgz diff --git a/makesrc.sh b/makesrc.sh index 381e35a..c3a64e2 100755 --- a/makesrc.sh +++ b/makesrc.sh @@ -18,7 +18,8 @@ echo "Getting commit..." git checkout $COMMIT || exit 1 cp composer.json ../ - composer config platform.php 8.0.99 + module load php81 + composer config platform.php 8.1.99 composer install --no-interaction --no-progress --no-dev --optimize-autoloader cp vendor/composer/installed.json ../ diff --git a/php-bartlett-PHP-CompatInfo-7.0.0-php83.patch b/php-bartlett-PHP-CompatInfo-7.0.0-php83.patch index eeb3b98..443555c 100644 --- a/php-bartlett-PHP-CompatInfo-7.0.0-php83.patch +++ b/php-bartlett-PHP-CompatInfo-7.0.0-php83.patch @@ -11,19 +11,6 @@ Subject: [PATCH] initialize PHP 8.3 support create mode 100644 config/set/php83.php create mode 100644 config/set/up-to-php83.php -diff --git a/composer.json b/composer.json -index 34446906..9afc85cd 100644 ---- a/composer.json -+++ b/composer.json -@@ -70,7 +70,7 @@ - "extra": { - "enable-patching": true, - "branch-alias": { -- "dev-master": "7.0.x-dev" -+ "dev-master": "8.0.x-dev" - } - } - } diff --git a/config/set/php83.php b/config/set/php83.php new file mode 100644 index 00000000..32531fb1 diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index bd7582e..6258743 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -11,13 +11,13 @@ %undefine __brp_mangle_shebangs %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit c94491403ade577b5a1d6f0a460339394e039f3c +%global gh_commit cff8a7aa5a0fcccb0ef8bcb11dc55480b88538bd %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville %global gh_project php-compatinfo -%global upstream_version 7.0.1 +%global upstream_version 7.0.2 #global upstream_prever RC1 Name: php-bartlett-PHP-CompatInfo @@ -40,11 +40,11 @@ Patch0: %{name}-6.0.0-rpm.patch Patch1: %{name}-7.0.0-php83.patch BuildArch: noarch -BuildRequires: php(language) >= 8.0 +BuildRequires: php(language) >= 8.1 BuildRequires: php-cli BuildRequires: php-json -Requires: php(language) >= 8.0 +Requires: php(language) >= 8.1 Requires: php-cli Requires: php-dom Requires: php-json @@ -59,57 +59,58 @@ Requires: php-xmlreader # Bundled libraries # License BSD-3-Clause -Provides: bundled(php-bartlett-php-compatinfo-db) = 5.13.0 +Provides: bundled(php-bartlett-php-compatinfo-db) = 6.0.0 Provides: bundled(php-nikic-php-parser) = v4.17.1 # License MIT Provides: bundled(php-bartlett-sarif-php-sdk) = 1.0.1 Provides: bundled(php-brick-math) = 0.11.0 Provides: bundled(php-composer-semver) = 3.4.0 -Provides: bundled(php-doctrine-annotations) = 1.14.3 Provides: bundled(php-doctrine-cache) = 2.2.0 Provides: bundled(php-doctrine-collections) = 1.8.0 Provides: bundled(php-doctrine-common) = 3.4.3 -Provides: bundled(php-doctrine-dbal) = 3.7.1 +Provides: bundled(php-doctrine-dbal) = 3.7.2 Provides: bundled(php-doctrine-deprecations) = 1.1.2 -Provides: bundled(php-doctrine-event-manager) = 1.2.0 +Provides: bundled(php-doctrine-event-manager) = 2.0.0 Provides: bundled(php-doctrine-inflector) = 2.0.8 -Provides: bundled(php-doctrine-instantiator) = 1.5.0 +Provides: bundled(php-doctrine-instantiator) = 2.0.0 Provides: bundled(php-doctrine-lexer) = 2.1.0 -Provides: bundled(php-doctrine-orm) = 2.16.2 +Provides: bundled(php-doctrine-orm) = 2.17.1 Provides: bundled(php-doctrine-persistence) = 3.2.0 Provides: bundled(php-psr-cache) = 3.0.0 +Provides: bundled(php-psr-clock) = 1.0.0 Provides: bundled(php-psr-container) = 2.0.2 Provides: bundled(php-psr-event-dispatcher) = 1.0.0 Provides: bundled(php-psr-log) = 3.0.0 -Provides: bundled(php-ramsey-collection) = 1.3.0 +Provides: bundled(php-ramsey-collection) = 2.0.0 Provides: bundled(php-ramsey-uuid) = 4.7.5 -Provides: bundled(php-symfony-cache) = v6.0.19 -Provides: bundled(php-symfony-cache-contracts) = v3.0.2 -Provides: bundled(php-symfony-config) = v6.0.19 -Provides: bundled(php-symfony-console) = v6.0.19 -Provides: bundled(php-symfony-dependency-injection) = v6.0.20 -Provides: bundled(php-symfony-deprecation-contracts) = v3.0.2 -Provides: bundled(php-symfony-event-dispatcher) = v6.0.19 -Provides: bundled(php-symfony-event-dispatcher-contracts) = v3.0.2 -Provides: bundled(php-symfony-filesystem) = v6.0.19 -Provides: bundled(php-symfony-finder) = v6.0.19 -Provides: bundled(php-symfony-http-client) = v6.0.20 -Provides: bundled(php-symfony-http-client-contracts) = v3.0.2 -Provides: bundled(php-symfony-messenger) = v6.0.19 +Provides: bundled(php-symfony-cache) = v6.4.0 +Provides: bundled(php-symfony-cache-contracts) = v3.4.0 +Provides: bundled(php-symfony-clock) = v6.4.0 +Provides: bundled(php-symfony-config) = v6.4.0 +Provides: bundled(php-symfony-console) = v6.4.1 +Provides: bundled(php-symfony-dependency-injection) = v6.4.1 +Provides: bundled(php-symfony-deprecation-contracts) = v3.4.0 +Provides: bundled(php-symfony-event-dispatcher) = v6.4.0 +Provides: bundled(php-symfony-event-dispatcher-contracts) = v3.4.0 +Provides: bundled(php-symfony-filesystem) = v6.4.0 +Provides: bundled(php-symfony-finder) = v6.4.0 +Provides: bundled(php-symfony-http-client) = v6.4.0 +Provides: bundled(php-symfony-http-client-contracts) = v3.4.0 +Provides: bundled(php-symfony-messenger) = v6.4.0 Provides: bundled(php-symfony-polyfill-ctype) = v1.28.0 Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.28.0 Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.28.0 Provides: bundled(php-symfony-polyfill-mbstring) = v1.28.0 Provides: bundled(php-symfony-polyfill-php72) = v1.28.0 Provides: bundled(php-symfony-polyfill-php80) = v1.28.0 -Provides: bundled(php-symfony-polyfill-php81) = v1.28.0 -Provides: bundled(php-symfony-process) = v6.0.19 +Provides: bundled(php-symfony-polyfill-php83) = v1.28.0 +Provides: bundled(php-symfony-process) = v6.4.0 Provides: bundled(php-symfony-requirements-checker) = v2.0.1 -Provides: bundled(php-symfony-serializer) = v6.0.19 -Provides: bundled(php-symfony-service-contracts) = v3.0.2 -Provides: bundled(php-symfony-stopwatch) = v6.0.19 -Provides: bundled(php-symfony-string) = v6.0.19 -Provides: bundled(php-symfony-var-exporter) = v6.0.19 +Provides: bundled(php-symfony-serializer) = v6.4.1 +Provides: bundled(php-symfony-service-contracts) = v3.4.0 +Provides: bundled(php-symfony-stopwatch) = v6.4.0 +Provides: bundled(php-symfony-string) = v6.4.0 +Provides: bundled(php-symfony-var-exporter) = v6.4.1 Provides: phpcompatinfo = %{version} Provides: php-composer(bartlett/php-compatinfo) = %{version} @@ -200,6 +201,12 @@ install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/fedora- %changelog +* Wed Dec 6 2023 Remi Collet - 7.0.2-1 +- update to 7.0.2 +- update bundled bartlett/php-compatinfo-db to 6.0.0 +- open https://github.com/llaville/php-compatinfo/issues/365 8.0 compatibility +- raise dependency on PHP 8.1 + * Tue Nov 14 2023 Remi Collet - 7.0.1-1 - update to 7.0.1 - update bundled bartlett/php-compatinfo-db to 5.13.0 diff --git a/sources b/sources index 427f18f..8992631 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-7.0.1-c944914.tgz) = 1b95489c5fbbaeca81333d63784bddc6dc314515233fd5034752c83558348aeb5564e0aae6687694de4dd8fa17b9f91c951a3387d16cfda6a2684a69ca96f746 +SHA512 (php-bartlett-PHP-CompatInfo-7.0.2-cff8a7a.tgz) = 31b236acd7473342f14e7d0600865659982384ea6687ca71aacc18baab70e494b41685f87f8cc73cbc87cc6c23bf02c8e653b5d11e9746b9361aef4f1e31686d From c7f5b354acf66197129589f25a26a550416646c2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 2 Jan 2024 07:40:13 +0100 Subject: [PATCH 096/111] v7.1.0 --- .gitignore | 1 + php-bartlett-PHP-CompatInfo-7.0.0-php83.patch | 57 ------------------- php-bartlett-PHP-CompatInfo.spec | 38 ++++++------- sources | 2 +- 4 files changed, 21 insertions(+), 77 deletions(-) delete mode 100644 php-bartlett-PHP-CompatInfo-7.0.0-php83.patch diff --git a/.gitignore b/.gitignore index c8ff94b..25d01c9 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,4 @@ clog /php-bartlett-PHP-CompatInfo-7.0.0-7b05300.tgz /php-bartlett-PHP-CompatInfo-7.0.1-c944914.tgz /php-bartlett-PHP-CompatInfo-7.0.2-cff8a7a.tgz +/php-bartlett-PHP-CompatInfo-7.1.0-26b0219.tgz diff --git a/php-bartlett-PHP-CompatInfo-7.0.0-php83.patch b/php-bartlett-PHP-CompatInfo-7.0.0-php83.patch deleted file mode 100644 index 443555c..0000000 --- a/php-bartlett-PHP-CompatInfo-7.0.0-php83.patch +++ /dev/null @@ -1,57 +0,0 @@ -From bc069b672d65748fdc257e23c667310946e7837e Mon Sep 17 00:00:00 2001 -From: Laurent Laville -Date: Thu, 2 Nov 2023 06:52:05 +0000 -Subject: [PATCH] initialize PHP 8.3 support - ---- - composer.json | 2 +- - config/set/php83.php | 18 ++++++++++++++++++ - config/set/up-to-php83.php | 14 ++++++++++++++ - 3 files changed, 33 insertions(+), 1 deletion(-) - create mode 100644 config/set/php83.php - create mode 100644 config/set/up-to-php83.php - -diff --git a/config/set/php83.php b/config/set/php83.php -new file mode 100644 -index 00000000..32531fb1 ---- /dev/null -+++ b/config/set/php83.php -@@ -0,0 +1,18 @@ -+import(__DIR__ . '/up-to-php82.php'); -+ $containerConfigurator->import(__DIR__ . '/php83.php'); -+}; diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 6258743..623dacf 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -11,13 +11,13 @@ %undefine __brp_mangle_shebangs %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit cff8a7aa5a0fcccb0ef8bcb11dc55480b88538bd +%global gh_commit 26b0219fde16933f67d991fdc3974d304eec3ead %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville %global gh_project php-compatinfo -%global upstream_version 7.0.2 +%global upstream_version 7.1.0 #global upstream_prever RC1 Name: php-bartlett-PHP-CompatInfo @@ -36,8 +36,6 @@ Source9: makesrc.sh # Relocate the database Patch0: %{name}-6.0.0-rpm.patch -# Allow PHP 8.3 -Patch1: %{name}-7.0.0-php83.patch BuildArch: noarch BuildRequires: php(language) >= 8.1 @@ -59,8 +57,8 @@ Requires: php-xmlreader # Bundled libraries # License BSD-3-Clause -Provides: bundled(php-bartlett-php-compatinfo-db) = 6.0.0 -Provides: bundled(php-nikic-php-parser) = v4.17.1 +Provides: bundled(php-bartlett-php-compatinfo-db) = 6.1.1 +Provides: bundled(php-nikic-php-parser) = v4.18.0 # License MIT Provides: bundled(php-bartlett-sarif-php-sdk) = 1.0.1 Provides: bundled(php-brick-math) = 0.11.0 @@ -74,7 +72,7 @@ Provides: bundled(php-doctrine-event-manager) = 2.0.0 Provides: bundled(php-doctrine-inflector) = 2.0.8 Provides: bundled(php-doctrine-instantiator) = 2.0.0 Provides: bundled(php-doctrine-lexer) = 2.1.0 -Provides: bundled(php-doctrine-orm) = 2.17.1 +Provides: bundled(php-doctrine-orm) = 2.17.2 Provides: bundled(php-doctrine-persistence) = 3.2.0 Provides: bundled(php-psr-cache) = 3.0.0 Provides: bundled(php-psr-clock) = 1.0.0 @@ -83,18 +81,18 @@ Provides: bundled(php-psr-event-dispatcher) = 1.0.0 Provides: bundled(php-psr-log) = 3.0.0 Provides: bundled(php-ramsey-collection) = 2.0.0 Provides: bundled(php-ramsey-uuid) = 4.7.5 -Provides: bundled(php-symfony-cache) = v6.4.0 +Provides: bundled(php-symfony-cache) = v6.4.2 Provides: bundled(php-symfony-cache-contracts) = v3.4.0 -Provides: bundled(php-symfony-clock) = v6.4.0 +Provides: bundled(php-symfony-clock) = v6.4.2 Provides: bundled(php-symfony-config) = v6.4.0 -Provides: bundled(php-symfony-console) = v6.4.1 -Provides: bundled(php-symfony-dependency-injection) = v6.4.1 +Provides: bundled(php-symfony-console) = v6.4.2 +Provides: bundled(php-symfony-dependency-injection) = v6.4.2 Provides: bundled(php-symfony-deprecation-contracts) = v3.4.0 -Provides: bundled(php-symfony-event-dispatcher) = v6.4.0 +Provides: bundled(php-symfony-event-dispatcher) = v6.4.2 Provides: bundled(php-symfony-event-dispatcher-contracts) = v3.4.0 Provides: bundled(php-symfony-filesystem) = v6.4.0 Provides: bundled(php-symfony-finder) = v6.4.0 -Provides: bundled(php-symfony-http-client) = v6.4.0 +Provides: bundled(php-symfony-http-client) = v6.4.2 Provides: bundled(php-symfony-http-client-contracts) = v3.4.0 Provides: bundled(php-symfony-messenger) = v6.4.0 Provides: bundled(php-symfony-polyfill-ctype) = v1.28.0 @@ -104,13 +102,13 @@ Provides: bundled(php-symfony-polyfill-mbstring) = v1.28.0 Provides: bundled(php-symfony-polyfill-php72) = v1.28.0 Provides: bundled(php-symfony-polyfill-php80) = v1.28.0 Provides: bundled(php-symfony-polyfill-php83) = v1.28.0 -Provides: bundled(php-symfony-process) = v6.4.0 +Provides: bundled(php-symfony-process) = v6.4.2 Provides: bundled(php-symfony-requirements-checker) = v2.0.1 -Provides: bundled(php-symfony-serializer) = v6.4.1 -Provides: bundled(php-symfony-service-contracts) = v3.4.0 +Provides: bundled(php-symfony-serializer) = v6.4.2 +Provides: bundled(php-symfony-service-contracts) = v3.4.1 Provides: bundled(php-symfony-stopwatch) = v6.4.0 -Provides: bundled(php-symfony-string) = v6.4.0 -Provides: bundled(php-symfony-var-exporter) = v6.4.1 +Provides: bundled(php-symfony-string) = v6.4.2 +Provides: bundled(php-symfony-var-exporter) = v6.4.2 Provides: phpcompatinfo = %{version} Provides: php-composer(bartlett/php-compatinfo) = %{version} @@ -126,7 +124,6 @@ show content of dictionary references. %prep %setup -q -n %{gh_project}-%{gh_commit} %patch -P0 -p1 -b .rpm -%patch -P1 -p1 # https://github.com/llaville/php-compatinfo-db/issues/112 sed -e 's/touch/@touch/' -i vendor/bartlett/php-compatinfo-db/config/set/default.php @@ -201,6 +198,9 @@ install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/fedora- %changelog +* Tue Jan 2 2024 Remi Collet - 7.1.0-1 +- update to 7.1.0 + * Wed Dec 6 2023 Remi Collet - 7.0.2-1 - update to 7.0.2 - update bundled bartlett/php-compatinfo-db to 6.0.0 diff --git a/sources b/sources index 8992631..c51abcf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-7.0.2-cff8a7a.tgz) = 31b236acd7473342f14e7d0600865659982384ea6687ca71aacc18baab70e494b41685f87f8cc73cbc87cc6c23bf02c8e653b5d11e9746b9361aef4f1e31686d +SHA512 (php-bartlett-PHP-CompatInfo-7.1.0-26b0219.tgz) = 59b790ba5c12e22c0d9db18fe7bae4e3dde3ff142464825cc6a165f1b3ace0e64609e6fd306d74d18005e3f566cce9747b69a023835129ae690ed901fe0197f5 From 7b0aa52c6d9ce7b8b92f1dc50a7bcfcdb1c95b15 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 18 Jan 2024 11:02:44 +0100 Subject: [PATCH 097/111] update to 7.1.1 cleanup installation tree move docs and examples in package documentation --- .gitignore | 1 + php-bartlett-PHP-CompatInfo.spec | 37 +++++++++++++++++++------------- sources | 2 +- 3 files changed, 24 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 25d01c9..a96af03 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,4 @@ clog /php-bartlett-PHP-CompatInfo-7.0.1-c944914.tgz /php-bartlett-PHP-CompatInfo-7.0.2-cff8a7a.tgz /php-bartlett-PHP-CompatInfo-7.1.0-26b0219.tgz +/php-bartlett-PHP-CompatInfo-7.1.1-d9504f5.tgz diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 623dacf..4238362 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -11,13 +11,13 @@ %undefine __brp_mangle_shebangs %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit 26b0219fde16933f67d991fdc3974d304eec3ead +%global gh_commit d9504f525abfbdb8fc7d7850cbd58229471526ba %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151005 %global gh_owner llaville %global gh_project php-compatinfo -%global upstream_version 7.1.0 +%global upstream_version 7.1.1 #global upstream_prever RC1 Name: php-bartlett-PHP-CompatInfo @@ -58,9 +58,9 @@ Requires: php-xmlreader # Bundled libraries # License BSD-3-Clause Provides: bundled(php-bartlett-php-compatinfo-db) = 6.1.1 -Provides: bundled(php-nikic-php-parser) = v4.18.0 +Provides: bundled(php-nikic-php-parser) = v5.0.0 # License MIT -Provides: bundled(php-bartlett-sarif-php-sdk) = 1.0.1 +Provides: bundled(php-bartlett-sarif-php-sdk) = 1.1.0 Provides: bundled(php-brick-math) = 0.11.0 Provides: bundled(php-composer-semver) = 3.4.0 Provides: bundled(php-doctrine-cache) = 2.2.0 @@ -69,10 +69,10 @@ Provides: bundled(php-doctrine-common) = 3.4.3 Provides: bundled(php-doctrine-dbal) = 3.7.2 Provides: bundled(php-doctrine-deprecations) = 1.1.2 Provides: bundled(php-doctrine-event-manager) = 2.0.0 -Provides: bundled(php-doctrine-inflector) = 2.0.8 +Provides: bundled(php-doctrine-inflector) = 2.0.9 Provides: bundled(php-doctrine-instantiator) = 2.0.0 Provides: bundled(php-doctrine-lexer) = 2.1.0 -Provides: bundled(php-doctrine-orm) = 2.17.2 +Provides: bundled(php-doctrine-orm) = 2.17.3 Provides: bundled(php-doctrine-persistence) = 3.2.0 Provides: bundled(php-psr-cache) = 3.0.0 Provides: bundled(php-psr-clock) = 1.0.0 @@ -124,6 +124,7 @@ show content of dictionary references. %prep %setup -q -n %{gh_project}-%{gh_commit} %patch -P0 -p1 -b .rpm +rm bin/*rpm # https://github.com/llaville/php-compatinfo-db/issues/112 sed -e 's/touch/@touch/' -i vendor/bartlett/php-compatinfo-db/config/set/default.php @@ -138,9 +139,6 @@ do [ -f vendor/$vendor/$proj/LICENSE ] && mv vendor/$vendor/$proj/LICENSE ${vendor}_${proj}_LICENSE done done -rm -r tests -rm -r .github -rm -r .changes rm -r vendor/bartlett/*/.github rm -r vendor/bartlett/*/.changes @@ -169,18 +167,20 @@ php -r ' %install -mkdir -p %{buildroot}%{_datadir} -cp -pr . %{buildroot}%{_datadir}/%{name} -rm %{buildroot}%{_datadir}/%{name}/*LICENSE +mkdir -p %{buildroot}%{_datadir}/%{name} +for i in bin config data resources src vendor composer.* +do cp -pr $i %{buildroot}%{_datadir}/%{name}/$i +done mkdir -p %{buildroot}%{_bindir} ln -s ../share/%{name}/bin/phpcompatinfo %{buildroot}%{_bindir}/phpcompatinfo mkdir -p %{buildroot}%{_mandir}/man1 mv %{buildroot}%{_datadir}/%{name}/bin/phpcompatinfo.1 \ - %{buildroot}%{_mandir}/man1/phpcompatinfo.1 + %{buildroot}%{_mandir}/man1/phpcompatinfo.1 -install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/fedora-review-check +install -D -p -m 755 %{SOURCE1} \ + %{buildroot}%{_datadir}/%{name}/fedora-review-check %check @@ -189,7 +189,9 @@ install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/fedora- %files %license *LICENSE -%doc README.* +%doc *md +%doc docs +%doc examples %doc composer.json %doc vendor/composer/installed.json %{_bindir}/phpcompatinfo @@ -198,6 +200,11 @@ install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/fedora- %changelog +* Thu Jan 18 2024 Remi Collet - 7.1.1-1 +- update to 7.1.1 +- cleanup installation tree +- move docs and examples in package documentation + * Tue Jan 2 2024 Remi Collet - 7.1.0-1 - update to 7.1.0 diff --git a/sources b/sources index c51abcf..06ddd7e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-7.1.0-26b0219.tgz) = 59b790ba5c12e22c0d9db18fe7bae4e3dde3ff142464825cc6a165f1b3ace0e64609e6fd306d74d18005e3f566cce9747b69a023835129ae690ed901fe0197f5 +SHA512 (php-bartlett-PHP-CompatInfo-7.1.1-d9504f5.tgz) = 92b8b768f49d76c6fc0b5a21cc44f2185ebe7cca1a525aa590ecf95d6a65e4cc305085cb6a877a71ca2008134319fd4ddabfa98d8eaf3cd97198db9257a73b9b From 818b4b858877ca31db4a7b2b9cd036405f9076af Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 20:42:57 +0000 Subject: [PATCH 098/111] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-bartlett-PHP-CompatInfo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 4238362..d4bfc86 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -22,7 +22,7 @@ Name: php-bartlett-PHP-CompatInfo Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Find out version and the extensions required for a piece of code to run # SPDX: see bundled libraries list below @@ -200,6 +200,9 @@ install -D -p -m 755 %{SOURCE1} \ %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 7.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jan 18 2024 Remi Collet - 7.1.1-1 - update to 7.1.1 - cleanup installation tree From b06f7dd0a801e4632b88af9aa0938aa9f773f0a1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 22:29:02 +0000 Subject: [PATCH 099/111] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-bartlett-PHP-CompatInfo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index d4bfc86..0fa638f 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -22,7 +22,7 @@ Name: php-bartlett-PHP-CompatInfo Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Find out version and the extensions required for a piece of code to run # SPDX: see bundled libraries list below @@ -200,6 +200,9 @@ install -D -p -m 755 %{SOURCE1} \ %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 7.1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 7.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From fd6eabf939d7329579777bdfff9ff0348cdce44a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 8 Feb 2024 09:33:55 +0100 Subject: [PATCH 100/111] update to 7.1.2 update bundled bartlett/php-compatinfo-db to 6.2.1 --- .gitignore | 1 + makesrc.sh | 5 ++- php-bartlett-PHP-CompatInfo.spec | 67 +++++++++++++++++--------------- sources | 2 +- 4 files changed, 41 insertions(+), 34 deletions(-) diff --git a/.gitignore b/.gitignore index a96af03..55b2ab4 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,4 @@ clog /php-bartlett-PHP-CompatInfo-7.0.2-cff8a7a.tgz /php-bartlett-PHP-CompatInfo-7.1.0-26b0219.tgz /php-bartlett-PHP-CompatInfo-7.1.1-d9504f5.tgz +/php-bartlett-PHP-CompatInfo-7.1.2-072d0f8.tgz diff --git a/makesrc.sh b/makesrc.sh index c3a64e2..a2d4c80 100755 --- a/makesrc.sh +++ b/makesrc.sh @@ -1,17 +1,20 @@ #!/bin/bash NAME=$(basename $PWD) +DATE=$(sed -n '/^%global gh_date/{s/.* //;p}' $NAME.spec) OWNER=$(sed -n '/^%global gh_owner/{s/.* //;p}' $NAME.spec) PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec) VERSION=$(sed -n '/^%global upstream_version/{s/.* //;p}' $NAME.spec) COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec) SHORT=${COMMIT:0:7} +DATE=$(date -d "$DATE -4 days" +%Y-%m-%d) + echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION, Commit=$COMMIT\n" echo "Cloning..." rm -rf $HOME/.cache/bartlett -git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT +git clone --shallow-since=$DATE https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT echo "Getting commit..." pushd $PROJECT-$COMMIT diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 0fa638f..3817f2d 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -1,28 +1,27 @@ # remirepo/fedora spec file for php-bartlett-PHP-CompatInfo # -# Copyright (c) 2011-2023 Remi Collet +# Copyright (c) 2011-2024 Remi Collet # License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -# For compatibility with SCL %undefine __brp_mangle_shebangs %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit d9504f525abfbdb8fc7d7850cbd58229471526ba +%global gh_commit 072d0f8637341f880b6844cd50d2c2c9918a69b2 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -#global gh_date 20151005 +%global gh_date 2024-02-08 %global gh_owner llaville %global gh_project php-compatinfo -%global upstream_version 7.1.1 +%global upstream_version 7.1.2 #global upstream_prever RC1 Name: php-bartlett-PHP-CompatInfo Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 3%{?dist} +Release: 1%{?dist} Summary: Find out version and the extensions required for a piece of code to run # SPDX: see bundled libraries list below @@ -57,7 +56,7 @@ Requires: php-xmlreader # Bundled libraries # License BSD-3-Clause -Provides: bundled(php-bartlett-php-compatinfo-db) = 6.1.1 +Provides: bundled(php-bartlett-php-compatinfo-db) = 6.2.1 Provides: bundled(php-nikic-php-parser) = v5.0.0 # License MIT Provides: bundled(php-bartlett-sarif-php-sdk) = 1.1.0 @@ -66,13 +65,13 @@ Provides: bundled(php-composer-semver) = 3.4.0 Provides: bundled(php-doctrine-cache) = 2.2.0 Provides: bundled(php-doctrine-collections) = 1.8.0 Provides: bundled(php-doctrine-common) = 3.4.3 -Provides: bundled(php-doctrine-dbal) = 3.7.2 -Provides: bundled(php-doctrine-deprecations) = 1.1.2 +Provides: bundled(php-doctrine-dbal) = 3.8.1 +Provides: bundled(php-doctrine-deprecations) = 1.1.3 Provides: bundled(php-doctrine-event-manager) = 2.0.0 Provides: bundled(php-doctrine-inflector) = 2.0.9 Provides: bundled(php-doctrine-instantiator) = 2.0.0 -Provides: bundled(php-doctrine-lexer) = 2.1.0 -Provides: bundled(php-doctrine-orm) = 2.17.3 +Provides: bundled(php-doctrine-lexer) = 3.0.1 +Provides: bundled(php-doctrine-orm) = 2.18.0 Provides: bundled(php-doctrine-persistence) = 3.2.0 Provides: bundled(php-psr-cache) = 3.0.0 Provides: bundled(php-psr-clock) = 1.0.0 @@ -81,34 +80,34 @@ Provides: bundled(php-psr-event-dispatcher) = 1.0.0 Provides: bundled(php-psr-log) = 3.0.0 Provides: bundled(php-ramsey-collection) = 2.0.0 Provides: bundled(php-ramsey-uuid) = 4.7.5 -Provides: bundled(php-symfony-cache) = v6.4.2 +Provides: bundled(php-symfony-cache) = v6.4.3 Provides: bundled(php-symfony-cache-contracts) = v3.4.0 -Provides: bundled(php-symfony-clock) = v6.4.2 -Provides: bundled(php-symfony-config) = v6.4.0 -Provides: bundled(php-symfony-console) = v6.4.2 -Provides: bundled(php-symfony-dependency-injection) = v6.4.2 +Provides: bundled(php-symfony-clock) = v6.4.3 +Provides: bundled(php-symfony-config) = v6.4.3 +Provides: bundled(php-symfony-console) = v6.4.3 +Provides: bundled(php-symfony-dependency-injection) = v6.4.3 Provides: bundled(php-symfony-deprecation-contracts) = v3.4.0 -Provides: bundled(php-symfony-event-dispatcher) = v6.4.2 +Provides: bundled(php-symfony-event-dispatcher) = v6.4.3 Provides: bundled(php-symfony-event-dispatcher-contracts) = v3.4.0 -Provides: bundled(php-symfony-filesystem) = v6.4.0 +Provides: bundled(php-symfony-filesystem) = v6.4.3 Provides: bundled(php-symfony-finder) = v6.4.0 -Provides: bundled(php-symfony-http-client) = v6.4.2 +Provides: bundled(php-symfony-http-client) = v6.4.3 Provides: bundled(php-symfony-http-client-contracts) = v3.4.0 -Provides: bundled(php-symfony-messenger) = v6.4.0 -Provides: bundled(php-symfony-polyfill-ctype) = v1.28.0 -Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.28.0 -Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.28.0 -Provides: bundled(php-symfony-polyfill-mbstring) = v1.28.0 -Provides: bundled(php-symfony-polyfill-php72) = v1.28.0 -Provides: bundled(php-symfony-polyfill-php80) = v1.28.0 -Provides: bundled(php-symfony-polyfill-php83) = v1.28.0 -Provides: bundled(php-symfony-process) = v6.4.2 +Provides: bundled(php-symfony-messenger) = v6.4.3 +Provides: bundled(php-symfony-polyfill-ctype) = v1.29.0 +Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.29.0 +Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.29.0 +Provides: bundled(php-symfony-polyfill-mbstring) = v1.29.0 +Provides: bundled(php-symfony-polyfill-php72) = v1.29.0 +Provides: bundled(php-symfony-polyfill-php80) = v1.29.0 +Provides: bundled(php-symfony-polyfill-php83) = v1.29.0 +Provides: bundled(php-symfony-process) = v6.4.3 Provides: bundled(php-symfony-requirements-checker) = v2.0.1 -Provides: bundled(php-symfony-serializer) = v6.4.2 +Provides: bundled(php-symfony-serializer) = v6.4.3 Provides: bundled(php-symfony-service-contracts) = v3.4.1 -Provides: bundled(php-symfony-stopwatch) = v6.4.0 -Provides: bundled(php-symfony-string) = v6.4.2 -Provides: bundled(php-symfony-var-exporter) = v6.4.2 +Provides: bundled(php-symfony-stopwatch) = v6.4.3 +Provides: bundled(php-symfony-string) = v6.4.3 +Provides: bundled(php-symfony-var-exporter) = v6.4.3 Provides: phpcompatinfo = %{version} Provides: php-composer(bartlett/php-compatinfo) = %{version} @@ -200,6 +199,10 @@ install -D -p -m 755 %{SOURCE1} \ %changelog +* Thu Feb 8 2024 Remi Collet - 7.1.2-1 +- update to 7.1.2 +- update bundled bartlett/php-compatinfo-db to 6.2.1 + * Thu Jan 25 2024 Fedora Release Engineering - 7.1.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 06ddd7e..797a3b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-7.1.1-d9504f5.tgz) = 92b8b768f49d76c6fc0b5a21cc44f2185ebe7cca1a525aa590ecf95d6a65e4cc305085cb6a877a71ca2008134319fd4ddabfa98d8eaf3cd97198db9257a73b9b +SHA512 (php-bartlett-PHP-CompatInfo-7.1.2-072d0f8.tgz) = 62727a2675eb3045013278c13805d82173500b2b46a33fb9f81047e6108f55cca2348ac4795a85e67e086b9c531991e2b7e6fcc9ea791da31505fcf95840d991 From 0830fa1dd912221284fcbc8e42a10b5f6f42ccd8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 19 Mar 2024 14:53:21 +0100 Subject: [PATCH 101/111] update to 7.1.3 update bundled bartlett/php-compatinfo-db to 6.4.2 --- .gitignore | 1 + php-bartlett-PHP-CompatInfo.spec | 45 +++++++++++++++++--------------- sources | 2 +- 3 files changed, 26 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 55b2ab4..38a24ee 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,4 @@ clog /php-bartlett-PHP-CompatInfo-7.1.0-26b0219.tgz /php-bartlett-PHP-CompatInfo-7.1.1-d9504f5.tgz /php-bartlett-PHP-CompatInfo-7.1.2-072d0f8.tgz +/php-bartlett-PHP-CompatInfo-7.1.3-7a74bd0.tgz diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 3817f2d..8017975 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -7,16 +7,15 @@ # Please, preserve the changelog entries # -%undefine __brp_mangle_shebangs %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit 072d0f8637341f880b6844cd50d2c2c9918a69b2 +%global gh_commit 7a74bd0ad8fda76930c23ebc180cd6ca190c7a19 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2024-02-08 +%global gh_date 2024-03-19 %global gh_owner llaville %global gh_project php-compatinfo -%global upstream_version 7.1.2 +%global upstream_version 7.1.3 #global upstream_prever RC1 Name: php-bartlett-PHP-CompatInfo @@ -56,8 +55,8 @@ Requires: php-xmlreader # Bundled libraries # License BSD-3-Clause -Provides: bundled(php-bartlett-php-compatinfo-db) = 6.2.1 -Provides: bundled(php-nikic-php-parser) = v5.0.0 +Provides: bundled(php-bartlett-php-compatinfo-db) = 6.4.2 +Provides: bundled(php-nikic-php-parser) = v5.0.2 # License MIT Provides: bundled(php-bartlett-sarif-php-sdk) = 1.1.0 Provides: bundled(php-brick-math) = 0.11.0 @@ -65,14 +64,14 @@ Provides: bundled(php-composer-semver) = 3.4.0 Provides: bundled(php-doctrine-cache) = 2.2.0 Provides: bundled(php-doctrine-collections) = 1.8.0 Provides: bundled(php-doctrine-common) = 3.4.3 -Provides: bundled(php-doctrine-dbal) = 3.8.1 +Provides: bundled(php-doctrine-dbal) = 3.8.3 Provides: bundled(php-doctrine-deprecations) = 1.1.3 Provides: bundled(php-doctrine-event-manager) = 2.0.0 -Provides: bundled(php-doctrine-inflector) = 2.0.9 +Provides: bundled(php-doctrine-inflector) = 2.0.10 Provides: bundled(php-doctrine-instantiator) = 2.0.0 Provides: bundled(php-doctrine-lexer) = 3.0.1 -Provides: bundled(php-doctrine-orm) = 2.18.0 -Provides: bundled(php-doctrine-persistence) = 3.2.0 +Provides: bundled(php-doctrine-orm) = 2.19.2 +Provides: bundled(php-doctrine-persistence) = 3.3.2 Provides: bundled(php-psr-cache) = 3.0.0 Provides: bundled(php-psr-clock) = 1.0.0 Provides: bundled(php-psr-container) = 2.0.2 @@ -80,20 +79,20 @@ Provides: bundled(php-psr-event-dispatcher) = 1.0.0 Provides: bundled(php-psr-log) = 3.0.0 Provides: bundled(php-ramsey-collection) = 2.0.0 Provides: bundled(php-ramsey-uuid) = 4.7.5 -Provides: bundled(php-symfony-cache) = v6.4.3 +Provides: bundled(php-symfony-cache) = v6.4.4 Provides: bundled(php-symfony-cache-contracts) = v3.4.0 -Provides: bundled(php-symfony-clock) = v6.4.3 -Provides: bundled(php-symfony-config) = v6.4.3 -Provides: bundled(php-symfony-console) = v6.4.3 -Provides: bundled(php-symfony-dependency-injection) = v6.4.3 +Provides: bundled(php-symfony-clock) = v6.4.5 +Provides: bundled(php-symfony-config) = v6.4.4 +Provides: bundled(php-symfony-console) = v6.4.4 +Provides: bundled(php-symfony-dependency-injection) = v6.4.4 Provides: bundled(php-symfony-deprecation-contracts) = v3.4.0 Provides: bundled(php-symfony-event-dispatcher) = v6.4.3 Provides: bundled(php-symfony-event-dispatcher-contracts) = v3.4.0 Provides: bundled(php-symfony-filesystem) = v6.4.3 Provides: bundled(php-symfony-finder) = v6.4.0 -Provides: bundled(php-symfony-http-client) = v6.4.3 +Provides: bundled(php-symfony-http-client) = v6.4.5 Provides: bundled(php-symfony-http-client-contracts) = v3.4.0 -Provides: bundled(php-symfony-messenger) = v6.4.3 +Provides: bundled(php-symfony-messenger) = v6.4.4 Provides: bundled(php-symfony-polyfill-ctype) = v1.29.0 Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.29.0 Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.29.0 @@ -101,13 +100,13 @@ Provides: bundled(php-symfony-polyfill-mbstring) = v1.29.0 Provides: bundled(php-symfony-polyfill-php72) = v1.29.0 Provides: bundled(php-symfony-polyfill-php80) = v1.29.0 Provides: bundled(php-symfony-polyfill-php83) = v1.29.0 -Provides: bundled(php-symfony-process) = v6.4.3 +Provides: bundled(php-symfony-process) = v6.4.4 Provides: bundled(php-symfony-requirements-checker) = v2.0.1 -Provides: bundled(php-symfony-serializer) = v6.4.3 +Provides: bundled(php-symfony-serializer) = v6.4.4 Provides: bundled(php-symfony-service-contracts) = v3.4.1 Provides: bundled(php-symfony-stopwatch) = v6.4.3 -Provides: bundled(php-symfony-string) = v6.4.3 -Provides: bundled(php-symfony-var-exporter) = v6.4.3 +Provides: bundled(php-symfony-string) = v6.4.4 +Provides: bundled(php-symfony-var-exporter) = v6.4.4 Provides: phpcompatinfo = %{version} Provides: php-composer(bartlett/php-compatinfo) = %{version} @@ -199,6 +198,10 @@ install -D -p -m 755 %{SOURCE1} \ %changelog +* Tue Mar 19 2024 Remi Collet - 7.1.3-1 +- update to 7.1.3 +- update bundled bartlett/php-compatinfo-db to 6.4.2 + * Thu Feb 8 2024 Remi Collet - 7.1.2-1 - update to 7.1.2 - update bundled bartlett/php-compatinfo-db to 6.2.1 diff --git a/sources b/sources index 797a3b4..f062268 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-7.1.2-072d0f8.tgz) = 62727a2675eb3045013278c13805d82173500b2b46a33fb9f81047e6108f55cca2348ac4795a85e67e086b9c531991e2b7e6fcc9ea791da31505fcf95840d991 +SHA512 (php-bartlett-PHP-CompatInfo-7.1.3-7a74bd0.tgz) = ae8fc6d18d7d2038f3d9cf3fab4722f3a91987118b546a0f09272dba5e48ada47559d915139a37f4e2b8d901937ba5afba41b92da2030081e86bf81796f21be3 From 7316e1d9f0bea1a5f96124c100f5e604f2915960 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 24 Apr 2024 10:44:13 +0200 Subject: [PATCH 102/111] update to 7.1.4 update bundled bartlett/php-compatinfo-db to 6.5.0 --- .gitignore | 1 + php-bartlett-PHP-CompatInfo.spec | 42 +++++++++++++++++--------------- sources | 2 +- 3 files changed, 25 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 38a24ee..7626a63 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,4 @@ clog /php-bartlett-PHP-CompatInfo-7.1.1-d9504f5.tgz /php-bartlett-PHP-CompatInfo-7.1.2-072d0f8.tgz /php-bartlett-PHP-CompatInfo-7.1.3-7a74bd0.tgz +/php-bartlett-PHP-CompatInfo-7.1.4-9875282.tgz diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 8017975..8a4d74f 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -9,13 +9,13 @@ %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit 7a74bd0ad8fda76930c23ebc180cd6ca190c7a19 +%global gh_commit 9875282a35266aa2b66416303c06edcd70fc50a1 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2024-03-19 +%global gh_date 2024-04-24 %global gh_owner llaville %global gh_project php-compatinfo -%global upstream_version 7.1.3 +%global upstream_version 7.1.4 #global upstream_prever RC1 Name: php-bartlett-PHP-CompatInfo @@ -55,7 +55,7 @@ Requires: php-xmlreader # Bundled libraries # License BSD-3-Clause -Provides: bundled(php-bartlett-php-compatinfo-db) = 6.4.2 +Provides: bundled(php-bartlett-php-compatinfo-db) = 6.5.0 Provides: bundled(php-nikic-php-parser) = v5.0.2 # License MIT Provides: bundled(php-bartlett-sarif-php-sdk) = 1.1.0 @@ -63,14 +63,14 @@ Provides: bundled(php-brick-math) = 0.11.0 Provides: bundled(php-composer-semver) = 3.4.0 Provides: bundled(php-doctrine-cache) = 2.2.0 Provides: bundled(php-doctrine-collections) = 1.8.0 -Provides: bundled(php-doctrine-common) = 3.4.3 +Provides: bundled(php-doctrine-common) = 3.4.4 Provides: bundled(php-doctrine-dbal) = 3.8.3 Provides: bundled(php-doctrine-deprecations) = 1.1.3 Provides: bundled(php-doctrine-event-manager) = 2.0.0 Provides: bundled(php-doctrine-inflector) = 2.0.10 Provides: bundled(php-doctrine-instantiator) = 2.0.0 Provides: bundled(php-doctrine-lexer) = 3.0.1 -Provides: bundled(php-doctrine-orm) = 2.19.2 +Provides: bundled(php-doctrine-orm) = 2.19.4 Provides: bundled(php-doctrine-persistence) = 3.3.2 Provides: bundled(php-psr-cache) = 3.0.0 Provides: bundled(php-psr-clock) = 1.0.0 @@ -79,20 +79,20 @@ Provides: bundled(php-psr-event-dispatcher) = 1.0.0 Provides: bundled(php-psr-log) = 3.0.0 Provides: bundled(php-ramsey-collection) = 2.0.0 Provides: bundled(php-ramsey-uuid) = 4.7.5 -Provides: bundled(php-symfony-cache) = v6.4.4 -Provides: bundled(php-symfony-cache-contracts) = v3.4.0 +Provides: bundled(php-symfony-cache) = v6.4.6 +Provides: bundled(php-symfony-cache-contracts) = v3.4.2 Provides: bundled(php-symfony-clock) = v6.4.5 -Provides: bundled(php-symfony-config) = v6.4.4 -Provides: bundled(php-symfony-console) = v6.4.4 -Provides: bundled(php-symfony-dependency-injection) = v6.4.4 +Provides: bundled(php-symfony-config) = v6.4.6 +Provides: bundled(php-symfony-console) = v6.4.6 +Provides: bundled(php-symfony-dependency-injection) = v6.4.6 Provides: bundled(php-symfony-deprecation-contracts) = v3.4.0 Provides: bundled(php-symfony-event-dispatcher) = v6.4.3 -Provides: bundled(php-symfony-event-dispatcher-contracts) = v3.4.0 -Provides: bundled(php-symfony-filesystem) = v6.4.3 +Provides: bundled(php-symfony-event-dispatcher-contracts) = v3.4.2 +Provides: bundled(php-symfony-filesystem) = v6.4.6 Provides: bundled(php-symfony-finder) = v6.4.0 -Provides: bundled(php-symfony-http-client) = v6.4.5 -Provides: bundled(php-symfony-http-client-contracts) = v3.4.0 -Provides: bundled(php-symfony-messenger) = v6.4.4 +Provides: bundled(php-symfony-http-client) = v6.4.6 +Provides: bundled(php-symfony-http-client-contracts) = v3.4.2 +Provides: bundled(php-symfony-messenger) = v6.4.6 Provides: bundled(php-symfony-polyfill-ctype) = v1.29.0 Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.29.0 Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.29.0 @@ -102,11 +102,11 @@ Provides: bundled(php-symfony-polyfill-php80) = v1.29.0 Provides: bundled(php-symfony-polyfill-php83) = v1.29.0 Provides: bundled(php-symfony-process) = v6.4.4 Provides: bundled(php-symfony-requirements-checker) = v2.0.1 -Provides: bundled(php-symfony-serializer) = v6.4.4 -Provides: bundled(php-symfony-service-contracts) = v3.4.1 +Provides: bundled(php-symfony-serializer) = v6.4.6 +Provides: bundled(php-symfony-service-contracts) = v3.4.2 Provides: bundled(php-symfony-stopwatch) = v6.4.3 Provides: bundled(php-symfony-string) = v6.4.4 -Provides: bundled(php-symfony-var-exporter) = v6.4.4 +Provides: bundled(php-symfony-var-exporter) = v6.4.6 Provides: phpcompatinfo = %{version} Provides: php-composer(bartlett/php-compatinfo) = %{version} @@ -198,6 +198,10 @@ install -D -p -m 755 %{SOURCE1} \ %changelog +* Wed Apr 24 2024 Remi Collet - 7.1.4-1 +- update to 7.1.4 +- update bundled bartlett/php-compatinfo-db to 6.5.0 + * Tue Mar 19 2024 Remi Collet - 7.1.3-1 - update to 7.1.3 - update bundled bartlett/php-compatinfo-db to 6.4.2 diff --git a/sources b/sources index f062268..6ac91b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-7.1.3-7a74bd0.tgz) = ae8fc6d18d7d2038f3d9cf3fab4722f3a91987118b546a0f09272dba5e48ada47559d915139a37f4e2b8d901937ba5afba41b92da2030081e86bf81796f21be3 +SHA512 (php-bartlett-PHP-CompatInfo-7.1.4-9875282.tgz) = edceb0829fcded8326aeaed43ccee63aba3a23b69b540fdbfba060be3b79fae149832ed375efae38c313b23d67ca67da3498464b0a21a6630f4b5f0dbbf287e4 From f7faecf0660da8d402602b0ca6369d1b37c96d0b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 06:45:25 +0000 Subject: [PATCH 103/111] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- php-bartlett-PHP-CompatInfo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 8a4d74f..08056c1 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -20,7 +20,7 @@ Name: php-bartlett-PHP-CompatInfo Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Find out version and the extensions required for a piece of code to run # SPDX: see bundled libraries list below @@ -198,6 +198,9 @@ install -D -p -m 755 %{SOURCE1} \ %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 7.1.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Apr 24 2024 Remi Collet - 7.1.4-1 - update to 7.1.4 - update bundled bartlett/php-compatinfo-db to 6.5.0 From ae67202b89d9c1f2897c36e19ba642fb4317cdfc Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 7 Nov 2024 09:04:09 +0100 Subject: [PATCH 104/111] update bundled bartlett/php-compatinfo-db to 6.12.0 update bundled dependencies optional support build with composer-generators --- php-bartlett-PHP-CompatInfo.spec | 124 +++++++++++++++++-------------- 1 file changed, 70 insertions(+), 54 deletions(-) diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 08056c1..1b0c3b2 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -8,6 +8,8 @@ # +%bcond_with generators + %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} %global gh_commit 9875282a35266aa2b66416303c06edcd70fc50a1 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) @@ -20,7 +22,7 @@ Name: php-bartlett-PHP-CompatInfo Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Find out version and the extensions required for a piece of code to run # SPDX: see bundled libraries list below @@ -39,6 +41,9 @@ BuildArch: noarch BuildRequires: php(language) >= 8.1 BuildRequires: php-cli BuildRequires: php-json +%if %{with generators} +BuildRequires: composer-generators +%endif Requires: php(language) >= 8.1 Requires: php-cli @@ -53,63 +58,66 @@ Requires: php-simplexml Requires: php-spl Requires: php-xmlreader +%if %{without generators} # Bundled libraries # License BSD-3-Clause -Provides: bundled(php-bartlett-php-compatinfo-db) = 6.5.0 -Provides: bundled(php-nikic-php-parser) = v5.0.2 +Provides: bundled(php-composer(bartlett/php-compatinfo-db)) = 6.12.0 +Provides: bundled(php-composer(nikic/php-parser)) = v5.3.1 # License MIT -Provides: bundled(php-bartlett-sarif-php-sdk) = 1.1.0 -Provides: bundled(php-brick-math) = 0.11.0 -Provides: bundled(php-composer-semver) = 3.4.0 -Provides: bundled(php-doctrine-cache) = 2.2.0 -Provides: bundled(php-doctrine-collections) = 1.8.0 -Provides: bundled(php-doctrine-common) = 3.4.4 -Provides: bundled(php-doctrine-dbal) = 3.8.3 -Provides: bundled(php-doctrine-deprecations) = 1.1.3 -Provides: bundled(php-doctrine-event-manager) = 2.0.0 -Provides: bundled(php-doctrine-inflector) = 2.0.10 -Provides: bundled(php-doctrine-instantiator) = 2.0.0 -Provides: bundled(php-doctrine-lexer) = 3.0.1 -Provides: bundled(php-doctrine-orm) = 2.19.4 -Provides: bundled(php-doctrine-persistence) = 3.3.2 -Provides: bundled(php-psr-cache) = 3.0.0 -Provides: bundled(php-psr-clock) = 1.0.0 -Provides: bundled(php-psr-container) = 2.0.2 -Provides: bundled(php-psr-event-dispatcher) = 1.0.0 -Provides: bundled(php-psr-log) = 3.0.0 -Provides: bundled(php-ramsey-collection) = 2.0.0 -Provides: bundled(php-ramsey-uuid) = 4.7.5 -Provides: bundled(php-symfony-cache) = v6.4.6 -Provides: bundled(php-symfony-cache-contracts) = v3.4.2 -Provides: bundled(php-symfony-clock) = v6.4.5 -Provides: bundled(php-symfony-config) = v6.4.6 -Provides: bundled(php-symfony-console) = v6.4.6 -Provides: bundled(php-symfony-dependency-injection) = v6.4.6 -Provides: bundled(php-symfony-deprecation-contracts) = v3.4.0 -Provides: bundled(php-symfony-event-dispatcher) = v6.4.3 -Provides: bundled(php-symfony-event-dispatcher-contracts) = v3.4.2 -Provides: bundled(php-symfony-filesystem) = v6.4.6 -Provides: bundled(php-symfony-finder) = v6.4.0 -Provides: bundled(php-symfony-http-client) = v6.4.6 -Provides: bundled(php-symfony-http-client-contracts) = v3.4.2 -Provides: bundled(php-symfony-messenger) = v6.4.6 -Provides: bundled(php-symfony-polyfill-ctype) = v1.29.0 -Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.29.0 -Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.29.0 -Provides: bundled(php-symfony-polyfill-mbstring) = v1.29.0 -Provides: bundled(php-symfony-polyfill-php72) = v1.29.0 -Provides: bundled(php-symfony-polyfill-php80) = v1.29.0 -Provides: bundled(php-symfony-polyfill-php83) = v1.29.0 -Provides: bundled(php-symfony-process) = v6.4.4 -Provides: bundled(php-symfony-requirements-checker) = v2.0.1 -Provides: bundled(php-symfony-serializer) = v6.4.6 -Provides: bundled(php-symfony-service-contracts) = v3.4.2 -Provides: bundled(php-symfony-stopwatch) = v6.4.3 -Provides: bundled(php-symfony-string) = v6.4.4 -Provides: bundled(php-symfony-var-exporter) = v6.4.6 +Provides: bundled(php-composer(bartlett/sarif-php-sdk)) = 1.5.0 +Provides: bundled(php-composer(brick/math)) = 0.12.1 +Provides: bundled(php-composer(composer/semver)) = 3.4.3 +Provides: bundled(php-composer(doctrine/cache)) = 2.2.0 +Provides: bundled(php-composer(doctrine/collections)) = 1.8.0 +Provides: bundled(php-composer(doctrine/common)) = 3.4.5 +Provides: bundled(php-composer(doctrine/dbal)) = 3.9.3 +Provides: bundled(php-composer(doctrine/deprecations)) = 1.1.3 +Provides: bundled(php-composer(doctrine/event-manager)) = 2.0.1 +Provides: bundled(php-composer(doctrine/inflector)) = 2.0.10 +Provides: bundled(php-composer(doctrine/instantiator)) = 2.0.0 +Provides: bundled(php-composer(doctrine/lexer)) = 3.0.1 +Provides: bundled(php-composer(doctrine/orm)) = 2.20.0 +Provides: bundled(php-composer(doctrine/persistence)) = 3.4.0 +Provides: bundled(php-composer(psr/cache)) = 3.0.0 +Provides: bundled(php-composer(psr/clock)) = 1.0.0 +Provides: bundled(php-composer(psr/container)) = 2.0.2 +Provides: bundled(php-composer(psr/event-dispatcher)) = 1.0.0 +Provides: bundled(php-composer(psr/log)) = 3.0.2 +Provides: bundled(php-composer(ramsey/collection)) = 2.0.0 +Provides: bundled(php-composer(ramsey/uuid)) = 4.7.6 +Provides: bundled(php-composer(symfony/cache)) = v6.4.14 +Provides: bundled(php-composer(symfony/cache-contracts)) = v3.5.0 +Provides: bundled(php-composer(symfony/clock)) = v6.4.13 +Provides: bundled(php-composer(symfony/config)) = v6.4.14 +Provides: bundled(php-composer(symfony/console)) = v6.4.14 +Provides: bundled(php-composer(symfony/dependency-injection)) = v6.4.13 +Provides: bundled(php-composer(symfony/deprecation-contracts)) = v3.5.0 +Provides: bundled(php-composer(symfony/event-dispatcher)) = v6.4.13 +Provides: bundled(php-composer(symfony/event-dispatcher-contracts)) = v3.5.0 +Provides: bundled(php-composer(symfony/filesystem)) = v6.4.13 +Provides: bundled(php-composer(symfony/finder)) = v6.4.13 +Provides: bundled(php-composer(symfony/http-client)) = v6.4.14 +Provides: bundled(php-composer(symfony/http-client-contracts)) = v3.5.0 +Provides: bundled(php-composer(symfony/messenger)) = v6.4.13 +Provides: bundled(php-composer(symfony/polyfill-ctype)) = v1.31.0 +Provides: bundled(php-composer(symfony/polyfill-intl-grapheme)) = v1.31.0 +Provides: bundled(php-composer(symfony/polyfill-intl-normalizer)) = v1.31.0 +Provides: bundled(php-composer(symfony/polyfill-mbstring)) = v1.31.0 +Provides: bundled(php-composer(symfony/polyfill-php72)) = v1.31.0 +Provides: bundled(php-composer(symfony/polyfill-php80)) = v1.31.0 +Provides: bundled(php-composer(symfony/polyfill-php83)) = v1.31.0 +Provides: bundled(php-composer(symfony/polyfill-php84)) = v1.31.0 +Provides: bundled(php-composer(symfony/process)) = v6.4.14 +Provides: bundled(php-composer(symfony/requirements-checker)) = v2.0.1 +Provides: bundled(php-composer(symfony/serializer)) = v6.4.13 +Provides: bundled(php-composer(symfony/service-contracts)) = v3.5.0 +Provides: bundled(php-composer(symfony/stopwatch)) = v6.4.13 +Provides: bundled(php-composer(symfony/string)) = v6.4.13 +Provides: bundled(php-composer(symfony/var-exporter)) = v6.4.13 -Provides: phpcompatinfo = %{version} Provides: php-composer(bartlett/php-compatinfo) = %{version} +%endif +Provides: phpcompatinfo = %{version} %description @@ -140,6 +148,7 @@ done rm -r vendor/bartlett/*/.github rm -r vendor/bartlett/*/.changes +%if %{without generators} : List bundled libraries and Licenses php -r ' $pkgs = file_get_contents("vendor/composer/installed.json"); @@ -152,13 +161,15 @@ php -r ' foreach($pkgs["packages"] as $pkg) { $lic = implode(" and ", $pkg["license"]); if (!isset($res[$lic])) $res[$lic] = []; - $res[$lic][] = sprintf("Provides: bundled(php-%s) = %s", str_replace(["/", "_"], ["-", "-"], $pkg["name"]), $pkg["version"]); + $res[$lic][] = sprintf("Provides: bundled(php-composer(%s)) = %s", $pkg["name"], $pkg["version"]); } foreach($res as $lic => $lib) { sort($lib); printf("# License %s\n%s\n", $lic, implode("\n", $lib)); } ' +%endif + %build # Nothing @@ -198,6 +209,11 @@ install -D -p -m 755 %{SOURCE1} \ %changelog +* Thu Nov 7 2024 Remi Collet - 7.1.4-3 +- update bundled bartlett/php-compatinfo-db to 6.12.0 +- update bundled dependencies +- optional support build with composer-generators + * Fri Jul 19 2024 Fedora Release Engineering - 7.1.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 8274c89783f7f82af72e0b581bc3abfd409f6ad6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 7 Nov 2024 09:12:00 +0100 Subject: [PATCH 105/111] refreshed sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 6ac91b9..003e67e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-7.1.4-9875282.tgz) = edceb0829fcded8326aeaed43ccee63aba3a23b69b540fdbfba060be3b79fae149832ed375efae38c313b23d67ca67da3498464b0a21a6630f4b5f0dbbf287e4 +SHA512 (php-bartlett-PHP-CompatInfo-7.1.4-9875282.tgz) = fda8cebf9471cb7c49b91137a89e8b051e447d13dad14b1b8b19854f83ab049b53cb21dd965febb21832135dc7f4e79197efe68fe11fdb48e2d8387fe8a22c19 From e51304d5a1665242886584856a088996e3520acb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 7 Nov 2024 09:43:07 +0100 Subject: [PATCH 106/111] hack for PHP 8.4 --- php-bartlett-PHP-CompatInfo.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 1b0c3b2..3df8300 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -22,7 +22,7 @@ Name: php-bartlett-PHP-CompatInfo Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 3%{?dist} +Release: 4%{?dist} Summary: Find out version and the extensions required for a piece of code to run # SPDX: see bundled libraries list below @@ -148,6 +148,9 @@ done rm -r vendor/bartlett/*/.github rm -r vendor/bartlett/*/.changes +: Hack for PHP 8.4 +sed -e '/php83/d;s/php82/php83/' config/set/up-to-php83.php | tee config/set/up-to-php84.php + %if %{without generators} : List bundled libraries and Licenses php -r ' @@ -209,6 +212,9 @@ install -D -p -m 755 %{SOURCE1} \ %changelog +* Thu Nov 7 2024 Remi Collet - 7.1.4-4 +- hack for PHP 8.4 + * Thu Nov 7 2024 Remi Collet - 7.1.4-3 - update bundled bartlett/php-compatinfo-db to 6.12.0 - update bundled dependencies From f17278ece3b8fac93accdeb56e440798426bb2dd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 08:56:09 +0000 Subject: [PATCH 107/111] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- php-bartlett-PHP-CompatInfo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 3df8300..b2f87da 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -22,7 +22,7 @@ Name: php-bartlett-PHP-CompatInfo Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 4%{?dist} +Release: 5%{?dist} Summary: Find out version and the extensions required for a piece of code to run # SPDX: see bundled libraries list below @@ -212,6 +212,9 @@ install -D -p -m 755 %{SOURCE1} \ %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 7.1.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Nov 7 2024 Remi Collet - 7.1.4-4 - hack for PHP 8.4 From 788b91ce6da17d14e0053c3edfbeaef5261568c0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 5 May 2025 07:32:48 +0200 Subject: [PATCH 108/111] update to 7.2.3 re-license spec file to CECILL-2.1 always build with composer-generators update bundled bartlett/php-compatinfo-db to 6.16.0 --- .gitignore | 1 + ...hp-bartlett-PHP-CompatInfo-7.2.3-rpm.patch | 8 +- php-bartlett-PHP-CompatInfo.spec | 112 +++--------------- sources | 2 +- 4 files changed, 21 insertions(+), 102 deletions(-) rename php-bartlett-PHP-CompatInfo-6.0.0-rpm.patch => php-bartlett-PHP-CompatInfo-7.2.3-rpm.patch (51%) diff --git a/.gitignore b/.gitignore index 7626a63..002d70f 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,4 @@ clog /php-bartlett-PHP-CompatInfo-7.1.2-072d0f8.tgz /php-bartlett-PHP-CompatInfo-7.1.3-7a74bd0.tgz /php-bartlett-PHP-CompatInfo-7.1.4-9875282.tgz +/php-bartlett-PHP-CompatInfo-7.2.3-25777bc.tgz diff --git a/php-bartlett-PHP-CompatInfo-6.0.0-rpm.patch b/php-bartlett-PHP-CompatInfo-7.2.3-rpm.patch similarity index 51% rename from php-bartlett-PHP-CompatInfo-6.0.0-rpm.patch rename to php-bartlett-PHP-CompatInfo-7.2.3-rpm.patch index 92cebab..a6a4931 100644 --- a/php-bartlett-PHP-CompatInfo-6.0.0-rpm.patch +++ b/php-bartlett-PHP-CompatInfo-7.2.3-rpm.patch @@ -1,7 +1,7 @@ diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo ---- ./bin/phpcompatinfo.rpm 2021-12-13 12:09:12.000000000 +0100 -+++ ./bin/phpcompatinfo 2021-12-13 12:12:30.838533965 +0100 -@@ -6,6 +6,10 @@ if (PHP_SAPI !== 'cli') { +--- ./bin/phpcompatinfo.rpm 2025-05-04 07:31:28.259594805 +0200 ++++ ./bin/phpcompatinfo 2025-05-04 07:32:09.736421056 +0200 +@@ -15,6 +15,10 @@ if (PHP_SAPI !== 'cli') { return; } @@ -11,4 +11,4 @@ diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo + gc_disable(); // performance boost - require_once dirname(__DIR__) . '/config/bootstrap.php'; + require_once dirname(__DIR__) . '/autoload.php'; diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index b2f87da..f28d773 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -1,28 +1,26 @@ # remirepo/fedora spec file for php-bartlett-PHP-CompatInfo # -# Copyright (c) 2011-2024 Remi Collet -# License: CC-BY-SA-4.0 -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2011-2025 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # -%bcond_with generators - %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit 9875282a35266aa2b66416303c06edcd70fc50a1 +%global gh_commit 25777bc305fac9344a2193e5328f7743eb6b77c9 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2024-04-24 +%global gh_date 2025-05-01 %global gh_owner llaville %global gh_project php-compatinfo -%global upstream_version 7.1.4 +%global upstream_version 7.2.3 #global upstream_prever RC1 Name: php-bartlett-PHP-CompatInfo Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 5%{?dist} +Release: 1%{?dist} Summary: Find out version and the extensions required for a piece of code to run # SPDX: see bundled libraries list below @@ -35,15 +33,13 @@ Source1: fedora-review-check Source9: makesrc.sh # Relocate the database -Patch0: %{name}-6.0.0-rpm.patch +Patch0: %{name}-7.2.3-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 8.1 BuildRequires: php-cli BuildRequires: php-json -%if %{with generators} BuildRequires: composer-generators -%endif Requires: php(language) >= 8.1 Requires: php-cli @@ -58,65 +54,6 @@ Requires: php-simplexml Requires: php-spl Requires: php-xmlreader -%if %{without generators} -# Bundled libraries -# License BSD-3-Clause -Provides: bundled(php-composer(bartlett/php-compatinfo-db)) = 6.12.0 -Provides: bundled(php-composer(nikic/php-parser)) = v5.3.1 -# License MIT -Provides: bundled(php-composer(bartlett/sarif-php-sdk)) = 1.5.0 -Provides: bundled(php-composer(brick/math)) = 0.12.1 -Provides: bundled(php-composer(composer/semver)) = 3.4.3 -Provides: bundled(php-composer(doctrine/cache)) = 2.2.0 -Provides: bundled(php-composer(doctrine/collections)) = 1.8.0 -Provides: bundled(php-composer(doctrine/common)) = 3.4.5 -Provides: bundled(php-composer(doctrine/dbal)) = 3.9.3 -Provides: bundled(php-composer(doctrine/deprecations)) = 1.1.3 -Provides: bundled(php-composer(doctrine/event-manager)) = 2.0.1 -Provides: bundled(php-composer(doctrine/inflector)) = 2.0.10 -Provides: bundled(php-composer(doctrine/instantiator)) = 2.0.0 -Provides: bundled(php-composer(doctrine/lexer)) = 3.0.1 -Provides: bundled(php-composer(doctrine/orm)) = 2.20.0 -Provides: bundled(php-composer(doctrine/persistence)) = 3.4.0 -Provides: bundled(php-composer(psr/cache)) = 3.0.0 -Provides: bundled(php-composer(psr/clock)) = 1.0.0 -Provides: bundled(php-composer(psr/container)) = 2.0.2 -Provides: bundled(php-composer(psr/event-dispatcher)) = 1.0.0 -Provides: bundled(php-composer(psr/log)) = 3.0.2 -Provides: bundled(php-composer(ramsey/collection)) = 2.0.0 -Provides: bundled(php-composer(ramsey/uuid)) = 4.7.6 -Provides: bundled(php-composer(symfony/cache)) = v6.4.14 -Provides: bundled(php-composer(symfony/cache-contracts)) = v3.5.0 -Provides: bundled(php-composer(symfony/clock)) = v6.4.13 -Provides: bundled(php-composer(symfony/config)) = v6.4.14 -Provides: bundled(php-composer(symfony/console)) = v6.4.14 -Provides: bundled(php-composer(symfony/dependency-injection)) = v6.4.13 -Provides: bundled(php-composer(symfony/deprecation-contracts)) = v3.5.0 -Provides: bundled(php-composer(symfony/event-dispatcher)) = v6.4.13 -Provides: bundled(php-composer(symfony/event-dispatcher-contracts)) = v3.5.0 -Provides: bundled(php-composer(symfony/filesystem)) = v6.4.13 -Provides: bundled(php-composer(symfony/finder)) = v6.4.13 -Provides: bundled(php-composer(symfony/http-client)) = v6.4.14 -Provides: bundled(php-composer(symfony/http-client-contracts)) = v3.5.0 -Provides: bundled(php-composer(symfony/messenger)) = v6.4.13 -Provides: bundled(php-composer(symfony/polyfill-ctype)) = v1.31.0 -Provides: bundled(php-composer(symfony/polyfill-intl-grapheme)) = v1.31.0 -Provides: bundled(php-composer(symfony/polyfill-intl-normalizer)) = v1.31.0 -Provides: bundled(php-composer(symfony/polyfill-mbstring)) = v1.31.0 -Provides: bundled(php-composer(symfony/polyfill-php72)) = v1.31.0 -Provides: bundled(php-composer(symfony/polyfill-php80)) = v1.31.0 -Provides: bundled(php-composer(symfony/polyfill-php83)) = v1.31.0 -Provides: bundled(php-composer(symfony/polyfill-php84)) = v1.31.0 -Provides: bundled(php-composer(symfony/process)) = v6.4.14 -Provides: bundled(php-composer(symfony/requirements-checker)) = v2.0.1 -Provides: bundled(php-composer(symfony/serializer)) = v6.4.13 -Provides: bundled(php-composer(symfony/service-contracts)) = v3.5.0 -Provides: bundled(php-composer(symfony/stopwatch)) = v6.4.13 -Provides: bundled(php-composer(symfony/string)) = v6.4.13 -Provides: bundled(php-composer(symfony/var-exporter)) = v6.4.13 - -Provides: php-composer(bartlett/php-compatinfo) = %{version} -%endif Provides: phpcompatinfo = %{version} @@ -148,31 +85,6 @@ done rm -r vendor/bartlett/*/.github rm -r vendor/bartlett/*/.changes -: Hack for PHP 8.4 -sed -e '/php83/d;s/php82/php83/' config/set/up-to-php83.php | tee config/set/up-to-php84.php - -%if %{without generators} -: List bundled libraries and Licenses -php -r ' - $pkgs = file_get_contents("vendor/composer/installed.json"); - $pkgs = json_decode($pkgs, true); - if (!is_array($pkgs) || !isset($pkgs["packages"])) { - echo "cant decode json file\n"; - exit(3); - } - $res = []; - foreach($pkgs["packages"] as $pkg) { - $lic = implode(" and ", $pkg["license"]); - if (!isset($res[$lic])) $res[$lic] = []; - $res[$lic][] = sprintf("Provides: bundled(php-composer(%s)) = %s", $pkg["name"], $pkg["version"]); - } - foreach($res as $lic => $lib) { - sort($lib); - printf("# License %s\n%s\n", $lic, implode("\n", $lib)); - } -' -%endif - %build # Nothing @@ -180,7 +92,7 @@ php -r ' %install mkdir -p %{buildroot}%{_datadir}/%{name} -for i in bin config data resources src vendor composer.* +for i in bin config data resources src vendor composer.* autoload.php do cp -pr $i %{buildroot}%{_datadir}/%{name}/$i done @@ -212,6 +124,12 @@ install -D -p -m 755 %{SOURCE1} \ %changelog +* Mon May 5 2025 Remi Collet - 7.2.3-1 +- update to 7.2.3 +- re-license spec file to CECILL-2.1 +- always build with composer-generators +- update bundled bartlett/php-compatinfo-db to 6.16.0 + * Sat Jan 18 2025 Fedora Release Engineering - 7.1.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 003e67e..3cb93bf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-7.1.4-9875282.tgz) = fda8cebf9471cb7c49b91137a89e8b051e447d13dad14b1b8b19854f83ab049b53cb21dd965febb21832135dc7f4e79197efe68fe11fdb48e2d8387fe8a22c19 +SHA512 (php-bartlett-PHP-CompatInfo-7.2.3-25777bc.tgz) = d77a6b4109db57bd451272ef72df66a0845d886f6740bed5cf56cb24a31275c19299f4d3ffd44f23a580cff91a6dc6eddf60b36ce467696983d1709d159e3bc6 From 1ac35df697a303ae052b6b3652d54f544fb4acd0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 05:09:21 +0000 Subject: [PATCH 109/111] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- php-bartlett-PHP-CompatInfo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index f28d773..94ed77d 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -20,7 +20,7 @@ Name: php-bartlett-PHP-CompatInfo Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Find out version and the extensions required for a piece of code to run # SPDX: see bundled libraries list below @@ -124,6 +124,9 @@ install -D -p -m 755 %{SOURCE1} \ %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 7.2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon May 5 2025 Remi Collet - 7.2.3-1 - update to 7.2.3 - re-license spec file to CECILL-2.1 From f7717973593108d2dd14c2909475aae706e2ed97 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 9 Oct 2025 14:43:04 +0200 Subject: [PATCH 110/111] update to 7.2.4 update bundled bartlett/php-compatinfo-db to 6.24.1 --- .gitignore | 1 + php-bartlett-PHP-CompatInfo.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 002d70f..a008686 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,4 @@ clog /php-bartlett-PHP-CompatInfo-7.1.3-7a74bd0.tgz /php-bartlett-PHP-CompatInfo-7.1.4-9875282.tgz /php-bartlett-PHP-CompatInfo-7.2.3-25777bc.tgz +/php-bartlett-PHP-CompatInfo-7.2.4-165460c.tgz diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 94ed77d..a31d7ca 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -9,18 +9,18 @@ %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit 25777bc305fac9344a2193e5328f7743eb6b77c9 +%global gh_commit 165460c7b51948ce55f07b2a32670aa97aa06282 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2025-05-01 +%global gh_date 2025-10-09 %global gh_owner llaville %global gh_project php-compatinfo -%global upstream_version 7.2.3 +%global upstream_version 7.2.4 #global upstream_prever RC1 Name: php-bartlett-PHP-CompatInfo Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Find out version and the extensions required for a piece of code to run # SPDX: see bundled libraries list below @@ -124,6 +124,10 @@ install -D -p -m 755 %{SOURCE1} \ %changelog +* Thu Oct 9 2025 Remi Collet - 7.2.4-1 +- update to 7.2.4 +- update bundled bartlett/php-compatinfo-db to 6.24.1 + * Fri Jul 25 2025 Fedora Release Engineering - 7.2.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 3cb93bf..97c8337 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-7.2.3-25777bc.tgz) = d77a6b4109db57bd451272ef72df66a0845d886f6740bed5cf56cb24a31275c19299f4d3ffd44f23a580cff91a6dc6eddf60b36ce467696983d1709d159e3bc6 +SHA512 (php-bartlett-PHP-CompatInfo-7.2.4-165460c.tgz) = 117f1e8d6febcf3fa69f114cd13df60a64754ef8954636e5703f04fbb57efc0106f1f5ffdd106b93ebac0043ed983762999335ccabddbd6e3abc306e8a7a7c9f From 6841168731a88ff15ff2b434c06fbacacd2b3052 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 25 Nov 2025 09:17:48 +0100 Subject: [PATCH 111/111] update to 7.2.5 update bundled bartlett/php-compatinfo-db to 6.26.0 --- .gitignore | 1 + php-bartlett-PHP-CompatInfo.spec | 14 +++++++------- sources | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index a008686..7d3bdec 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,4 @@ clog /php-bartlett-PHP-CompatInfo-7.1.4-9875282.tgz /php-bartlett-PHP-CompatInfo-7.2.3-25777bc.tgz /php-bartlett-PHP-CompatInfo-7.2.4-165460c.tgz +/php-bartlett-PHP-CompatInfo-7.2.5-56d3215.tgz diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index a31d7ca..0e89b83 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -9,13 +9,13 @@ %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit 165460c7b51948ce55f07b2a32670aa97aa06282 +%global gh_commit 56d3215bcf8acb2e822fc9ce21fa934cd6129637 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2025-10-09 +%global gh_date 2025-11-23 %global gh_owner llaville %global gh_project php-compatinfo -%global upstream_version 7.2.4 +%global upstream_version 7.2.5 #global upstream_prever RC1 Name: php-bartlett-PHP-CompatInfo @@ -38,20 +38,16 @@ Patch0: %{name}-7.2.3-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 8.1 BuildRequires: php-cli -BuildRequires: php-json BuildRequires: composer-generators Requires: php(language) >= 8.1 Requires: php-cli Requires: php-dom -Requires: php-json Requires: php-libxml -Requires: php-pcre Requires: php-phar Requires: php-pdo Requires: php-pdo_sqlite Requires: php-simplexml -Requires: php-spl Requires: php-xmlreader Provides: phpcompatinfo = %{version} @@ -124,6 +120,10 @@ install -D -p -m 755 %{SOURCE1} \ %changelog +* Tue Nov 25 2025 Remi Collet - 7.2.5-1 +- update to 7.2.5 +- update bundled bartlett/php-compatinfo-db to 6.26.0 + * Thu Oct 9 2025 Remi Collet - 7.2.4-1 - update to 7.2.4 - update bundled bartlett/php-compatinfo-db to 6.24.1 diff --git a/sources b/sources index 97c8337..b1418ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-7.2.4-165460c.tgz) = 117f1e8d6febcf3fa69f114cd13df60a64754ef8954636e5703f04fbb57efc0106f1f5ffdd106b93ebac0043ed983762999335ccabddbd6e3abc306e8a7a7c9f +SHA512 (php-bartlett-PHP-CompatInfo-7.2.5-56d3215.tgz) = 51b2715fccc20ab6fafadf9f9e0d60cc8103f2d435e0133f6020b05d7449761042dd4be30d2a0b141664d6e4193692cc9800b35ccc25d4144b03bae603ec26fe