diff --git a/.gitignore b/.gitignore index 5ca501b..2c99574 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,6 @@ /php-sebastian-environment4-4.1.0-6fda8ce.tar.gz /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 new file mode 100755 index 0000000..3d8028d --- /dev/null +++ b/makesrc.sh @@ -0,0 +1,28 @@ +#!/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 6a43aab..f0d87f5 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-2019 Remi Collet -# License: CC-BY-SA +# Copyright (c) 2014-2024 Remi Collet +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # %global bootstrap 0 # Sources -%global gh_commit f2a2c8e1c97c11ace607a7a667d73d47c19fe404 +%global gh_commit 56932f6049a0482853056ffd617c91ffcc754205 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project environment @@ -27,13 +27,14 @@ %endif Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 4.2.2 -Release: 1%{?dist} -Summary: Handle HHVM/PHP environments +Version: 4.2.5 +Release: 4%{?dist} +Summary: Handle HHVM/PHP environments, version %{major} -License: BSD +License: BSD-3-Clause URL: https://github.com/%{gh_owner}/%{gh_project} -Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz +Source0: %{name}-%{version}-%{gh_short}.tgz +Source1: makesrc.sh BuildArch: noarch BuildRequires: php(language) >= 7.1 @@ -44,11 +45,11 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 %if %{with_tests} # from composer.json, "require-dev": { # "phpunit/phpunit": "^7.5" -BuildRequires: phpunit7 >= 7.5 +BuildRequires: phpunit8 %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 @@ -63,6 +64,10 @@ 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} @@ -88,10 +93,12 @@ touch vendor/autoload.php : Run tests ret=0 -for cmd in php php71 php72 php73; do +for cmd in php php81 php82 php83; do if which $cmd; then $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \ - %{_bindir}/phpunit7 --verbose || ret=1 + %{_bindir}/phpunit8 \ + --filter '^((?!(testCanCollectCodeCoverageWhenPcovExtensionIsEnabled|testPCOVCanBeDetected)).)*$' \ + --verbose || ret=1 fi done exit $ret @@ -107,6 +114,63 @@ 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 a408941..5d9e629 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sebastian-environment4-4.2.2-f2a2c8e.tar.gz) = dfd0faff67d81e165ed6b4a768367b7f9c0f0978fea67483e7903088efc977cbe0427ee660d43285011d9c6445b37bdf29951853cf0adcaa2b965370c39d2969 +SHA512 (php-sebastian-environment4-4.2.5-56932f6.tgz) = a8e9eb0776764da44a2176eb1cf1ab195653283853474d8241b85dc5025812f5a811278989cf64632a69c0c01cf63658471b1fb5ecbcfde119813224c0acd5da