diff options
| -rw-r--r-- | composer.json | 4 | ||||
| -rwxr-xr-x | makesrc.sh | 31 | ||||
| -rw-r--r-- | php-sabre-event5.spec | 33 |
3 files changed, 37 insertions, 31 deletions
diff --git a/composer.json b/composer.json index 3c31181..cfd0f4b 100644 --- a/composer.json +++ b/composer.json @@ -46,7 +46,7 @@ } }, "require-dev": { - "friendsofphp/php-cs-fixer": "~2.17.1", + "friendsofphp/php-cs-fixer": "~2.17.1||^3.95", "phpstan/phpstan": "^0.12", "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.6" }, @@ -55,7 +55,7 @@ "phpstan analyse lib tests" ], "cs-fixer": [ - "php-cs-fixer fix" + "PHP_CS_FIXER_IGNORE_ENV=true php-cs-fixer fix" ], "phpunit": [ "phpunit --configuration tests/phpunit.xml" @@ -4,25 +4,24 @@ 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" +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 \n" -echo "Cloning..." -rm -rf $PROJECT-$COMMIT -git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT + echo "Cloning..." + 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 -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 $PROJECT-$COMMIT + echo "Archiving..." + tar czf $NAME-$VERSION.tgz --exclude-vcs $PROJECT-$VERSION -echo "Cleaning..." -rm -rf $PROJECT-$COMMIT + echo "Cleaning..." + rm -rf $PROJECT-$VERSION -echo "Done." + echo "Done." +fi diff --git a/php-sabre-event5.spec b/php-sabre-event5.spec index 691b8a0..bf8d70e 100644 --- a/php-sabre-event5.spec +++ b/php-sabre-event5.spec @@ -1,8 +1,8 @@ # remirepo/fedora spec file for php-sabre-event5 # -# Copyright (c) 2013-2024 Remi Collet -# License: CC-BY-SA-4.0 -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2013-2026 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # @@ -10,8 +10,6 @@ %bcond_without tests # Github -%global gh_commit 934a1fa89b588a5448cb56937741b4bece29f403 -%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project event # Packagist @@ -25,21 +23,20 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: Lightweight library for event-based programming -Version: 5.1.5 +Version: 5.1.8 Release: 1%{?dist} URL: http://sabre.io/event License: BSD-3-Clause -Source0: %{name}-%{version}-%{gh_short}.tgz +Source0: %{name}-%{version}.tgz Source1: makesrc.sh BuildArch: noarch %if %{with tests} BuildRequires: php(language) >= 7.1 -BuildRequires: php-spl # From composer.json, "require-dev": { -# "friendsofphp/php-cs-fixer": "~2.17.1", -# "phpstan/phpstan": "^0.12", +# "friendsofphp/php-cs-fixer": "~2.17.1||^3.63", +# "phpstan/phpstan": "^0.12||^3.63", # "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.6" BuildRequires: phpunit9 >= 9.6 %global phpunit %{_bindir}/phpunit9 @@ -51,7 +48,7 @@ BuildRequires: php-composer(fedora/autoloader) # "php": "^7.1 || ^8.0" Requires: php(language) >= 7.1 # From phpcompatinfo report for version 5.0.2 -Requires: php-spl +# Only spl # Autoloader Requires: php-composer(fedora/autoloader) @@ -72,7 +69,7 @@ Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/autoload.php %prep -%setup -q -n %{gh_project}-%{gh_commit} +%setup -q -n %{gh_project}-%{version} cat << 'EOF' | tee lib/autoload.php <?php @@ -108,7 +105,7 @@ exit (Sabre\Event\Version::VERSION === "%{version}" ? 0 : 1); %if %{with tests} : Run upstream test suite against installed library ret=0 -for cmdarg in "php %{phpunit}" php81 php82 php83 php84; do +for cmdarg in "php %{phpunit}" php82 php83 php84 php85; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} \ @@ -132,6 +129,16 @@ exit $ret %changelog +* Tue Apr 28 2026 Remi Collet <remi@remirepo.net> - 5.1.8-1 +- update to 5.1.8 +- re-license spec file to CECILL-2.1 + +* Wed Aug 28 2024 Remi Collet <remi@remirepo.net> - 5.1.7-1 +- update to 5.1.7 (no change, CS only) + +* Fri Jul 26 2024 Remi Collet <remi@remirepo.net> - 5.1.6-1 +- update to 5.1.6 + * Thu Jul 25 2024 Remi Collet <remi@remirepo.net> - 5.1.5-1 - update to 5.1.5 |