diff options
| -rw-r--r-- | composer.json | 2 | ||||
| -rwxr-xr-x | makesrc.sh | 28 | ||||
| -rw-r--r-- | php-sebastian-object-enumerator3.spec | 64 |
3 files changed, 75 insertions, 19 deletions
diff --git a/composer.json b/composer.json index 7b7d158..33a9465 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ } ], "require": { - "php": "^7.0", + "php": ">=7.0", "sebastian/object-reflector": "^1.1.1", "sebastian/recursion-context": "^3.0" }, 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-object-enumerator3.spec b/php-sebastian-object-enumerator3.spec index b5d029e..a116e85 100644 --- a/php-sebastian-object-enumerator3.spec +++ b/php-sebastian-object-enumerator3.spec @@ -1,13 +1,13 @@ # remirepo/fedora spec file for php-sebastian-object-enumerator3 # -# Copyright (c) 2015-2018 Remi Collet -# License: CC-BY-SA +# Copyright (c) 2015-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 -%global gh_commit 7cfd9e65d11ffb5af41198476395774d4c8a84c5 +%global gh_commit ac5b293dba925751b808e02923399fb44ff0d541 #global gh_date 20150728 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann @@ -24,40 +24,46 @@ %global with_tests 0%{!?_without_tests:1} %endif +# NOTICE: used by phpunit 6, 7 and 8 + Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 3.0.3 -%global specrel 2 -Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} -Summary: Traverses array and object to enumerate all referenced objects +Version: 3.0.5 +Release: 1%{?dist} +Summary: Traverses array and object to enumerate all referenced objects, 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.0 BuildRequires: php-fedora-autoloader-devel %if %{with_tests} -%if 0%{?fedora} >= 27 +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-composer(%{pk_vendor}/object-reflector) >= 1.1.1 with php-composer(%{pk_vendor}/object-reflector) < 2) BuildRequires: (php-composer(sebastian/recursion-context) >= 3.0 with php-composer(sebastian/recursion-context) < 4) +# remirepo:4 %else BuildRequires: php-sebastian-object-reflector BuildRequires: php-sebastian-recursion-context3 %endif # From composer.json"require-dev": { # "phpunit/phpunit": "^6.0" -BuildRequires: phpunit6 +BuildRequires: phpunit8 %endif # from composer.json -# "php": "^7.0", +# "php": ">=7.0", # "sebastian/object-reflector": "^1.1.1", # "sebastian/recursion-context": "^3.0" Requires: php(language) >= 7.0 -%if 0%{?fedora} >= 27 +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-composer(%{pk_vendor}/object-reflector) >= 1.1.1 with php-composer(%{pk_vendor}/object-reflector) < 2) Requires: (php-composer(sebastian/recursion-context) >= 3.0 with php-composer(sebastian/recursion-context) < 4) +# remirepo:4 %else Requires: php-sebastian-object-reflector Requires: php-sebastian-recursion-context3 @@ -75,6 +81,8 @@ Provides: php-composer(%{pk_vendor}/%{pk_project}) = %{version} Traverses array structures and object graphs to enumerate all referenced objects. +This package provides the version %{major} of the library. + Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php @@ -89,8 +97,8 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php %{_bindir}/phpab --template fedora --output src/autoload.php src cat << 'EOF' | tee -a src/autoload.php // Dependencies -require_once 'SebastianBergmann/ObjectReflector/autoload.php'; -require_once 'SebastianBergmann/RecursionContext3/autoload.php'; +require_once '%{php_home}/%{ns_vendor}/ObjectReflector/autoload.php'; +require_once '%{php_home}/%{ns_vendor}/RecursionContext3/autoload.php'; EOF @@ -104,12 +112,15 @@ cp -pr src %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major} mkdir vendor %{_bindir}/phpab --template fedora --output vendor/autoload.php tests/_fixture +: Fix for phpunit8 +find tests/ -name \*php -exec sed -e 's/setUp()/setUp():void/' -i {} \; + : Run upstream test suite ret=0 -for cmd in php70 php71 php; do +for cmd in php php81 php82 php83; do if which $cmd; then - %{_bindir}/php -d include_path=.:%{buildroot}%{_datadir}/php:%{_datadir}/php \ - %{_bindir}/phpunit6 --verbose || ret=1 + %{_bindir}/php -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \ + %{_bindir}/phpunit8 --verbose || ret=1 fi done exit $ret @@ -119,6 +130,7 @@ exit $ret %files +# remirepo:1 %{!?_licensedir:%global license %%doc} %license LICENSE %doc README.md composer.json @@ -126,6 +138,22 @@ exit $ret %changelog +* Fri Mar 1 2024 Remi Collet <remi@remirepo.net> - 3.0.5-1 +- update to 3.0.5 (no change) +- sources from git snapshot + +* Fri Apr 21 2023 Remi Collet <remi@remirepo.net> - 3.0.4-9 +- use SPDX License id + +* Wed Mar 10 2021 Remi Collet <remi@remirepo.net> - 3.0.4-4 +- switch to phpunit8 + +* Mon Nov 30 2020 Remi Collet <remi@remirepo.net> - 3.0.4-1 +- update to 3.0.4 (no change) + +* Thu Dec 6 2018 Remi Collet <remi@remirepo.net> - 3.0.3-3 +- cleanup for EL-8 + * Tue Feb 6 2018 Remi Collet <remi@remirepo.net> - 3.0.3-2 - use range dependencies on F27+ |