diff --git a/.gitignore b/.gitignore index 11408de..4488815 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,3 @@ -clog -/php-phpunitgoodpractices-traits-1.9.1-1f56f64.tgz -/php-phpunitgoodpractices-polyfill-1.5.0-b87c59f.tgz -/php-sanmai-phpunit-legacy-adapter-8.1-464c750.tgz -/php-phpunitgoodpractices-polyfill-1.6.0-625622f.tgz -/php-phpunitgoodpractices-traits-1.9.2-067b87d.tgz -/php-sanmai-phpunit-legacy-adapter-8.2.1-3db58a3.tgz +/php-phpunitgoodpractices-polyfill-1.0.0-3968a1f.tgz +/php-phpunitgoodpractices-polyfill-1.1.0-f7c9b77.tgz +/php-phpunitgoodpractices-traits-1.5.1-10d22ad.tgz diff --git a/makesrc.sh b/makesrc.sh index 47d26f4..62e19db 100755 --- a/makesrc.sh +++ b/makesrc.sh @@ -8,24 +8,21 @@ 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\n" -if [ -f $NAME-$VERSION-$SHORT.tgz ]; then - echo "$PROJECT Skipped" -else - 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 ../composer-polyfill.json - popd +echo "Cloning..." +git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT - echo "Archiving..." - tar czf $NAME-$VERSION-$SHORT.tgz --exclude .git $PROJECT-$COMMIT +echo "Getting commit..." +pushd $PROJECT-$COMMIT +git checkout $COMMIT +cp composer.json ../composer-polyfill.json +popd - echo "Cleaning..." - rm -rf $PROJECT-$COMMIT -fi +echo "Archiving..." +tar czf $NAME-$VERSION-$SHORT.tgz --exclude .git $PROJECT-$COMMIT + +echo "Cleaning..." +rm -rf $PROJECT-$COMMIT PROJECT=Traits VERSION=$(sed -n '/^%global tr_version/{s/.* //;p}' $NAME.spec) @@ -33,54 +30,22 @@ COMMIT=$(sed -n '/^%global tr_commit/{s/.* //;p}' $NAME.spec) SHORT=${COMMIT:0:7} NAME=php-phpunitgoodpractices-traits -if [ -f $NAME-$VERSION-$SHORT.tgz ]; then - echo "$PROJECT Skipped" -else - echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n" +echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n" - echo "Cloning..." - git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT +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 ../composer-traits.json - popd +echo "Getting commit..." +pushd $PROJECT-$COMMIT +git checkout $COMMIT +cp composer.json ../composer-traits.json +popd - echo "Archiving..." - tar czf $NAME-$VERSION-$SHORT.tgz --exclude .git $PROJECT-$COMMIT +echo "Archiving..." +tar czf $NAME-$VERSION-$SHORT.tgz --exclude .git $PROJECT-$COMMIT - echo "Cleaning..." - rm -rf $PROJECT-$COMMIT -fi +echo "Cleaning..." +rm -rf $PROJECT-$COMMIT -NAME=$(basename $PWD) -OWNER=$(sed -n '/^%global lg_owner/{s/.* //;p}' $NAME.spec) -PROJECT=$(sed -n '/^%global lg_project/{s/.* //;p}' $NAME.spec) -VERSION=$(sed -n '/^%global lg_version/{s/.* //;p}' $NAME.spec) -COMMIT=$(sed -n '/^%global lg_commit/{s/.* //;p}' $NAME.spec) -SHORT=${COMMIT:0:7} -NAME=php-$OWNER-$PROJECT - -if [ -f $NAME-$VERSION-$SHORT.tgz ]; then - echo "$PROJECT Skipped" -else - echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\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 ../composer-legacy.json - popd - - echo "Archiving..." - tar czf $NAME-$VERSION-$SHORT.tgz --exclude .git $PROJECT-$COMMIT - - echo "Cleaning..." - rm -rf $PROJECT-$COMMIT -fi echo "Done." diff --git a/php-phpunitgoodpractices-polyfill.spec b/php-phpunitgoodpractices-polyfill.spec index e19fcbe..baa8711 100644 --- a/php-phpunitgoodpractices-polyfill.spec +++ b/php-phpunitgoodpractices-polyfill.spec @@ -1,17 +1,14 @@ # remirepo/fedora spec file for php-phpunitgoodpractices-polyfill # -# Copyright (c) 2018-2022 Remi Collet +# Copyright (c) 2018 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%bcond_without tests - -# Polyfill -# https://github.com/PHPUnitGoodPractices/polyfill/releases -%global gh_commit 625622fc35e922c04f28e448b43d85972be95040 +# Github +%global gh_commit f7c9b779e5c14ad37d27b108f2a370bb3c0312e8 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner PHPUnitGoodPractices %global gh_project polyfill @@ -22,70 +19,49 @@ %global ns_vendor PHPUnitGoodPractices %global ns_project Polyfill %global php_home %{_datadir}/php +%global with_tests 0%{!?_without_tests:1} # Traits -# https://github.com/PHPUnitGoodPractices/Traits/releases -%global tr_commit 067b87ddc903231f07f89161f10f1ab8b393a6a1 +%global tr_commit 10d22ad5e222b5e5eae6941aac91c068397b5127 %global tr_short %(c=%{tr_commit}; echo ${c:0:7}) -%global tr_version 1.9.2 -# Legacy -# https://github.com/sanmai/phpunit-legacy-adapter/releases -%global lg_owner sanmai -%global lg_project phpunit-legacy-adapter -%global lg_commit 3db58a31847d803f76cab3da14e334a2d090c067 -%global lg_short %(c=%{lg_commit}; echo ${c:0:7}) -%global lg_version 8.2.1 +%global tr_version 1.5.1 Name: php-%{pk_vendor}-%{pk_project} -Version: 1.6.0 -Release: 8%{?dist} +Version: 1.1.0 +Release: 2%{?dist} Summary: Lacking future-compat polyfills for PHPUnit +Group: Development/Tools License: MIT URL: https://github.com/%{gh_owner}/%{gh_project} # git snapshot to get upstream test suite (none for now) Source0: %{name}-%{version}-%{gh_short}.tgz Source1: php-%{pk_vendor}-traits-%{tr_version}-%{tr_short}.tgz -Source2: php-%{lg_owner}-%{lg_project}-%{lg_version}-%{lg_short}.tgz -Source3: makesrc.sh +Source2: makesrc.sh BuildArch: noarch -%if %{with tests} +%if %{with_tests} # For tests BuildRequires: php(language) >= 5.5 -%if 0%{?fedora} >= 32 || 0%{?rhel} >= 9 -%global phpunit %{_bindir}/phpunit9 -%else -%global phpunit %{_bindir}/phpunit8 -%endif -BuildRequires: %{phpunit} -# From polyfill, composer.json, "require-dev": { -# "friendsofphp/php-cs-fixer": "^2", -# "php-coveralls/php-coveralls": "^2.4" -# From traits, composer.json, "require-dev": { -# "phpspec/prophecy": "^1.10", -# "phpunitgoodpractices/polyfill": "^1.1", -# "sanmai/phpunit-legacy-adapter": "^6.1 || ^8.0" -%endif -BuildRequires: php-cli +BuildRequires: %{_bindir}/phpunit +# From composer.json, "require-dev": { +# "friendsofphp/php-cs-fixer": "^2.11" # Autoloader BuildRequires: php-fedora-autoloader-devel +%endif -# From polyfill, composer.json, "require": { -# "php": "^5.5 || ^7.0 || ^8.0", -# "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.0 || ^9.0" -# From traits, composer.json, "require": { -# "php": "^5.5 || ^7.0 || ^8.0", -# "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ~8.5 || ~9.4" +# From composer.json, "require": { +# "php": "^5.5 || ^7.0", +# "phpunit/phpunit": "^4.0 || ^5.3 || ^6.0 || ^7.0" Requires: php(language) >= 5.5 -Requires: (phpunit9 or phpunit8 or phpunit7 or phpunit6 or php-phpunit-PHPUnit) -# From phpcompatinfo report for version polyfill 1.5.0 and traits 1.9.1 +Requires: (phpunit7 or phpunit6 or php-phpunit-PHPUnit) +# From phpcompatinfo report for version 1.0.0 # nothing # Autoloader Requires: php-composer(fedora/autoloader) -Provides: php-%{pk_vendor}-traits = %{tr_version}-%{release} -Provides: php-composer(%{pk_vendor}/traits) = %{tr_version} Provides: php-composer(%{pk_vendor}/%{pk_project}) = %{version} +Provides: php-%{pk_vendor}-traits = %{tr_version} +Provides: php-composer(%{pk_vendor}/traits) = %{tr_version} %description @@ -95,15 +71,13 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}/autoload.php %prep -%setup -q -n %{gh_project}-%{gh_commit} -a 1 -a 2 +%setup -q -n %{gh_project}-%{gh_commit} -a 1 mv composer.json composer-polyfill.json mv LICENSE LICENSE-polyfill mv Traits-%{tr_commit}/src src2 mv Traits-%{tr_commit}/composer.json composer-traits.json mv Traits-%{tr_commit}/LICENSE LICENSE-traits -mv Traits-%{tr_commit}/tests tests/Traits -mv %{lg_project}-%{lg_commit}/src src3 cat << 'EOF' | tee src/autoload.php - 1.6.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Jan 18 2025 Fedora Release Engineering - 1.6.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 19 2024 Fedora Release Engineering - 1.6.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 1.6.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 1.6.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jul 21 2023 Fedora Release Engineering - 1.6.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Jan 20 2023 Fedora Release Engineering - 1.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Mon Sep 12 2022 Remi Collet - 1.6.0-1 -- update phpunitgoodpractices/polyfill to 1.6.0 -- update phpunitgoodpractices/traits to 1.9.2 - -* Fri Jul 22 2022 Fedora Release Engineering - 1.5.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jan 21 2022 Fedora Release Engineering - 1.5.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.5.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 1.5.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Dec 8 2020 Remi Collet - 1.5.0-2 -- enable upstream test suite - -* Tue Dec 8 2020 Remi Collet - 1.5.0-1 -- update phpunitgoodpractices/polyfill to 1.5.0 - -* Tue Oct 20 2020 Remi Collet - 1.4.0-1 -- update phpunitgoodpractices/polyfill to 1.4.0 -- update phpunitgoodpractices/traits to 1.9.1 -- allow PHPUnit 9 - -* Tue Jul 28 2020 Fedora Release Engineering - 1.2.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Jan 30 2020 Fedora Release Engineering - 1.2.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Jul 26 2019 Fedora Release Engineering - 1.2.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Tue Mar 26 2019 Remi Collet - 1.2.0-1 -- update phpunitgoodpractices/polyfill to 1.2.0 -- update phpunitgoodpractices/traits to 1.8.0 -- allow PHPUnit 8 - -* Sat Feb 02 2019 Fedora Release Engineering - 1.1.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Dec 29 2018 Remi Collet - 1.1.0-5 -- update phpunitgoodpractices/traits to 1.7.0 - -* Tue Sep 4 2018 Remi Collet - 1.1.0-4 -- update phpunitgoodpractices/traits to 1.6.0 - -* Fri Jul 13 2018 Fedora Release Engineering - 1.1.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - * Mon Jun 25 2018 Remi Collet - 1.1.0-2 - add mandatory dependency on one PHPUnit version - add phpunitgoodpractices/traits 1.5.1 diff --git a/sources b/sources index 0e4bdff..67490d9 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -SHA512 (php-phpunitgoodpractices-polyfill-1.6.0-625622f.tgz) = 395ba8cf5a5c1d889c7f585233d092ed2650543a4c26d397a5d0c05dc120fdd6c447d4521873a6158a0cb617269b7fc29dc3abdb1204b8221b92bf808026758e -SHA512 (php-phpunitgoodpractices-traits-1.9.2-067b87d.tgz) = 7fbee163394c291cc4122f9daf3f4c94876ddd435aa10908a919dd004f2b98deb721194ab652395f566ad1097f0d9c49ea2b930bc2961fb11064312c13e5e939 -SHA512 (php-sanmai-phpunit-legacy-adapter-8.2.1-3db58a3.tgz) = 9b5009de6b20a7f8b9255605638a76eb035b1fd38ae2035a0d5947fe867783449aa564e14aedd5ae7951c95d0d285189bbb0ff7f505f5c73419a7deee96d2195 +SHA512 (php-phpunitgoodpractices-polyfill-1.1.0-f7c9b77.tgz) = f6d536bbace9762d3a20129854caef4cddca450f7f07a767989f1d39a5df7a7faa9b08acdf4554882ed9748ce419327451ff6fa244da6e3855d8a9a7a1a5d64a +SHA512 (php-phpunitgoodpractices-traits-1.5.1-10d22ad.tgz) = 155778546bc78cdc416a882c672ab1a827623e2534fbb7e7d6ff67552ec40ee04b7fb397ca35c54457bd82a0b0785b304e9d9b872f09326cfd4a8b57fa0166ad