diff options
| -rw-r--r-- | composer.json | 2 | ||||
| -rwxr-xr-x | makesrc.sh | 28 | ||||
| -rw-r--r-- | php-sebastian-environment4.spec | 40 |
3 files changed, 58 insertions, 12 deletions
diff --git a/composer.json b/composer.json index 584d360..d02bb38 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ }, "prefer-stable": true, "require": { - "php": "^7.1" + "php": ">=7.1" }, "require-dev": { "phpunit/phpunit": "^7.5" 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 4f181ce..08c0b5a 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 464c90d7bdf5ad4e8a6aea15c091fec0603d4368 +%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.3 +Version: 4.2.5 Release: 1%{?dist} -Summary: Handle HHVM/PHP environments +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 php74; 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,17 @@ exit $ret %changelog +* Fri Mar 1 2024 Remi Collet <remi@remirepo.net> - 4.2.5-1 +- update to 4.2.5 (no change) +- sources from git snapshot + +* Fri Apr 21 2023 Remi Collet <remi@remirepo.net> - 4.2.4-7 +- use SPDX license ID + +* Mon Nov 30 2020 Remi Collet <remi@remirepo.net> - 4.2.4-1 +- update to 4.2.4 (no change) +- switch to phpunit8 + * Wed Nov 20 2019 Remi Collet <remi@remirepo.net> - 4.2.3-1 - update to 4.2.3 |