diff options
Diffstat (limited to 'php-ramsey-uuid.spec')
| -rw-r--r-- | php-ramsey-uuid.spec | 44 |
1 files changed, 19 insertions, 25 deletions
diff --git a/php-ramsey-uuid.spec b/php-ramsey-uuid.spec index a8171f5..202e91e 100644 --- a/php-ramsey-uuid.spec +++ b/php-ramsey-uuid.spec @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit cd4032040a750077205918c86049aa0f43d22947 +%global gh_commit 7231612a5221f5524d3575bebdce20eeef8547a1 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner ramsey %global gh_project uuid @@ -22,8 +22,8 @@ %global ns_project Uuid Name: php-%{pk_vendor}-%{pk_name} -Version: 4.1.1 -Release: 3%{?dist} +Version: 4.2.0 +Release: 1%{?dist} Summary: Library for generating and working with UUIDs License: MIT @@ -32,10 +32,6 @@ Source0: %{name}-%{version}-%{gh_short}.tgz # Create git snapshot as tests are excluded from official tarball Source1: makesrc.sh -# don't use codeception/aspect-mock -Patch0: %{name}-tests.patch -Patch1: https://patch-diff.githubusercontent.com/raw/ramsey/uuid/pull/352.patch - BuildArch: noarch BuildRequires: php(language) >= 7.2 @@ -46,46 +42,42 @@ BuildRequires: php-json BuildRequires: php-pcre BuildRequires: php-spl # From composer.json, "require-dev": { -# "codeception/aspect-mock": "^3", -# "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7.0", +# "captainhook/captainhook": "^5.10", +# "captainhook/plugin-composer": "^5.3", +# "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", # "doctrine/annotations": "^1.8", -# "goaop/framework": "^2", +# "ergebnis/composer-normalize": "^2.15", # "mockery/mockery": "^1.3", # "moontoast/math": "^1.1", # "paragonie/random-lib": "^2", +# "php-mock/php-mock": "^2.2", # "php-mock/php-mock-mockery": "^1.3", -# "php-mock/php-mock-phpunit": "^2.5", # "php-parallel-lint/php-parallel-lint": "^1.1", -# "phpbench/phpbench": "^0.17.1", +# "phpbench/phpbench": "^1.0", # "phpstan/extension-installer": "^1.0", # "phpstan/phpstan": "^0.12", # "phpstan/phpstan-mockery": "^0.12", # "phpstan/phpstan-phpunit": "^0.12", -# "phpunit/phpunit": "^8.5", -# "psy/psysh": "^0.10.0", -# "slevomat/coding-standard": "^6.0", +# "phpunit/phpunit": "^8.5 || ^9", +# "slevomat/coding-standard": "^7.0", # "squizlabs/php_codesniffer": "^3.5", -# "vimeo/psalm": "3.9.4" +# "vimeo/psalm": "^4.9" %if %{with tests} # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-composer(brick/math) >= 0.8 with php-composer(brick/math) < 0.10) BuildRequires: (php-composer(ramsey/collection) >= 1.0 with php-composer(ramsey/collection) < 2) BuildRequires: (php-composer(mockery/mockery) >= 1.3 with php-composer(mockery/mockery) < 2) -# remirepo:5 +BuildRequires: (php-composer(php-mock/php-mock) >= 2.2 with php-composer(php-mock/php-mock) < 3) +# remirepo:6 %else BuildRequires: php-brick-math >= 0.8 BuildRequires: php-ramsey-collection >= 1.0 BuildRequires: php-mockery >= 1.3 +BuildRequires: php-mock2 >= 2.2 %endif -%if 0%{?fedora} >= 32 || 0%{?rhel} >= 9 -# https://github.com/ramsey/uuid/pull/350 BuildRequires: phpunit9 %global phpunit %{_bindir}/phpunit9 -%else -BuildRequires: phpunit8 >= 8.5 -%global phpunit %{_bindir}/phpunit8 -%endif %endif # Autoloader BuildRequires: php-fedora-autoloader-devel @@ -129,8 +121,6 @@ Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p1 -b .rpm -%patch1 -p1 -b .pr352 %build @@ -164,6 +154,7 @@ require '%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('%{ns_vendor}\\%{ns_project}\\Test\\', dirname(__DIR__) . '/tests'); \Fedora\Autoloader\Dependencies::required([ '%{_datadir}/php/Mockery1/autoload.php', + '%{_datadir}/tests/phpmock2/autoload.php', ]); EOF @@ -200,6 +191,9 @@ exit $ret %changelog +* Mon Aug 9 2021 Remi Collet <remi@remirepo.net> - 4.2.0-1 +- update to 4.2.0 + * Fri Jan 29 2021 Remi Collet <remi@remirepo.net> - 4.1.1-3 - ignore 2 tests and fix FTBFS |