diff --git a/.gitignore b/.gitignore index e38ab10..7626a63 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,10 @@ 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 +/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 381e35a..a2d4c80 100755 --- a/makesrc.sh +++ b/makesrc.sh @@ -1,24 +1,28 @@ #!/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 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.spec b/php-bartlett-PHP-CompatInfo.spec index 9a054d2..358cec0 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -1,23 +1,21 @@ # 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 7b053000a684d1fa3840e0ab3c5833fecdf02dc3 +%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.0.0 +%global upstream_version 7.1.4 #global upstream_prever RC1 Name: php-bartlett-PHP-CompatInfo @@ -38,11 +36,11 @@ Source9: makesrc.sh Patch0: %{name}-6.0.0-rpm.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 @@ -57,57 +55,58 @@ 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) = 6.5.0 +Provides: bundled(php-nikic-php-parser) = v5.0.2 # 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.3.2 -Provides: bundled(php-doctrine-annotations) = 1.14.3 +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.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.15.1 -Provides: bundled(php-doctrine-persistence) = 3.1.4 +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) = 1.3.0 -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-php80) = v1.27.0 -Provides: bundled(php-symfony-polyfill-php81) = v1.27.0 -Provides: bundled(php-symfony-process) = v6.0.19 +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.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.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: phpcompatinfo = %{version} Provides: php-composer(bartlett/php-compatinfo) = %{version} @@ -123,6 +122,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 @@ -137,9 +137,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 @@ -168,27 +165,31 @@ 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 -%{buildroot}%{_bindir}/phpcompatinfo --version || grep %{version} +%{buildroot}%{_bindir}/phpcompatinfo --version | grep %{version} && exit 0 %files %license *LICENSE -%doc README.* +%doc *md +%doc docs +%doc examples %doc composer.json %doc vendor/composer/installed.json %{_bindir}/phpcompatinfo @@ -197,6 +198,39 @@ install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/fedora- %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 + +* 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 +- move docs and examples in package documentation + +* 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 +- 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 + +* Mon Nov 13 2023 Remi Collet - 7.0.0-3 +- update bundled bartlett/php-compatinfo-db to 5.12.0 + * Tue May 16 2023 Remi Collet - 7.0.0-1 - update to 7.0.0 - raise dependency on PHP 8.0 diff --git a/sources b/sources index bf22db2..6ac91b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bartlett-PHP-CompatInfo-7.0.0-7b05300.tgz) = 9917308a1e972b846e0daa822656c03d0a3d4e5dffd2db16c2716e195fa07a3abb2bee434f5a6d5e9aa83272c5b99652eedb0a61468c29b87634f0bea369e67b +SHA512 (php-bartlett-PHP-CompatInfo-7.1.4-9875282.tgz) = edceb0829fcded8326aeaed43ccee63aba3a23b69b540fdbfba060be3b79fae149832ed375efae38c313b23d67ca67da3498464b0a21a6630f4b5f0dbbf287e4