diff --git a/.gitignore b/.gitignore index ecc52e8..441cdcb 100644 --- a/.gitignore +++ b/.gitignore @@ -9,5 +9,3 @@ /php-paragonie-constant-time-encoding-2.6.1-d6e1d5d.tgz /php-paragonie-constant-time-encoding-2.6.2-c1b1d82.tgz /php-paragonie-constant-time-encoding-2.6.3-58c3f47.tgz -/php-paragonie-constant-time-encoding-2.8.0-ce27936.tgz -/php-paragonie-constant-time-encoding-2.8.2-e30811f.tgz diff --git a/php-paragonie-constant-time-encoding.spec b/php-paragonie-constant-time-encoding.spec index 3864b96..8709c16 100644 --- a/php-paragonie-constant-time-encoding.spec +++ b/php-paragonie-constant-time-encoding.spec @@ -5,13 +5,13 @@ %global github_owner paragonie %global github_name constant_time_encoding -%global commit0 e30811f7bc69e4b5b6d5783e712c06c8eabf0226 +%global commit0 58c3f47f650c94ec05a151692652a868995d2938 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: php-%{composer_vendor}-constant-time-encoding -Version: 2.8.2 -Release: 1%{?dist} +Version: 2.6.3 +Release: 8%{?dist} Summary: Constant-time Implementations of RFC 4648 Encoding License: MIT @@ -27,7 +27,14 @@ BuildRequires: php(language) >= 7 BuildRequires: php-mbstring BuildRequires: php-spl # "phpunit/phpunit": "^6|^7|^8|^9" +%if 0%{?fedora} >= 32 || 0%{?rhel} >= 9 BuildRequires: phpunit9 +%global phpunit %{_bindir}/phpunit9 +%else +BuildRequires: phpunit8 +%global phpunit %{_bindir}/phpunit8 +%endif + BuildRequires: php-fedora-autoloader-devel # "php": "^7|^8" @@ -35,8 +42,6 @@ Requires: php(language) >= 7 Requires: php-mbstring Requires: php-spl -Suggests: php-sodium - Provides: php-composer(%{composer_vendor}/%{composer_project}) = %{version} %description @@ -57,7 +62,7 @@ cp -pr src/* %{buildroot}%{_datadir}/php/%{composer_namespace} %check %{_bindir}/phpab -t fedora -o tests/autoload.php src tests -%{_bindir}/phpunit9 tests --verbose --bootstrap=tests/autoload.php +%{phpunit} tests --verbose --bootstrap=tests/autoload.php %files %dir %{_datadir}/php/ParagonIE @@ -66,17 +71,6 @@ cp -pr src/* %{buildroot}%{_datadir}/php/%{composer_namespace} %license LICENSE.txt %changelog -* Wed Oct 01 2025 François Kooman - 2.8.2-1 -- update to 2.8.2 - -* Tue Sep 23 2025 François Kooman - 2.8.0-1 -- update to 2.8.0 -- hard build dependency on PHPUnit 9 now -- add php-sodium extension as a suggestion - -* Fri Jul 25 2025 Fedora Release Engineering - 2.6.3-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - * Sat Jan 18 2025 Fedora Release Engineering - 2.6.3-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index aa26ef3..dadaba6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-paragonie-constant-time-encoding-2.8.2-e30811f.tgz) = 06ed2956086022e92f95b3b30e4222a3511de7cb22de038a92c080424443f7745528c8ab916b9848e06b1312711dc32415bbcf592008bd0026ac7413651e0291 +SHA512 (php-paragonie-constant-time-encoding-2.6.3-58c3f47.tgz) = 91ec951ddb263abcf81c427afff570b88d52b30186f920454f23810f0dbafcc3aa44d36ec912d4865db0ab2aed78cf96ac969e9fbf43247a7bb4a95b7eadc6fa