diff --git a/.gitignore b/.gitignore index a96af03..7626a63 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,6 @@ 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 +/php-bartlett-PHP-CompatInfo-7.1.3-7a74bd0.tgz +/php-bartlett-PHP-CompatInfo-7.1.4-9875282.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 4238362..cfaff04 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -1,28 +1,28 @@ # 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 + +%bcond_with generators %{!?php_version: %global php_version %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit d9504f525abfbdb8fc7d7850cbd58229471526ba +%global gh_commit 9875282a35266aa2b66416303c06edcd70fc50a1 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -#global gh_date 20151005 +%global gh_date 2024-04-24 %global gh_owner llaville %global gh_project php-compatinfo -%global upstream_version 7.1.1 +%global upstream_version 7.1.4 #global upstream_prever RC1 Name: php-bartlett-PHP-CompatInfo Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 1%{?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 @@ -41,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 @@ -55,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.1.1 -Provides: bundled(php-nikic-php-parser) = v5.0.0 +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.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.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-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) = 2.0.0 -Provides: bundled(php-ramsey-uuid) = 4.7.5 -Provides: bundled(php-symfony-cache) = v6.4.2 -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-deprecation-contracts) = v3.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.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 -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-requirements-checker) = v2.0.1 -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.2 -Provides: bundled(php-symfony-var-exporter) = v6.4.2 +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 @@ -142,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"); @@ -154,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 @@ -200,6 +209,23 @@ 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 + +* 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 + +* 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 18 2024 Remi Collet - 7.1.1-1 - update to 7.1.1 - cleanup installation tree diff --git a/sources b/sources index 06ddd7e..003e67e 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.4-9875282.tgz) = fda8cebf9471cb7c49b91137a89e8b051e447d13dad14b1b8b19854f83ab049b53cb21dd965febb21832135dc7f4e79197efe68fe11fdb48e2d8387fe8a22c19