From 520142651f05dee5e1de10446d2995aa7920dee9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 20 May 2026 07:13:11 +0200 Subject: update to 4.0.1 raise dependency on nikic/php-parser 5.7.0 --- composer.json | 4 ++-- makesrc.sh | 26 +++++++++----------------- php-sebastian-lines-of-code4.spec | 27 ++++++++++++++------------- 3 files changed, 25 insertions(+), 32 deletions(-) diff --git a/composer.json b/composer.json index 7c42805..4ccde87 100644 --- a/composer.json +++ b/composer.json @@ -18,10 +18,10 @@ "prefer-stable": true, "require": { "php": ">=8.3", - "nikic/php-parser": "^5.0" + "nikic/php-parser": "^5.7.0" }, "require-dev": { - "phpunit/phpunit": "^12.0" + "phpunit/phpunit": "^12.5.25" }, "config": { "platform": { diff --git a/makesrc.sh b/makesrc.sh index b959795..59cf430 100755 --- a/makesrc.sh +++ b/makesrc.sh @@ -1,35 +1,27 @@ #!/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} -DATE=$(date -d "$DATE -4 days" +%Y-%m-%d) - -if [ -f $NAME-$VERSION-$SHORT.tgz ]; then - echo "$NAME-$VERSION-$SHORT.tgz already there" +if [ -f $NAME-$VERSION.tgz ]; then + echo "$NAME-$VERSION.tgz already there" else - echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION, Date=$DATE\n" + echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION \n" echo "Cloning..." - rm -rf $PROJECT-$COMMIT - git clone --shallow-since=$DATE https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT || exit 1 + rm -rf $PROJECT-$VERSION + git clone https://github.com/$OWNER/$PROJECT.git --depth 1 --branch $VERSION $PROJECT-$VERSION || exit 1 - echo "Getting commit..." - pushd $PROJECT-$COMMIT - git checkout $COMMIT || exit1 - cp composer.json ../composer.json - popd + echo "Getting composer..." + cp $PROJECT-$VERSION/composer.json composer.json echo "Archiving..." - tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs --exclude tools $PROJECT-$COMMIT + tar czf $NAME-$VERSION.tgz --exclude-vcs --exclude tools $PROJECT-$VERSION echo "Cleaning..." - rm -rf $PROJECT-$COMMIT + rm -rf $PROJECT-$VERSION echo "Done." fi diff --git a/php-sebastian-lines-of-code4.spec b/php-sebastian-lines-of-code4.spec index 3006c37..1a3c73c 100644 --- a/php-sebastian-lines-of-code4.spec +++ b/php-sebastian-lines-of-code4.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-sebastian-lines-of-code4 # -# SPDX-FileCopyrightText: Copyright 2020-2025 Remi Collet +# SPDX-FileCopyrightText: Copyright 2020-2026 Remi Collet # SPDX-License-Identifier: CECILL-2.1 # http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # @@ -10,11 +10,8 @@ %bcond_without tests # github -%global gh_commit 97ffee3bcfb5805568d6af7f0f893678fc076d2f -%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project lines-of-code -%global gh_date 2025-02-07 # packagist %global pk_vendor sebastian %global pk_project %{gh_project} @@ -25,32 +22,32 @@ %global ns_project LinesOfCode Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 4.0.0 -Release: 2%{?dist} +Version: 4.0.1 +Release: 1%{?dist} Summary: Counting the lines of code in PHP source code, version %{major} License: BSD-3-Clause URL: https://github.com/%{gh_owner}/%{gh_project} # run makesrc.sh to create a git snapshot with test suite -Source0: %{name}-%{version}-%{gh_short}.tgz +Source0: %{name}-%{version}.tgz Source1: makesrc.sh BuildArch: noarch BuildRequires: php(language) >= 8.3 -BuildRequires: (php-composer(nikic/php-parser) >= 5.0 with php-composer(nikic/php-parser) < 6) +BuildRequires: (php-composer(nikic/php-parser) >= 5.7.0 with php-composer(nikic/php-parser) < 6) # Autoloader BuildRequires: php-fedora-autoloader-devel >= 1.0.0 %if %{with tests} # from composer.json, "require-dev": { -# "phpunit/phpunit": "^12.0" -BuildRequires: phpunit12 +# "phpunit/phpunit": "^12.5.25" +BuildRequires: phpunit12 >= 12.5.25 %endif # from composer.json, "require": { # "php": ">=8.3", -# "nikic/php-parser": "^5.0" +# "nikic/php-parser": "^5.7.0" Requires: php(language) >= 8.3 -Requires: (php-composer(nikic/php-parser) >= 5.0 with php-composer(nikic/php-parser) < 6) +Requires: (php-composer(nikic/php-parser) >= 5.7.0 with php-composer(nikic/php-parser) < 6) # from phpcompatinfo report for version 2.0.0 # Autoloader Requires: php-composer(fedora/autoloader) @@ -67,7 +64,7 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php %prep -%setup -q -n %{gh_project}-%{gh_commit} +%setup -q -n %{gh_project}-%{version} %build @@ -114,6 +111,10 @@ exit $ret %changelog +* Wed May 20 2026 Remi Collet - 4.0.1-1 +- update to 4.0.1 +- raise dependency on nikic/php-parser 5.7.0 + * Mon Feb 10 2025 Remi Collet - 4.0.0-2 - enable test suite -- cgit