diff --git a/.gitignore b/.gitignore index ee8e8ec..31d3000 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,2 @@ -clog /php-google-recaptcha-1.1.3-5a56d15.tar.gz /php-google-recaptcha-1.2.1-e7add3b.tar.gz -/php-google-recaptcha-1.2.2-c4a17d6.tar.gz -/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/makesrc.sh b/makesrc.sh deleted file mode 100755 index 87d223d..0000000 --- a/makesrc.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -NAME=$(basename $PWD) -OWNER=$(sed -n '/^%global gh_owner/{s/.* //;p}' $NAME.spec) -PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec) -VERSION=$(sed -n '/^Version:/{s/.* //;p}' $NAME.spec) -COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec) -SHORT=${COMMIT:0:7} - -echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n" - -echo "Cloning..." -rm -rf $PROJECT-$COMMIT -git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT - -echo "Getting commit..." -pushd $PROJECT-$COMMIT -git checkout $COMMIT -cp composer.json ../composer.json -popd - -echo "Archiving..." -tar czf $NAME-$VERSION-$SHORT.tgz --exclude .git $PROJECT-$COMMIT - -echo "Cleaning..." -rm -rf $PROJECT-$COMMIT - -echo "Done." diff --git a/php-google-recaptcha.spec b/php-google-recaptcha.spec index ebf56a0..a0ca082 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 Remi Collet +# License: CC-BY-SA +# http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global gh_commit 56522c261d2e8c58ba416c90f81a4cd9f2ed89b9 +%global gh_commit e7add3be59211482ecdb942288f52da64a35f61a %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner google %global gh_project recaptcha @@ -14,36 +14,40 @@ %global psr0 ReCaptcha Name: php-%{gh_owner}-%{gh_project} -Version: 1.3.1 -Release: 2%{?dist} +Version: 1.2.1 +Release: 1%{?dist} Summary: reCAPTCHA PHP client library -License: BSD-3-Clause +Group: Development/Libraries +License: BSD URL: https://github.com/%{gh_owner}/%{gh_project} -# git snapshot to retrieve test suite -Source0: %{name}-%{version}-%{?gh_short}.tgz -Source1: makesrc.sh +Source0: %{url}/archive/%{gh_commit}/%{name}-%{version}-%{?gh_short}.tar.gz BuildArch: noarch %if %{with_tests} -BuildRequires: php(language) >= 8 +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": "^10", -# "friendsofphp/php-cs-fixer": "^3.14", -# "php-coveralls/php-coveralls": "^2.5" -BuildRequires: phpunit10 +# "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) # From composer.json, "require": { -# "php": ">=8" -Requires: php(language) >= 8 +# "php": ">=5.5" +Requires: php(language) >= 5.5 # 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 +94,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 %phpunit" "php56 %{_bindir}/phpunit" "php70 %{_bindir}/phpunit6" php71 php72 php73; do if which $cmdarg; then set $cmdarg - $1 ${2:-%{_bindir}/phpunit10} \ - -d date.timezone=UTC \ - --bootstrap=$BOOTSTRAP \ - --no-coverage || ret=1 + $1 ${2:-%{_bindir}/phpunit7} --bootstrap=$BOOTSTRAP --verbose || ret=0 fi done exit $ret @@ -106,6 +107,7 @@ exit $ret %files +%{!?_licensedir:%global license %%doc} %license LICENSE %doc composer.json %doc *.md @@ -113,68 +115,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 - -* Mon Feb 20 2023 Remi Collet - 1.3.0-1 -- update to 1.3.0 -- raise dependency on PHP 8 - -* Fri Jan 20 2023 Fedora Release Engineering - 1.2.4-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Jul 22 2022 Fedora Release Engineering - 1.2.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jan 21 2022 Fedora Release Engineering - 1.2.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.2.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 1.2.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 1.2.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Apr 1 2020 Remi Collet - 1.2.4-1 -- update to 1.2.4 - -* Thu Jan 30 2020 Fedora Release Engineering - 1.2.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Mon Aug 19 2019 Remi Collet - 1.2.3-1 -- update to 1.2.3 - -* Fri Jul 26 2019 Fedora Release Engineering - 1.2.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Wed Jun 19 2019 Remi Collet - 1.2.2-1 -- update to 1.2.2 - -* Sat Feb 02 2019 Fedora Release Engineering - 1.2.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - * Mon Aug 20 2018 Remi Collet - 1.2.1-1 - update to 1.2.1 - use phpunit7 diff --git a/sources b/sources index 1999a36..0b10230 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-google-recaptcha-1.3.1-56522c2.tgz) = c1eda00dcb54ad91601c05b572b68a9ca657fc53723abc78ccb8807d1facbfb49386335377c04aabd415c5de2a95619728963090f49236d71d0b7b79db0df889 +SHA512 (php-google-recaptcha-1.2.1-e7add3b.tar.gz) = 6574c4ff556849644b3bb0e37356c81465068d33bdf4572e344cfb9e190aa8bbfa7bc451ba1eaffed8f65906e6b28a5688ca30f4047bd6d36f95b2c574cc700e