diff --git a/.gitignore b/.gitignore index 816e691..318a425 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,3 @@ /php-sebastian-global-state3-3.0.0-edf8a46.tar.gz /php-sebastian-global-state3-3.0.1-474fb9e.tar.gz /php-sebastian-global-state3-3.0.2-de036ec.tar.gz -/php-sebastian-global-state3-3.0.3-66783ce.tar.gz -/php-sebastian-global-state3-3.0.5-91c7c47.tgz -/php-sebastian-global-state3-3.0.6-8006894.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-global-state3.spec b/php-sebastian-global-state3.spec index e6f0847..29c6695 100644 --- a/php-sebastian-global-state3.spec +++ b/php-sebastian-global-state3.spec @@ -1,13 +1,13 @@ # spec file for php-sebastian-global-state3 # -# SPDX-FileCopyrightText: Copyright 2014-2025 Remi Collet -# SPDX-License-Identifier: CECILL-2.1 -# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt +# Copyright (c) 2014-2022 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 800689427e3e8cf57a8fe38fcd1d4344c9b2f046 +%global gh_commit de036ec91d55d2a9e0db2ba975b512cdb1c23921 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project global-state @@ -24,19 +24,20 @@ %endif Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 3.0.6 -Release: 1%{?dist} -Summary: Snapshotting of global state, version %{major} +Version: 3.0.2 +Release: 2%{?dist} +Summary: Snapshotting of global state License: BSD-3-Clause 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 Patch0: %{name}-tests.patch BuildArch: noarch BuildRequires: php(language) >= 7.2 +BuildRequires: php-reflection +BuildRequires: php-spl # Autoloader BuildRequires: php-fedora-autoloader-devel >= 1.0.0 %if %{with_tests} @@ -57,6 +58,8 @@ Requires: php(language) >= 7.2 Requires: (php-composer(sebastian/object-reflector) >= 1.1.1 with php-composer(sebastian/object-reflector) < 2) Requires: (php-composer(sebastian/recursion-context) >= 3.0 with php-composer(sebastian/recursion-context) < 4) # from phpcompatinfo report for version 2.0.0 +Requires: php-reflection +Requires: php-spl # from composer.json, "suggest": { # "ext-uopz": "*" %if 0%{?fedora} > 21 || 0%{?rhel} >= 8 @@ -72,14 +75,10 @@ Provides: php-composer(%{pk_vendor}/%{pk_project}) = %{version} Snapshotting of global state, factored out of PHPUnit into a stand-alone component. -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} -%patch -P0 -p1 +%patch0 -p1 %build @@ -114,7 +113,7 @@ EOF : Run upstream test suite ret=0 # testCanExportGlobalVariablesToCode reports our autoloader -for cmd in php php81 php82 php83 php84 php85; do +for cmd in php php80 php81 php82; do if which $cmd; then $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \ %{_bindir}/phpunit8 \ @@ -137,47 +136,10 @@ exit $ret %changelog -* Mon Aug 11 2025 Remi Collet - 3.0.6-1 -- update to 3.0.6 - -* Fri Jul 25 2025 Fedora Release Engineering - 3.0.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Jan 18 2025 Fedora Release Engineering - 3.0.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 19 2024 Fedora Release Engineering - 3.0.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Mar 5 2024 Remi Collet - 3.0.5-1 -- update to 3.0.5 -- sources from git snapshot - -* Thu Jan 25 2024 Fedora Release Engineering - 3.0.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 3.0.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Aug 2 2023 Remi Collet - 3.0.3-1 -- update to 3.0.3 - -* Fri Jul 21 2023 Fedora Release Engineering - 3.0.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Apr 21 2023 Remi Collet - 3.0.2-4 -- improve description and summary - -* Fri Jan 20 2023 Fedora Release Engineering - 3.0.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - * Thu Dec 15 2022 Remi Collet - 3.0.2-2 - update to 3.0.2 - use SPDX License id -* 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 diff --git a/sources b/sources index fb6fac3..d1171b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sebastian-global-state3-3.0.6-8006894.tgz) = 668cf9c7b5c17040a189235ff49b96546fe4b20f34860776a23791d0524bcb205f4832df4d1075b44e2143e15dcf4ead47ce77a0f1a11657dc21f7f2a4489760 +SHA512 (php-sebastian-global-state3-3.0.2-de036ec.tar.gz) = 5ab70895edb583825946b0b14e28e0640afd44152c8958f3164671ac0b413c77e9f153d71eaf28c6ba171a3179c7d5ce15ad628a763d35d8c6a512f6854f5d7d