diff --git a/.gitignore b/.gitignore index a9b387c..e2e14ff 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,2 @@ clog /php-sebastian-recursion-context3-3.0.0-5b0cd72.tar.gz -/php-sebastian-recursion-context3-3.0.1-367dcba.tar.gz -/php-sebastian-recursion-context3-3.0.2-9bfd3c6.tgz diff --git a/makesrc.sh b/makesrc.sh deleted file mode 100755 index 3d8028d..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-vcs --exclude tools $PROJECT-$COMMIT - -echo "Cleaning..." -rm -rf $PROJECT-$COMMIT - -echo "Done." diff --git a/php-sebastian-recursion-context3.spec b/php-sebastian-recursion-context3.spec index ce5c97b..8700fdc 100644 --- a/php-sebastian-recursion-context3.spec +++ b/php-sebastian-recursion-context3.spec @@ -1,20 +1,18 @@ # remirepo/fedora spec file for php-sebastian-recursion-context3 # -# Copyright (c) 2015-2024 Remi Collet -# License: CC-BY-SA-4.0 +# Copyright (c) 2015-2017 Remi Collet +# License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 9bfd3c6f1f08c026f542032dfb42813544f7d64c +%global gh_commit 5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project recursion-context %global pk_vendor sebastian %global pk_project %{gh_project} -%global ns_vendor SebastianBergmann -%global ns_project RecursionContext %global major 3 %global php_home %{_datadir}/php %if %{bootstrap} @@ -23,17 +21,15 @@ %global with_tests %{?_without_tests:0}%{!?_without_tests:1} %endif -# NOTICE: used by phpunit 6, 7 and 8 - Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 3.0.2 +Version: 3.0.0 Release: 4%{?dist} -Summary: Recursively process PHP variables, version %{major} +Summary: Recursively process PHP variables -License: BSD-3-Clause +Group: Development/Libraries +License: BSD URL: https://github.com/%{gh_owner}/%{gh_project} -Source0: %{name}-%{version}-%{gh_short}.tgz -Source1: makesrc.sh +Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz BuildArch: noarch BuildRequires: php(language) >= 7.0 @@ -41,11 +37,11 @@ BuildRequires: php-fedora-autoloader-devel %if %{with_tests} # from composer.json, "require-dev": { # "phpunit/phpunit": "^6.0" -BuildRequires: phpunit8 +BuildRequires: phpunit6 %endif # from composer.json -# "php": ">=7.0" +# "php": "^7.0" Requires: php(language) >= 7.0 # from phpcompatinfo report for version 3.0.0 Requires: php-spl @@ -58,10 +54,6 @@ Provides: php-composer(%{pk_vendor}/%{pk_project}) = %{version} %description Provides functionality to recursively process PHP variables. -This package provides the version %{major} of the library. - -Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php - %prep %setup -q -n %{gh_project}-%{gh_commit} @@ -73,8 +65,8 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php %install -mkdir -p %{buildroot}%{php_home}/%{ns_vendor} -cp -pr src %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major} +mkdir -p %{buildroot}%{php_home}/SebastianBergmann +cp -pr src %{buildroot}%{php_home}/SebastianBergmann/RecursionContext%{major} %check @@ -82,15 +74,12 @@ cp -pr src %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major} mkdir vendor touch vendor/autoload.php -: Fix for phpunit8 -find tests/ -name \*php -exec sed -e 's/setUp()/setUp():void/' -i {} \; - : Run upstream test suite ret=0 -for cmd in php php81 php82 php83; do +for cmd in php70 php71 php; do if which $cmd; then - %{_bindir}/php -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \ - %{_bindir}/phpunit8 --verbose || ret=1 + %{_bindir}/php -d include_path=.:%{buildroot}%{_datadir}/php:%{_datadir}/php \ + %{_bindir}/phpunit6 --verbose || ret=1 fi done exit $ret @@ -100,75 +89,14 @@ exit $ret %files +%{!?_licensedir:%global license %%doc} %license LICENSE %doc README.md composer.json -%dir %{php_home}/%{ns_vendor} - %{php_home}/%{ns_vendor}/%{ns_project}%{major} +%dir %{php_home}/SebastianBergmann + %{php_home}/SebastianBergmann/RecursionContext%{major} %changelog -* Fri Jul 25 2025 Fedora Release Engineering - 3.0.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Jan 18 2025 Fedora Release Engineering - 3.0.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 19 2024 Fedora Release Engineering - 3.0.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri Mar 1 2024 Remi Collet - 3.0.2-1 -- update to 3.0.2 (no change) -- sources from git snapshot - -* Thu Jan 25 2024 Fedora Release Engineering - 3.0.1-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 3.0.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jul 21 2023 Fedora Release Engineering - 3.0.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Apr 21 2023 Remi Collet - 3.0.1-8 -- use SPDX License id - -* Fri Jan 20 2023 Fedora Release Engineering - 3.0.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Jul 22 2022 Fedora Release Engineering - 3.0.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jan 21 2022 Fedora Release Engineering - 3.0.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Jul 27 2021 Fedora Release Engineering - 3.0.1-4 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Mar 10 2021 Remi Collet - 3.0.1-3 -- switch to phpunit8 - -* Wed Jan 27 2021 Fedora Release Engineering - 3.0.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Nov 30 2020 Remi Collet - 3.0.1-1 -- update to 3.0.1 (no change) - -* Tue Jul 28 2020 Fedora Release Engineering - 3.0.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Jan 30 2020 Fedora Release Engineering - 3.0.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Jul 26 2019 Fedora Release Engineering - 3.0.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Feb 02 2019 Fedora Release Engineering - 3.0.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 3.0.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - * Fri Feb 09 2018 Fedora Release Engineering - 3.0.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index c8c24f1..c7041c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sebastian-recursion-context3-3.0.2-9bfd3c6.tgz) = c2a0846deef3ab1c96c1c58197a13592e540e8d31ef5db449f5d866136e2b47070edd63a0c2b3c4fe0e4ebbd357c9eb42a871df681fd1a7459ea4b650700c864 +SHA512 (php-sebastian-recursion-context3-3.0.0-5b0cd72.tar.gz) = 10b6a2c163c240cc1376c906698cdbfd2c485f976016a880847f4bf9a9224c1121be22e2ab7aa07035132176492eb5ff7375c21e2b80f4a1f39011e22ef0910f