diff --git a/.gitignore b/.gitignore index 1a4baf7..3225edc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,8 @@ +clog /php-phpunit-php-file-iterator2-2.0.0-e20525b.tar.gz /php-phpunit-php-file-iterator2-2.0.1-cecbc68.tar.gz +/php-phpunit-php-file-iterator2-2.0.2-050bedf.tar.gz +/php-phpunit-php-file-iterator2-2.0.3-4b49fb7.tar.gz +/php-phpunit-php-file-iterator2-2.0.4-28af674.tar.gz +/php-phpunit-php-file-iterator2-2.0.5-42c5ba5.tar.gz +/php-phpunit-php-file-iterator2-2.0.6-69deeb8.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-phpunit-php-file-iterator2.spec b/php-phpunit-php-file-iterator2.spec index 4674296..8309eb9 100644 --- a/php-phpunit-php-file-iterator2.spec +++ b/php-phpunit-php-file-iterator2.spec @@ -1,13 +1,14 @@ # remirepo/fedora spec file for php-phpunit-php-file-iterator2 # -# Copyright (c) 2009-2018 Christof Damian, Remi Collet +# Copyright (c) 2009-2024 Christof Damian, Remi Collet # # License: MIT # http://opensource.org/licenses/MIT # # Please, preserve the changelog entries # -%global gh_commit cecbc684605bb0cc288828eb5d65d93d5c676d3c +%global bootstrap 0 +%global gh_commit 69deeb8664f611f156a924154985fbd4911eb36b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project php-file-iterator @@ -19,26 +20,38 @@ # Namespace %global ns_vendor SebastianBergmann %global ns_project FileIterator +%if %{bootstrap} +%global with_tests 0%{?_with_tests:1} +%else +%global with_tests 0%{!?_without_tests:1} +%endif Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 2.0.1 -Release: 1%{?dist} +Version: 2.0.6 +Release: 4%{?dist} Summary: FilterIterator implementation that filters files based on a list of suffixes -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 -BuildRequires: php-cli +%if %{with_tests} +# From composer.json, "require-dev" +# "phpunit/phpunit": "^8.5" +BuildRequires: phpunit8 >= 8.5 +BuildRequires: php(language) >= 7.2 +BuildRequires: php-pcre +BuildRequires: php-spl +%endif BuildRequires: php-fedora-autoloader-devel -# From composer.json +# From composer.json, "require" # "php": "^7.1" Requires: php(language) >= 7.1 -# From phpcompatinfo report for 2.0.0 +# From phpcompatinfo report for 2.0.2 Requires: php-pcre Requires: php-spl # Autoloader @@ -68,15 +81,25 @@ cp -pr src %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major} %check -: Minimal test for our autoloader -php -r ' -require "%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php"; -exit(class_exists("SebastianBergmann\FileIterator\\Iterator") ? 0 : 1); -' +%if %{with_tests} +mkdir vendor +touch vendor/autoload.php + +: Run upstream test suite +ret=0 +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}/phpunit8 --verbose || ret=1 + fi +done +exit $ret +%else +: bootstrap build with test suite disabled +%endif %files -%{!?_licensedir:%global license %%doc} %license LICENSE %doc ChangeLog.md README.md composer.json %dir %{php_home}/%{ns_vendor} @@ -84,6 +107,75 @@ exit(class_exists("SebastianBergmann\FileIterator\\Iterator") ? 0 : 1); %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2.0.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sat Jan 18 2025 Fedora Release Engineering - 2.0.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Fri Jul 19 2024 Fedora Release Engineering - 2.0.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri Mar 1 2024 Remi Collet - 2.0.6-1 +- update to 2.0.6 (no change) +- sources from git snapshot + +* Thu Jan 25 2024 Fedora Release Engineering - 2.0.5-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 2.0.5-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jul 21 2023 Fedora Release Engineering - 2.0.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Apr 20 2023 Remi Collet - 2.0.5-5 +- use SPDX license ID + +* Fri Jan 20 2023 Fedora Release Engineering - 2.0.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 2.0.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jan 21 2022 Fedora Release Engineering - 2.0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Dec 2 2021 Remi Collet - 2.0.5-1 +- update to 2.0.5 + +* Fri Jul 23 2021 Fedora Release Engineering - 2.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Jul 19 2021 Remi Collet - 2.0.4-1 +- update to 2.0.4 + +* Wed Jan 27 2021 Fedora Release Engineering - 2.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Nov 30 2020 Remi Collet - 2.0.3-1 +- update to 2.0.3 (no change) +- switch to phpunit8 + +* Tue Jul 28 2020 Fedora Release Engineering - 2.0.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Jan 30 2020 Fedora Release Engineering - 2.0.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Jul 26 2019 Fedora Release Engineering - 2.0.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Feb 02 2019 Fedora Release Engineering - 2.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Sep 14 2018 Remi Collet - 2.0.2-1 +- update to 2.0.2 +- run upstream test suite + +* Fri Jul 13 2018 Fedora Release Engineering - 2.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Jun 11 2018 Remi Collet - 2.0.1-1 - update to 2.0.1 diff --git a/sources b/sources index 4426db3..0ace67c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-file-iterator2-2.0.1-cecbc68.tar.gz) = 73be8d9b7d91f3a425bd153902c0a9c07e6b81e9da84b24800efec8716c92f5e7fbd4978dc42e1722055a645aed7389e1d9070f26f4cbb65587a8dd31fcf07a6 +SHA512 (php-phpunit-php-file-iterator2-2.0.6-69deeb8.tgz) = d2639d2c4c7f7431c10349965e75aae53c7fd32f48ec42508615a77d210be8dd7c0980c9e481b3c1255ac71f544e8e3bee9b0e729ce8aa110b29d2e7b36dc843