diff --git a/.gitignore b/.gitignore index 5a7eee3..f438539 100644 --- a/.gitignore +++ b/.gitignore @@ -45,4 +45,3 @@ clog /php-phpseclib-2.0.48-eaa7be7.tgz /php-phpseclib3-3.0.43.zip /php-phpseclib3-3.0.44.zip -/php-phpseclib3-3.0.48.zip diff --git a/php-phpseclib3.spec b/php-phpseclib3.spec index 8ee3c91..52a6606 100644 --- a/php-phpseclib3.spec +++ b/php-phpseclib3.spec @@ -5,7 +5,7 @@ %global github_name phpseclib %bcond_without tests -Version: 3.0.48 +Version: 3.0.44 Release: 1%{?dist} %global vmajor %(v="%{version}"; v=(${v//./ }); echo "${v[0]}") @@ -20,34 +20,25 @@ Source2: makesrc.sh BuildArch: noarch -%global php_min_version 5.6.1 -%define depends_on() %{expand: -Requires: %{*} - %if %{with tests} -BuildRequires: %{*} -%endif -} - -%depends_on php-bcmath >= %{php_min_version} -%depends_on php-gmp >= %{php_min_version} -%depends_on php-mcrypt >= %{php_min_version} -%depends_on php-openssl >= %{php_min_version} -%depends_on php-sodium >= %{php_min_version} -%depends_on php-xml >= %{php_min_version} -%depends_on php-composer(paragonie/constant_time_encoding) - -BuildRequires: php-fedora-autoloader-devel - -%if %{with tests} -%global phpunit_bin %{_bindir}/phpunit9 +BuildRequires: php(language) >= 5.6.1 BuildRequires: php-composer(fedora/autoloader) -BuildRequires: php-cli >= %{php_min_version} -BuildRequires: %{phpunit_bin} +BuildRequires: php-fedora-autoloader-devel +BuildRequires: %{_bindir}/phpunit9 +BuildRequires: %{_bindir}/phpab +# Optional at runtime, to avoid too muck skipped tests +BuildRequires: php-bcmath +BuildRequires: php-gmp %endif +Requires: php(language) >= 5.6.1 +Requires: php-bcmath +Requires: php-gmp +Requires: php-openssl +Requires: php-xml # Autoloader Requires: php-composer(fedora/autoloader) + Provides: php-composer(%{composer_vendor}/%{composer_project}) = %{version} @@ -67,7 +58,6 @@ phpab \ --output autoload.php \ --basedir phpseclib/ \ ./composer.json -echo "require_once '%{_datadir}/php/ParagonIE/ConstantTime/autoload.php';" >> autoload.php cat autoload.php @@ -101,9 +91,16 @@ php tests/make_compatible_with_phpunit9.php # from travis/run-phpunit.sh # testAuthorityInfoAccess fails without internet access # testCurveExistance as we remove some files -php -d memory_limit=1G %{phpunit_bin} \ - --filter '^((?!(testAuthorityInfoAccess|testCurveExistance|testLoginToInvalidServer)).)*$' \ - --verbose --configuration tests/phpunit.xml +ret=0 +for cmd in "php %{phpunit}" php80 php81 php82; do + if which $cmd; then + set $cmd + $1 -d memory_limit=1G ${2:-%{_bindir}/phpunit9} \ + --filter '^((?!(testAuthorityInfoAccess|testCurveExistance|testLoginToInvalidServer)).)*$' \ + --verbose --configuration tests/phpunit.xml || ret=1 + fi +done +exit $ret %endif @@ -114,12 +111,6 @@ php -d memory_limit=1G %{phpunit_bin} \ %changelog -* Sat Jan 03 2026 Artur Frenszek-Iwicki - 3.0.48-1 -- Update to v3.0.48 - -* Fri Jul 25 2025 Fedora Release Engineering - 3.0.44-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - * Sun Jun 15 2025 Artur Frenszek-Iwicki - 3.0.44-1 - Update to v3.0.44 diff --git a/sources b/sources index 8e5a8be..5f3bc17 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpseclib3-3.0.48.zip) = 6b6ebdfab49151c243a6c7329cf6d35b05be0f3b9ffebf118bb371f2488cd7ca5d8a5e08566aa31c876ea18a76fab36b7b3c47b4d63ef02dba7a2709ea3a9aa2 +SHA512 (php-phpseclib3-3.0.44.zip) = 8e651ba4b3fbecb19389f025b0d242c861badd7887b23b7d8b2e487b8299bb8acf8709aa84a975b1a12eda3a69ade33126199e3da4724542e6031eda0f6c8b4e