diff --git a/.gitignore b/.gitignore index 2c99574..90cf44c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,3 @@ /php-sebastian-environment4-4.2.1-3095910.tar.gz /php-sebastian-environment4-4.2.2-f2a2c8e.tar.gz /php-sebastian-environment4-4.2.3-464c90d.tar.gz -/php-sebastian-environment4-4.2.4-d47bbba.tar.gz -/php-sebastian-environment4-4.2.5-56932f6.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-environment4.spec b/php-sebastian-environment4.spec index f0d87f5..4f181ce 100644 --- a/php-sebastian-environment4.spec +++ b/php-sebastian-environment4.spec @@ -1,14 +1,14 @@ # remirepo/fedora spec file for php-sebastian-environment4 # -# Copyright (c) 2014-2024 Remi Collet -# License: CC-BY-SA-4.0 +# Copyright (c) 2014-2019 Remi Collet +# License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # %global bootstrap 0 # Sources -%global gh_commit 56932f6049a0482853056ffd617c91ffcc754205 +%global gh_commit 464c90d7bdf5ad4e8a6aea15c091fec0603d4368 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project environment @@ -27,14 +27,13 @@ %endif Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 4.2.5 -Release: 4%{?dist} -Summary: Handle HHVM/PHP environments, version %{major} +Version: 4.2.3 +Release: 1%{?dist} +Summary: Handle HHVM/PHP environments -License: BSD-3-Clause +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.1 @@ -45,11 +44,11 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 %if %{with_tests} # from composer.json, "require-dev": { # "phpunit/phpunit": "^7.5" -BuildRequires: phpunit8 +BuildRequires: phpunit7 >= 7.5 %endif # from composer.json, "require": { -# "php": ">=7.1" +# "php": "^7.1" Requires: php(language) >= 7.1 # From phpcompatinfo report for 4.0.1 Requires: php-pcre @@ -64,10 +63,6 @@ Provides: php-composer(%{pk_vendor}/%{pk_project}) = %{version} This component provides functionality that helps writing PHP code that has runtime-specific (PHP / HHVM) execution paths. -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} @@ -93,12 +88,10 @@ touch vendor/autoload.php : Run tests ret=0 -for cmd in php php81 php82 php83; do +for cmd in php php71 php72 php73 php74; do if which $cmd; then $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \ - %{_bindir}/phpunit8 \ - --filter '^((?!(testCanCollectCodeCoverageWhenPcovExtensionIsEnabled|testPCOVCanBeDetected)).)*$' \ - --verbose || ret=1 + %{_bindir}/phpunit7 --verbose || ret=1 fi done exit $ret @@ -114,63 +107,9 @@ exit $ret %changelog -* Fri Jul 25 2025 Fedora Release Engineering - 4.2.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Jan 18 2025 Fedora Release Engineering - 4.2.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 19 2024 Fedora Release Engineering - 4.2.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri Mar 1 2024 Remi Collet - 4.2.5-1 -- update to 4.2.5 (no change) -- sources from git snapshot - -* Thu Jan 25 2024 Fedora Release Engineering - 4.2.4-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 4.2.4-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jul 21 2023 Fedora Release Engineering - 4.2.4-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Apr 21 2023 Remi Collet - 4.2.4-7 -- use SPDX license ID - -* Fri Jan 20 2023 Fedora Release Engineering - 4.2.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Jul 22 2022 Fedora Release Engineering - 4.2.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jan 21 2022 Fedora Release Engineering - 4.2.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Jul 27 2021 Fedora Release Engineering - 4.2.4-3 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 4.2.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Nov 30 2020 Remi Collet - 4.2.4-1 -- update to 4.2.4 (no change) -- switch to phpunit8 - -* Tue Jul 28 2020 Fedora Release Engineering - 4.2.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Jan 30 2020 Fedora Release Engineering - 4.2.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - * Wed Nov 20 2019 Remi Collet - 4.2.3-1 - update to 4.2.3 -* Fri Jul 26 2019 Fedora Release Engineering - 4.2.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - * Mon May 6 2019 Remi Collet - 4.2.2-1 - update to 4.2.2 diff --git a/sources b/sources index 5d9e629..df7f5cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sebastian-environment4-4.2.5-56932f6.tgz) = a8e9eb0776764da44a2176eb1cf1ab195653283853474d8241b85dc5025812f5a811278989cf64632a69c0c01cf63658471b1fb5ecbcfde119813224c0acd5da +SHA512 (php-sebastian-environment4-4.2.3-464c90d.tar.gz) = db109911a0828f1232b3d965892d05290a51e23cf4f5856ee174690104d42d07c85dc96cac61861747f1bd5a1838713e01312b30490c68c33381893bd18698e6