summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2024-10-28 17:10:53 +0100
committerRemi Collet <remi@php.net>2024-10-28 17:10:53 +0100
commit8a640eb7e0b4dc4333604b3b22df40c4b7aa6237 (patch)
tree0349b996e3100e5675dfaa82fcf7b8e987eecf09
parent017464162e290c8d565eef35e192664340207d67 (diff)
fix patchHEADmaster
-rw-r--r--phpunit10-rpm.patch21
-rw-r--r--phpunit10.spec6
2 files changed, 20 insertions, 7 deletions
diff --git a/phpunit10-rpm.patch b/phpunit10-rpm.patch
index 0f7b1d0..0b4ef15 100644
--- a/phpunit10-rpm.patch
+++ b/phpunit10-rpm.patch
@@ -51,7 +51,7 @@ diff -up ./phpunit.rpm ./phpunit
+}
diff -up ./src/TextUI/Command/Commands/VersionCheckCommand.php.rpm ./src/TextUI/Command/Commands/VersionCheckCommand.php
--- ./src/TextUI/Command/Commands/VersionCheckCommand.php.rpm 2024-10-28 16:44:45.000000000 +0100
-+++ ./src/TextUI/Command/Commands/VersionCheckCommand.php 2024-10-28 16:49:46.388400560 +0100
++++ ./src/TextUI/Command/Commands/VersionCheckCommand.php 2024-10-28 17:08:20.070934441 +0100
@@ -39,7 +39,7 @@ final class VersionCheckCommand implemen
assert($latestVersion !== false);
@@ -61,7 +61,12 @@ diff -up ./src/TextUI/Command/Commands/VersionCheckCommand.php.rpm ./src/TextUI/
assert($latestCompatibleVersion !== false);
-@@ -52,7 +52,7 @@ final class VersionCheckCommand implemen
+@@ -48,11 +48,11 @@ final class VersionCheckCommand implemen
+
+ if (!$notLatest && !$notLatestCompatible) {
+ return Result::from(
+- 'You are using the latest version of PHPUnit.' . PHP_EOL,
++ 'You are using the latest version of PHPUnit.' . PHP_EOL . PHP_EOL,
);
}
@@ -133,8 +138,16 @@ diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
if ($phar) {
diff -up ./tests/unit/TextUI/Command/Commands/VersionCheckCommandTest.php.rpm ./tests/unit/TextUI/Command/Commands/VersionCheckCommandTest.php
--- ./tests/unit/TextUI/Command/Commands/VersionCheckCommandTest.php.rpm 2024-10-28 16:44:45.000000000 +0100
-+++ ./tests/unit/TextUI/Command/Commands/VersionCheckCommandTest.php 2024-10-28 16:48:35.645635304 +0100
-@@ -35,8 +35,9 @@ final class VersionCheckCommandTest exte
++++ ./tests/unit/TextUI/Command/Commands/VersionCheckCommandTest.php 2024-10-28 17:05:46.654936571 +0100
+@@ -28,15 +28,16 @@ final class VersionCheckCommandTest exte
+ {
+ return [
+ [
+- 'You are using the latest version of PHPUnit.' . PHP_EOL,
++ 'You are using the latest version of PHPUnit.' . PHP_EOL . PHP_EOL,
+ 10,
+ '10.5.0',
+ '10.5.0',
'10.5.0',
],
[
diff --git a/phpunit10.spec b/phpunit10.spec
index 252cc98..63bfdae 100644
--- a/phpunit10.spec
+++ b/phpunit10.spec
@@ -39,7 +39,7 @@
Name: %{pk_project}%{ver_major}
Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The PHP Unit Testing framework version %{ver_major}
License: BSD-3-Clause
@@ -173,7 +173,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
@@ -274,7 +274,7 @@ exit $ret
%changelog
-* Mon Oct 28 2024 Remi Collet <remi@remirepo.net> - 10.5.38-1
+* Mon Oct 28 2024 Remi Collet <remi@remirepo.net> - 10.5.38-2
- update to 10.5.38
* Mon Oct 21 2024 Remi Collet <remi@remirepo.net> - 10.5.37-1