diff --git a/.gitignore b/.gitignore index ee8e8ec..fc2a6ca 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,3 @@ clog /php-google-recaptcha-1.2.3-98c4a65.tar.gz /php-google-recaptcha-1.2.4-614f25a.tar.gz /php-google-recaptcha-1.3.0-d59a801.tgz -/php-google-recaptcha-1.3.1-56522c2.tgz diff --git a/php-google-recaptcha.spec b/php-google-recaptcha.spec index ebf56a0..a9762ec 100644 --- a/php-google-recaptcha.spec +++ b/php-google-recaptcha.spec @@ -1,12 +1,12 @@ # remirepo/fedora spec file for php-google-recaptcha # -# SPDX-FileCopyrightText: Copyright 2017-2025 Remi Collet -# SPDX-License-Identifier: CECILL-2.1 -# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt +# Copyright (c) 2017-2023 Remi Collet +# License: CC-BY-SA-4.0 +# http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global gh_commit 56522c261d2e8c58ba416c90f81a4cd9f2ed89b9 +%global gh_commit d59a801e98a4e9174814a6d71bbc268dff1202df %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner google %global gh_project recaptcha @@ -14,7 +14,7 @@ %global psr0 ReCaptcha Name: php-%{gh_owner}-%{gh_project} -Version: 1.3.1 +Version: 1.3.0 Release: 2%{?dist} Summary: reCAPTCHA PHP client library @@ -28,12 +28,16 @@ BuildArch: noarch %if %{with_tests} BuildRequires: php(language) >= 8 BuildRequires: php-curl +BuildRequires: php-date BuildRequires: php-json +BuildRequires: php-pcre +BuildRequires: php-spl # For tests, from composer.json "require-dev": { # "phpunit/phpunit": "^10", # "friendsofphp/php-cs-fixer": "^3.14", # "php-coveralls/php-coveralls": "^2.5" -BuildRequires: phpunit10 +# Keep phpunit9 for PHP 8.0 +BuildRequires: phpunit9 %endif # For autoloader BuildRequires: php-composer(fedora/autoloader) @@ -43,7 +47,10 @@ BuildRequires: php-composer(fedora/autoloader) Requires: php(language) >= 8 # From phpcompatinfo report for 1.2.1 Requires: php-curl +Requires: php-date Requires: php-json +Requires: php-pcre +Requires: php-spl # For generated autoloader Requires: php-composer(fedora/autoloader) @@ -90,13 +97,10 @@ cp -pr src/%{psr0} %{buildroot}%{_datadir}/php/%{psr0} BOOTSTRAP=%{buildroot}%{_datadir}/php/%{psr0}/autoload.php ret=0 -for cmdarg in php php81 php82 php83 php84; do +for cmdarg in php php80 "php81 %{_bindir}/phpunit10" "php82 %{_bindir}/phpunit10"; do if which $cmdarg; then set $cmdarg - $1 ${2:-%{_bindir}/phpunit10} \ - -d date.timezone=UTC \ - --bootstrap=$BOOTSTRAP \ - --no-coverage || ret=1 + $1 ${2:-%{_bindir}/phpunit9} --bootstrap=$BOOTSTRAP || ret=0 fi done exit $ret @@ -106,6 +110,7 @@ exit $ret %files +%{!?_licensedir:%global license %%doc} %license LICENSE %doc composer.json %doc *.md @@ -113,25 +118,6 @@ exit $ret %changelog -* Fri Jul 25 2025 Fedora Release Engineering - 1.3.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Fri Jun 27 2025 Remi Collet - 1.3.1-1 -- update to 1.3.1 -- re-license spec file to CECILL-2.1 - -* Sat Jan 18 2025 Fedora Release Engineering - 1.3.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 19 2024 Fedora Release Engineering - 1.3.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 1.3.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 1.3.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - * Fri Jul 21 2023 Fedora Release Engineering - 1.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 1999a36..b51df95 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-google-recaptcha-1.3.1-56522c2.tgz) = c1eda00dcb54ad91601c05b572b68a9ca657fc53723abc78ccb8807d1facbfb49386335377c04aabd415c5de2a95619728963090f49236d71d0b7b79db0df889 +SHA512 (php-google-recaptcha-1.3.0-d59a801.tgz) = 3dc26a7b7b09a59216bce94b8ce76d537bce9804dfe945c3263cabf073d9196302a3caac75a13021ba8acd141ff3419f09cee502d44f20da204a768c4992ac80