diff options
| -rw-r--r-- | composer.json | 28 | ||||
| -rwxr-xr-x | makesrc.sh | 11 | ||||
| -rw-r--r-- | phpunit8.spec | 144 |
3 files changed, 71 insertions, 112 deletions
diff --git a/composer.json b/composer.json index e5aad89..885fdcd 100644 --- a/composer.json +++ b/composer.json @@ -29,22 +29,22 @@ "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "doctrine/instantiator": "^1.3.1", - "myclabs/deep-copy": "^1.10.0", - "phar-io/manifest": "^2.0.3", - "phar-io/version": "^3.0.2", - "phpunit/php-code-coverage": "^7.0.12", - "phpunit/php-file-iterator": "^2.0.4", + "doctrine/instantiator": "^1.5.0", + "myclabs/deep-copy": "^1.12.0", + "phar-io/manifest": "^2.0.4", + "phar-io/version": "^3.2.1", + "phpunit/php-code-coverage": "^7.0.17", + "phpunit/php-file-iterator": "^2.0.6", "phpunit/php-text-template": "^1.2.1", - "phpunit/php-timer": "^2.1.2", + "phpunit/php-timer": "^2.1.4", "sebastian/comparator": "^3.0.5", - "sebastian/diff": "^3.0.2", - "sebastian/environment": "^4.2.3", - "sebastian/exporter": "^3.1.5", - "sebastian/global-state": "^3.0.0", - "sebastian/object-enumerator": "^3.0.3", - "sebastian/resource-operations": "^2.0.1", - "sebastian/type": "^1.1.3", + "sebastian/diff": "^3.0.6", + "sebastian/environment": "^4.2.5", + "sebastian/exporter": "^3.1.6", + "sebastian/global-state": "^3.0.5", + "sebastian/object-enumerator": "^3.0.5", + "sebastian/resource-operations": "^2.0.3", + "sebastian/type": "^1.1.5", "sebastian/version": "^2.0.1" }, "config": { @@ -1,24 +1,29 @@ #!/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) +MAJOR=$(sed -n '/^%global ver_major/{s/.* //;p}' $NAME.spec) +MINOR=$(sed -n '/^%global ver_minor/{s/.* //;p}' $NAME.spec) COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec) SHORT=${COMMIT:0:7} +DATE=$(date -d "$DATE -1 week" +%Y-%m-%d) + if [ -f $NAME-$VERSION-$SHORT.tgz ]; then echo "$NAME-$VERSION-$SHORT.tgz already there" 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, Date=$DATE\n" echo "Cloning..." rm -rf $PROJECT-$COMMIT - git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT + git clone --branch $MAJOR.$MINOR --shallow-since=$DATE https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT || exit 1 echo "Getting commit..." pushd $PROJECT-$COMMIT - git checkout $COMMIT || exit1 + git checkout $COMMIT || exit 1 cp composer.json ../composer.json popd diff --git a/phpunit8.spec b/phpunit8.spec index f194a9e..3d2a877 100644 --- a/phpunit8.spec +++ b/phpunit8.spec @@ -12,8 +12,8 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 1ecad678646c817a29e55a32c930f3601c3f5a8c -#global gh_date 20150927 +%global gh_commit 172ba97bcf97ae6ef86ca256adf77aece8a143fe +%global gh_date 2024-07-10 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -26,7 +26,7 @@ %global ver_major 8 %global ver_minor 5 -%global upstream_version 8.5.38 +%global upstream_version 8.5.39 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -44,49 +44,25 @@ Patch0: %{name}-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 7.2 -# remirepo:1 -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(doctrine/instantiator) >= 1.3.1 with php-composer(doctrine/instantiator) < 2) -BuildRequires: (php-composer(myclabs/deep-copy) >= 1.10.0 with php-composer(myclabs/deep-copy) < 2) -BuildRequires: (php-composer(phar-io/manifest) >= 2.0.3 with php-composer(phar-io/manifest) < 3) -BuildRequires: (php-composer(phar-io/version) >= 3.0.2 with php-composer(phar-io/version) < 4) +BuildRequires: (php-composer(doctrine/instantiator) >= 1.5.0 with php-composer(doctrine/instantiator) < 2) +BuildRequires: (php-composer(myclabs/deep-copy) >= 1.12.0 with php-composer(myclabs/deep-copy) < 2) +BuildRequires: (php-composer(phar-io/manifest) >= 2.0.4 with php-composer(phar-io/manifest) < 3) +BuildRequires: (php-composer(phar-io/version) >= 3.2.1 with php-composer(phar-io/version) < 4) BuildRequires: (php-composer(phpspec/prophecy) >= 1.10.3 with php-composer(phpspec/prophecy) < 2) -BuildRequires: (php-composer(phpunit/php-code-coverage) >= 7.0.12 with php-composer(phpunit/php-code-coverage) < 8) -BuildRequires: (php-composer(phpunit/php-file-iterator) >= 2.0.4 with php-composer(phpunit/php-file-iterator) < 3) +BuildRequires: (php-composer(phpunit/php-code-coverage) >= 7.0.17 with php-composer(phpunit/php-code-coverage) < 8) +BuildRequires: (php-composer(phpunit/php-file-iterator) >= 2.0.6 with php-composer(phpunit/php-file-iterator) < 3) BuildRequires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2) -BuildRequires: (php-composer(phpunit/php-timer) >= 2.1.2 with php-composer(phpunit/php-timer) < 3) +BuildRequires: (php-composer(phpunit/php-timer) >= 2.1.4 with php-composer(phpunit/php-timer) < 3) BuildRequires: (php-composer(sebastian/comparator) >= 3.0.5 with php-composer(sebastian/comparator) < 4) -BuildRequires: (php-composer(sebastian/diff) >= 3.0.2 with php-composer(sebastian/diff) < 4) -BuildRequires: (php-composer(sebastian/environment) >= 4.2.3 with php-composer(sebastian/environment) < 5) -BuildRequires: (php-composer(sebastian/exporter) >= 3.1.5 with php-composer(sebastian/exporter) < 4) -BuildRequires: (php-composer(sebastian/global-state) >= 3.0.0 with php-composer(sebastian/global-state) < 4) -BuildRequires: (php-composer(sebastian/object-enumerator) >= 3.0.3 with php-composer(sebastian/object-enumerator) < 4) -BuildRequires: (php-composer(sebastian/resource-operations) >= 2.0.1 with php-composer(sebastian/resource-operations) < 3) +BuildRequires: (php-composer(sebastian/diff) >= 3.0.6 with php-composer(sebastian/diff) < 4) +BuildRequires: (php-composer(sebastian/environment) >= 4.2.5 with php-composer(sebastian/environment) < 5) +BuildRequires: (php-composer(sebastian/exporter) >= 3.1.6 with php-composer(sebastian/exporter) < 4) +BuildRequires: (php-composer(sebastian/global-state) >= 3.0.5 with php-composer(sebastian/global-state) < 4) +BuildRequires: (php-composer(sebastian/object-enumerator) >= 3.0.5 with php-composer(sebastian/object-enumerator) < 4) +BuildRequires: (php-composer(sebastian/resource-operations) >= 2.0.3 with php-composer(sebastian/resource-operations) < 3) BuildRequires: (php-composer(sebastian/version) >= 2.0.1 with php-composer(sebastian/version) < 3) -BuildRequires: (php-composer(sebastian/type) >= 1.1.3 with php-composer(sebastian/type) < 2) +BuildRequires: (php-composer(sebastian/type) >= 1.1.5 with php-composer(sebastian/type) < 2) BuildRequires: (php-composer(phpunit/php-invoker) >= 2.0.0 with php-composer(phpunit/php-invoker) < 3) -# remirepo:21 -%else -BuildRequires: php-doctrine-instantiator >= 1.3.1 -BuildRequires: php-myclabs-deep-copy >= 1.10.0 -BuildRequires: php-phar-io-manifest2 >= 2.0.3 -BuildRequires: php-phar-io-version3 >= 3.0.2 -BuildRequires: php-phpspec-prophecy >= 1.10.3 -BuildRequires: php-phpunit-php-code-coverage7 >= 7.0.12 -BuildRequires: php-phpunit-php-file-iterator2 >= 2.0.4 -BuildRequires: php-phpunit-Text-Template >= 1.2.1 -BuildRequires: php-phpunit-php-timer2 >= 2.1.2 -BuildRequires: php-sebastian-comparator3 >= 3.0.5 -BuildRequires: php-sebastian-diff3 >= 3.0.2 -BuildRequires: php-sebastian-environment4 >= 4.2.3 -BuildRequires: php-sebastian-exporter3 >= 3.1.5 -BuildRequires: php-sebastian-global-state3 -BuildRequires: php-sebastian-object-enumerator3 >= 3.0.3 -BuildRequires: php-sebastian-resource-operations2 >= 2.0.1 -BuildRequires: php-sebastian-type >= 1.1.3 -BuildRequires: php-phpunit-Version >= 2.0.1 -BuildRequires: php-phpunit-php-invoker2 -%endif BuildRequires: php-dom BuildRequires: php-json BuildRequires: php-mbstring @@ -104,21 +80,21 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "ext-mbstring": "*", # "ext-xml": "*", # "ext-xmlwriter": "*", -# "doctrine/instantiator": "^1.3.1", -# "myclabs/deep-copy": "^1.10.0", -# "phar-io/manifest": "^2.0.3", -# "phar-io/version": "^3.0.2", -# "phpunit/php-code-coverage": "^7.0.10", -# "phpunit/php-file-iterator": "^2.0.4", +# "doctrine/instantiator": "^1.5.0", +# "myclabs/deep-copy": "^1.12.0", +# "phar-io/manifest": "^2.0.4", +# "phar-io/version": "^3.2.1", +# "phpunit/php-code-coverage": "^7.0.17", +# "phpunit/php-file-iterator": "^2.0.6", # "phpunit/php-text-template": "^1.2.1", -# "phpunit/php-timer": "^2.1.2", +# "phpunit/php-timer": "^2.1.4", # "sebastian/comparator": "^3.0.5", -# "sebastian/diff": "^3.0.2", -# "sebastian/environment": "^4.2.3", -# "sebastian/exporter": "^3.1.5", -# "sebastian/global-state": "^3.0.0", -# "sebastian/object-enumerator": "^3.0.3", -# "sebastian/resource-operations": "^2.0.1", +# "sebastian/diff": "^3.0.6", +# "sebastian/environment": "^4.2.5", +# "sebastian/exporter": "^3.1.6", +# "sebastian/global-state": "^3.0.5", +# "sebastian/object-enumerator": "^3.0.5", +# "sebastian/resource-operations": "^2.0.3", # "sebastian/type": "^1.1.3", # "sebastian/version": "^2.0.1", Requires: php(language) >= 7.2 @@ -129,25 +105,23 @@ Requires: php-libxml Requires: php-mbstring Requires: php-xml Requires: php-xmlwriter -# remirepo:1 -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-composer(doctrine/instantiator) >= 1.3.1 with php-composer(doctrine/instantiator) < 2) -Requires: (php-composer(myclabs/deep-copy) >= 1.10.0 with php-composer(myclabs/deep-copy) < 2) -Requires: (php-composer(phar-io/manifest) >= 2.0.3 with php-composer(phar-io/manifest) < 3) -Requires: (php-composer(phar-io/version) >= 3.0.2 with php-composer(phar-io/version) < 4) +Requires: (php-composer(doctrine/instantiator) >= 1.5.0 with php-composer(doctrine/instantiator) < 2) +Requires: (php-composer(myclabs/deep-copy) >= 1.12.0 with php-composer(myclabs/deep-copy) < 2) +Requires: (php-composer(phar-io/manifest) >= 2.0.4 with php-composer(phar-io/manifest) < 3) +Requires: (php-composer(phar-io/version) >= 3.2.1 with php-composer(phar-io/version) < 4) Requires: (php-composer(phpspec/prophecy) >= 1.10.3 with php-composer(phpspec/prophecy) < 2) -Requires: (php-composer(phpunit/php-code-coverage) >= 7.0.12 with php-composer(phpunit/php-code-coverage) < 8) -Requires: (php-composer(phpunit/php-file-iterator) >= 2.0.4 with php-composer(phpunit/php-file-iterator) < 3) +Requires: (php-composer(phpunit/php-code-coverage) >= 7.0.17 with php-composer(phpunit/php-code-coverage) < 8) +Requires: (php-composer(phpunit/php-file-iterator) >= 2.0.6 with php-composer(phpunit/php-file-iterator) < 3) Requires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2) -Requires: (php-composer(phpunit/php-timer) >= 2.1.2 with php-composer(phpunit/php-timer) < 3) +Requires: (php-composer(phpunit/php-timer) >= 2.1.4 with php-composer(phpunit/php-timer) < 3) Requires: (php-composer(sebastian/comparator) >= 3.0.5 with php-composer(sebastian/comparator) < 4) -Requires: (php-composer(sebastian/diff) >= 3.0.2 with php-composer(sebastian/diff) < 4) -Requires: (php-composer(sebastian/environment) >= 4.2.3 with php-composer(sebastian/environment) < 5) -Requires: (php-composer(sebastian/exporter) >= 3.1.5 with php-composer(sebastian/exporter) < 4) -Requires: (php-composer(sebastian/global-state) >= 3.0.0 with php-composer(sebastian/global-state) < 4) -Requires: (php-composer(sebastian/object-enumerator) >= 3.0.3 with php-composer(sebastian/object-enumerator) < 4) -Requires: (php-composer(sebastian/resource-operations) >= 2.0.1 with php-composer(sebastian/resource-operations) < 3) -Requires: (php-composer(sebastian/type) >= 1.1.3 with php-composer(sebastian/type) < 2) +Requires: (php-composer(sebastian/diff) >= 3.0.6 with php-composer(sebastian/diff) < 4) +Requires: (php-composer(sebastian/environment) >= 4.2.5 with php-composer(sebastian/environment) < 5) +Requires: (php-composer(sebastian/exporter) >= 3.1.6 with php-composer(sebastian/exporter) < 4) +Requires: (php-composer(sebastian/global-state) >= 3.0.5 with php-composer(sebastian/global-state) < 4) +Requires: (php-composer(sebastian/object-enumerator) >= 3.0.5 with php-composer(sebastian/object-enumerator) < 4) +Requires: (php-composer(sebastian/resource-operations) >= 2.0.3 with php-composer(sebastian/resource-operations) < 3) +Requires: (php-composer(sebastian/type) >= 1.1.5 with php-composer(sebastian/type) < 2) Requires: (php-composer(sebastian/version) >= 2.0.1 with php-composer(sebastian/version) < 3) # From composer.json, "suggest": { # "phpunit/php-invoker": "^2.0.0", @@ -160,28 +134,6 @@ Suggests: php-xdebug Recommends: phpunit9 Recommends: phpunit10 Recommends: phpunit11 -# remirepo:21 -%else -Requires: php-doctrine-instantiator >= 1.3.1 -Requires: php-myclabs-deep-copy >= 1.10.0 -Requires: php-phar-io-manifest2 >= 2.0.3 -Requires: php-phar-io-version3 >= 3.0.2 -Requires: php-phpspec-prophecy >= 1.10.3 -Requires: php-phpunit-php-code-coverage7 >= 7.0.12 -Requires: php-phpunit-php-file-iterator2 >= 2.0.4 -Requires: php-phpunit-Text-Template >= 1.2.1 -Requires: php-phpunit-php-timer2 >= 2.1.2 -Requires: php-sebastian-comparator3 >= 3.0.5 -Requires: php-sebastian-diff3 >= 3.0.2 -Requires: php-sebastian-environment4 >= 4.2.3 -Requires: php-sebastian-exporter3 >= 3.1.5 -Requires: php-sebastian-global-state3 -Requires: php-sebastian-object-enumerator3 >= 3.0.3 -Requires: php-sebastian-resource-operations2 >= 2.0.1 -Requires: php-sebastian-type >= 1.1.3 -Requires: php-phpunit-Version >= 2.0.1 -Requires: php-phpunit-php-invoker2 -%endif # Autoloader Requires: php-composer(fedora/autoloader) # From phpcompatinfo report for version 8.0.0 @@ -212,7 +164,7 @@ Documentation: https://phpunit.readthedocs.io/ %setup -q -n %{gh_project}-%{gh_commit} %patch -P0 -p0 -b .rpm -#find . -name \*.rpm -delete -print +find . -name \*.rpm -delete -print %build @@ -285,8 +237,6 @@ exit $ret %files -# remirepo:1 -%{!?_licensedir:%global license %%doc} %license LICENSE %doc README.md ChangeLog-%{ver_major}.%{ver_minor}.md %doc composer.json @@ -295,6 +245,10 @@ exit $ret %changelog +* Thu Jul 11 2024 Remi Collet <remi@remirepo.net> - 8.5.39-1 +- update to 8.5.39 +- raise dependencies + * Fri Apr 5 2024 Remi Collet <remi@remirepo.net> - 8.5.38-1 - update to 8.5.38 (no change) |