diff --git a/.gitignore b/.gitignore index 240fd80..31d3000 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /php-google-recaptcha-1.1.3-5a56d15.tar.gz +/php-google-recaptcha-1.2.1-e7add3b.tar.gz diff --git a/php-google-recaptcha.spec b/php-google-recaptcha.spec index 3d792c3..a0ca082 100644 --- a/php-google-recaptcha.spec +++ b/php-google-recaptcha.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 5a56d15ca10a7b75158178752b2ad8f755eb4f78 +%global gh_commit e7add3be59211482ecdb942288f52da64a35f61a %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner google %global gh_project recaptcha @@ -14,8 +14,8 @@ %global psr0 ReCaptcha Name: php-%{gh_owner}-%{gh_project} -Version: 1.1.3 -Release: 4%{?dist} +Version: 1.2.1 +Release: 1%{?dist} Summary: reCAPTCHA PHP client library Group: Development/Libraries @@ -27,12 +27,14 @@ BuildArch: noarch %if %{with_tests} BuildRequires: php(language) >= 5.5 BuildRequires: php-curl +BuildRequires: php-date BuildRequires: php-json BuildRequires: php-pcre BuildRequires: php-spl # For tests, from composer.json "require-dev": { -# "phpunit/phpunit": "^4.8" -BuildRequires: php-composer(phpunit/phpunit) >= 4.8 +# "phpunit/phpunit": "^4.8.36|^5.7.27|^6.59|^7" +BuildRequires: phpunit7 +%global phpunit %{_bindir}/phpunit7 %endif # For autoloader BuildRequires: php-composer(fedora/autoloader) @@ -40,8 +42,9 @@ BuildRequires: php-composer(fedora/autoloader) # From composer.json, "require": { # "php": ">=5.5" Requires: php(language) >= 5.5 -# From phpcompatinfo report for 1.1.2 +# From phpcompatinfo report for 1.2.1 Requires: php-curl +Requires: php-date Requires: php-json Requires: php-pcre Requires: php-spl @@ -59,6 +62,8 @@ reCAPTCHA is a free CAPTCHA service that protect websites from spam and abuse. This is Google authored code that provides plugins for third-party integration with reCAPTCHA. +See https://www.google.com/recaptcha/ + Autoloader: %{_datadir}/php/%{psr0}/autoload.php @@ -89,9 +94,10 @@ cp -pr src/%{psr0} %{buildroot}%{_datadir}/php/%{psr0} BOOTSTRAP=%{buildroot}%{_datadir}/php/%{psr0}/autoload.php ret=0 -for cmd in php56 php70 php71 php; do - if which $cmd; then - $cmd %{_bindir}/phpunit --bootstrap=$BOOTSTRAP --verbose || ret=0 +for cmdarg in "php %phpunit" "php56 %{_bindir}/phpunit" "php70 %{_bindir}/phpunit6" php71 php72 php73; do + if which $cmdarg; then + set $cmdarg + $1 ${2:-%{_bindir}/phpunit7} --bootstrap=$BOOTSTRAP --verbose || ret=0 fi done exit $ret @@ -109,6 +115,11 @@ exit $ret %changelog +* Mon Aug 20 2018 Remi Collet - 1.2.1-1 +- update to 1.2.1 +- use phpunit7 +- open https://github.com/google/recaptcha/issues/250 - CHANGELOG + * Fri Jul 13 2018 Fedora Release Engineering - 1.1.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index d32c422..0b10230 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-google-recaptcha-1.1.3-5a56d15.tar.gz) = ac1bee8ccdf12a22926861a7a503e23554dbdda0e4aefee9a1afa27764b84bbfba90f533ab7fa99fd872648a75ceadaef15ae0cf0a46d479f8a8c53e32039574 +SHA512 (php-google-recaptcha-1.2.1-e7add3b.tar.gz) = 6574c4ff556849644b3bb0e37356c81465068d33bdf4572e344cfb9e190aa8bbfa7bc451ba1eaffed8f65906e6b28a5688ca30f4047bd6d36f95b2c574cc700e