From ff4228f16aed0d7399d8b604280402a310d63d2c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 5 Feb 2024 09:40:53 +0100 Subject: update to 5.0.0 raise dependency on PHP 8.2 rename to php-phpunit-php-file-iterator5 move to /usr/share/php/SebastianBergmann/FileIterator5 --- composer.json | 8 ++++---- makesrc.sh | 35 +++++++++++++++++++++-------------- php-phpunit-php-file-iterator5.spec | 29 ++++++++++++++++++----------- 3 files changed, 43 insertions(+), 29 deletions(-) diff --git a/composer.json b/composer.json index 3f0089c..525526d 100644 --- a/composer.json +++ b/composer.json @@ -21,17 +21,17 @@ }, "config": { "platform": { - "php": "8.1.0" + "php": "8.2.0" }, "optimize-autoloader": true, "sort-packages": true }, "prefer-stable": true, "require": { - "php": ">=8.1" + "php": ">=8.2" }, "require-dev": { - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^11.0" }, "autoload": { "classmap": [ @@ -40,7 +40,7 @@ }, "extra": { "branch-alias": { - "dev-main": "4.0-dev" + "dev-main": "5.0-dev" } } } diff --git a/makesrc.sh b/makesrc.sh index 4190c13..b959795 100755 --- a/makesrc.sh +++ b/makesrc.sh @@ -1,28 +1,35 @@ #!/bin/bash NAME=$(basename $PWD) +DATE=$(sed -n '/^%global gh_date/{s/.* //;p}' $NAME.spec) 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" +DATE=$(date -d "$DATE -4 days" +%Y-%m-%d) -echo "Cloning..." -rm -rf $PROJECT-$COMMIT -git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT +if [ -f $NAME-$VERSION-$SHORT.tgz ]; then + echo "$NAME-$VERSION-$SHORT.tgz already there" +else + echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION, Date=$DATE\n" -echo "Getting commit..." -pushd $PROJECT-$COMMIT -git checkout $COMMIT -cp composer.json ../composer.json -popd + echo "Cloning..." + rm -rf $PROJECT-$COMMIT + git clone --shallow-since=$DATE https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT || exit 1 -echo "Archiving..." -tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs --exclude tools $PROJECT-$COMMIT + echo "Getting commit..." + pushd $PROJECT-$COMMIT + git checkout $COMMIT || exit1 + cp composer.json ../composer.json + popd -echo "Cleaning..." -rm -rf $PROJECT-$COMMIT + echo "Archiving..." + tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs --exclude tools $PROJECT-$COMMIT -echo "Done." + echo "Cleaning..." + rm -rf $PROJECT-$COMMIT + + echo "Done." +fi diff --git a/php-phpunit-php-file-iterator5.spec b/php-phpunit-php-file-iterator5.spec index 439755a..5e93ebe 100644 --- a/php-phpunit-php-file-iterator5.spec +++ b/php-phpunit-php-file-iterator5.spec @@ -1,6 +1,6 @@ -# remirepo/fedora spec file for php-phpunit-php-file-iterator4 +# remirepo/fedora spec file for php-phpunit-php-file-iterator5 # -# Copyright (c) 2009-2023 Christof Damian, Remi Collet +# Copyright (c) 2009-2024 Christof Damian, Remi Collet # # License: MIT # http://opensource.org/licenses/MIT @@ -8,24 +8,25 @@ # Please, preserve the changelog entries # -%bcond_without tests +%bcond_with tests -%global gh_commit a95037b6d9e608ba092da1b23931e537cadc3c3c +%global gh_commit 99e95c94ad9500daca992354fa09d7b99abe2210 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project php-file-iterator +%global gh_date 2024-02-02 %global php_home %{_datadir}/php # Packagist %global pk_vendor phpunit %global pk_project %{gh_project} -%global major 4 +%global major 5 # Namespace %global ns_vendor SebastianBergmann %global ns_project FileIterator Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 4.1.0 +Version: 5.0.0 Release: 1%{?dist} Summary: FilterIterator implementation based on a list of suffixes, version %{major} @@ -35,19 +36,19 @@ Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh BuildArch: noarch -BuildRequires: php(language) >= 8.1 +BuildRequires: php(language) >= 8.2 BuildRequires: php-pcre BuildRequires: php-spl %if %{with tests} # From composer.json, "require-dev" -# "phpunit/phpunit": "^10.0" -BuildRequires: phpunit10 +# "phpunit/phpunit": "^11.0" +BuildRequires: phpunit11 %endif BuildRequires: php-fedora-autoloader-devel # From composer.json, "require" -# "php": ">=8.1" -Requires: php(language) >= 8.1 +# "php": ">=8.2" +Requires: php(language) >= 8.2 # From phpcompatinfo report for 4.0.0 Requires: php-pcre Requires: php-spl @@ -110,6 +111,12 @@ exit $ret %changelog +* Mon Feb 5 2024 Remi Collet - 5.0.0-1 +- update to 5.0.0 +- raise dependency on PHP 8.2 +- rename to php-phpunit-php-file-iterator5 +- move to /usr/share/php/SebastianBergmann/FileIterator5 + * Thu Aug 31 2023 Remi Collet - 4.1.0-1 - update to 4.1.0 -- cgit