diff --git a/.gitignore b/.gitignore index d2cad20..280f2a0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,2 @@ /php-sebastian-object-enumerator3-3.0.2-31dd337.tar.gz /php-sebastian-object-enumerator3-3.0.3-7cfd9e6.tar.gz -/php-sebastian-object-enumerator3-3.0.4-e67f6d3.tar.gz -/php-sebastian-object-enumerator3-3.0.5-ac5b293.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-object-enumerator3.spec b/php-sebastian-object-enumerator3.spec index 226aa31..e9047f6 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-2024 Remi Collet -# License: CC-BY-SA-4.0 +# Copyright (c) 2015-2017 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 ac5b293dba925751b808e02923399fb44ff0d541 +%global gh_commit 7cfd9e65d11ffb5af41198476395774d4c8a84c5 #global gh_date 20150728 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann @@ -24,36 +24,39 @@ %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.5 -Release: 4%{?dist} -Summary: Traverses array and object to enumerate all referenced objects, version %{major} +Version: 3.0.3 +%global specrel 1 +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 -License: BSD-3-Clause +Group: Development/Libraries +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.0 BuildRequires: php-fedora-autoloader-devel %if %{with_tests} -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) +BuildRequires: php-composer(%{pk_vendor}/object-reflector) < 2 +BuildRequires: php-composer(%{pk_vendor}/object-reflector) >= 1.1.1 +BuildRequires: php-composer(%{pk_vendor}/recursion-context) < 4 +BuildRequires: php-composer(%{pk_vendor}/recursion-context) >= 3.0 # From composer.json"require-dev": { # "phpunit/phpunit": "^6.0" -BuildRequires: phpunit8 +BuildRequires: phpunit6 %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 -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) +Requires: php-composer(%{pk_vendor}/object-reflector) < 2 +Requires: php-composer(%{pk_vendor}/object-reflector) >= 1.1.1 +Requires: php-composer(%{pk_vendor}/recursion-context) < 4 +Requires: php-composer(%{pk_vendor}/recursion-context) >= 3.0 # from phpcompatinfo report for version 3.0.1: Requires: php-reflection Requires: php-spl @@ -67,8 +70,6 @@ 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 @@ -83,8 +84,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 '%{php_home}/%{ns_vendor}/ObjectReflector/autoload.php'; -require_once '%{php_home}/%{ns_vendor}/RecursionContext3/autoload.php'; +require_once 'SebastianBergmann/ObjectReflector/autoload.php'; +require_once 'SebastianBergmann/RecursionContext3/autoload.php'; EOF @@ -98,15 +99,12 @@ 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 php php81 php82 php83; do +for cmd in php70 php71 php; do if which $cmd; then - %{_bindir}/php -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \ - %{_bindir}/phpunit8 --verbose || ret=1 + %{_bindir}/php -d include_path=.:%{buildroot}%{_datadir}/php:%{_datadir}/php \ + %{_bindir}/phpunit6 --verbose || ret=1 fi done exit $ret @@ -116,87 +114,17 @@ exit $ret %files +%{!?_licensedir:%global license %%doc} %license LICENSE %doc README.md composer.json %{php_home}/%{ns_vendor}/%{ns_project}%{major} %changelog -* 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 - -* Fri Mar 1 2024 Remi Collet - 3.0.5-1 -- update to 3.0.5 (no change) -- sources from git snapshot - -* Thu Jan 25 2024 Fedora Release Engineering - 3.0.4-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 3.0.4-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jul 21 2023 Fedora Release Engineering - 3.0.4-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Apr 21 2023 Remi Collet - 3.0.4-9 -- use SPDX License id - -* Fri Jan 20 2023 Fedora Release Engineering - 3.0.4-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Jul 22 2022 Fedora Release Engineering - 3.0.4-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jan 21 2022 Fedora Release Engineering - 3.0.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Jul 27 2021 Fedora Release Engineering - 3.0.4-5 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Mar 10 2021 Remi Collet - 3.0.4-4 -- switch to phpunit8 - -* Wed Jan 27 2021 Fedora Release Engineering - 3.0.4-3.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Nov 30 2020 Remi Collet - 3.0.4-1 -- update to 3.0.4 (no change) - -* Tue Jul 28 2020 Fedora Release Engineering - 3.0.3-3.4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Jan 30 2020 Fedora Release Engineering - 3.0.3-3.3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Jul 26 2019 Fedora Release Engineering - 3.0.3-3.2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Feb 02 2019 Fedora Release Engineering - 3.0.3-3.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Dec 6 2018 Remi Collet - 3.0.3-3 -- cleanup for EL-8 - -* Fri Jul 13 2018 Fedora Release Engineering - 3.0.3-2.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Feb 6 2018 Remi Collet - 3.0.3-2 -- use range dependencies on F27+ - * Fri Aug 4 2017 Remi Collet - 3.0.3-1 - Update to 3.0.3 - no change - raise dependency on sebastian/object-reflector 1.1.1 -* Thu Jul 27 2017 Fedora Release Engineering - 3.0.2-1.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - * Sun Mar 12 2017 Remi Collet - 3.0.2-1 - Update to 3.0.2 - add dependency on sebastian/object-reflector diff --git a/sources b/sources index e45b248..07dc925 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sebastian-object-enumerator3-3.0.5-ac5b293.tgz) = a1408d23422aeb6e6f456a9328143c34a94cbe7ac61c53cd5a1cb042ad361dd84be50755c76f0fe1e8810df60ff85906a2ef2a8367766de03b723d2a8a8f5dbf +SHA512 (php-sebastian-object-enumerator3-3.0.3-7cfd9e6.tar.gz) = 885f11e0b046e65d3ca2b6295317b3f1eacfb97f0fce1ab33cd4768e0d91cd5cba7c9b7282cd1dc39d0fbb8b48d9360b9e5980ab0889bca64b3a982f92945cf4