diff options
| -rw-r--r-- | composer.json | 13 | ||||
| -rwxr-xr-x | makesrc.sh | 25 | ||||
| -rw-r--r-- | pie-noxdg.patch | 4 | ||||
| -rw-r--r-- | pie-rpm.patch | 16 | ||||
| -rw-r--r-- | pie.spec | 21 |
5 files changed, 42 insertions, 37 deletions
diff --git a/composer.json b/composer.json index aedd38d..abe73a4 100644 --- a/composer.json +++ b/composer.json @@ -34,20 +34,21 @@ "fidry/cpu-core-counter": "^1.3.0", "illuminate/container": "^10.49.0", "psr/container": "^2.0.2", - "symfony/console": "^6.4.27", - "symfony/event-dispatcher": "^6.4.25", - "symfony/process": "^6.4.26", + "symfony/console": "^6.4.34", + "symfony/event-dispatcher": "^6.4.32", + "symfony/process": "^6.4.33", "thephpf/attestation": "^0.0.5", "webmozart/assert": "^1.12.1" }, "require-dev": { "ext-openssl": "*", - "behat/behat": "^3.27.0", + "behat/behat": "^3.29.0", "bnf/phpstan-psr-container": "^1.1", "doctrine/coding-standard": "^14.0.0", - "phpstan/phpstan": "^2.1.32", + "phpstan/phpstan": "^2.1.40", + "phpstan/phpstan-phpunit": "^2.0.16", "phpstan/phpstan-webmozart-assert": "^2.0", - "phpunit/phpunit": "^10.5.58" + "phpunit/phpunit": "^10.5.63" }, "replace": { "symfony/polyfill-php81": "*", @@ -1,25 +1,26 @@ #!/bin/bash -NAME=$(sed -n '/^Name:/{s/.* //;p}' *.spec) +NAME=$(sed -n '/^Name:/{s/.* //;p}' *.spec) OWNER=$(sed -n '/^%global gh_owner/{s/.* //;p}' $NAME.spec) PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec) VERSION=$(sed -n '/^%global upstream_version/{s/.* //;p}' $NAME.spec) DATE=$(sed -n '/^%global gh_date/{s/.* //;p}' $NAME.spec) PREVER=$(sed -n '/^%global upstream_prever/{s/.* //;p}' $NAME.spec) -COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec) -SHORT=${COMMIT:0:7} +if [ -z "$PREVER" ] +then TAG=$VERSION +else TAG=$VERSION-$PREVER +fi -if [ -f $NAME-$VERSION$PREVER-$SHORT.tgz -a "$1" != "-f" ]; then - echo skip $NAME-$VERSION$PREVER-$SHORT.tgz already here +if [ -f $NAME-$TAG.tgz -a "$1" != "-f" ]; then + echo skip $NAME-$TAG.tgz already here else - echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION$PREVER\n" + echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$TAG\n" echo "Cloning..." - git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT + git clone https://github.com/$OWNER/$PROJECT.git --depth 1 --branch $TAG $PROJECT-$TAG - echo "Getting commit..." - pushd $PROJECT-$COMMIT - git checkout $COMMIT || exit 1 + echo "Getting TAG $TAG..." + pushd $PROJECT-$TAG cp composer.json ../ composer config platform.php 8.1.99 rm composer.lock @@ -31,9 +32,9 @@ else popd echo "Archiving..." - tar czf $NAME-$VERSION$PREVER-$SHORT.tgz --exclude .git $PROJECT-$COMMIT + tar czf $NAME-$TAG.tgz --exclude-vcs $PROJECT-$TAG echo "Cleaning..." - rm -rf $PROJECT-$COMMIT + rm -rf $PROJECT-$TAG fi echo "Done." diff --git a/pie-noxdg.patch b/pie-noxdg.patch index 1ee3f16..c470ffb 100644 --- a/pie-noxdg.patch +++ b/pie-noxdg.patch @@ -1,7 +1,7 @@ diff -up ./src/Platform.php.noxdg ./src/Platform.php --- ./src/Platform.php.noxdg 2025-11-04 07:41:36.891311937 +0100 +++ ./src/Platform.php 2025-11-04 07:42:29.282702463 +0100 -@@ -35,6 +35,10 @@ class Platform +@@ -37,6 +37,10 @@ class Platform private static function useXdg(): bool { @@ -15,7 +15,7 @@ diff -up ./src/Platform.php.noxdg ./src/Platform.php diff -up ./vendor/composer/composer/src/Composer/Factory.php.noxdg ./vendor/composer/composer/src/Composer/Factory.php --- ./vendor/composer/composer/src/Composer/Factory.php.noxdg 2025-09-19 13:41:59.000000000 +0200 +++ ./vendor/composer/composer/src/Composer/Factory.php 2025-11-04 07:41:36.891444253 +0100 -@@ -707,6 +707,10 @@ class Factory +@@ -700,6 +700,10 @@ class Factory private static function useXdg(): bool { diff --git a/pie-rpm.patch b/pie-rpm.patch index 9d4a8d0..d72f260 100644 --- a/pie-rpm.patch +++ b/pie-rpm.patch @@ -1,6 +1,6 @@ diff -up ./bin/pie.rpm ./bin/pie ---- ./bin/pie.rpm 2025-11-04 07:31:47.045861211 +0100 -+++ ./bin/pie 2025-11-04 07:34:03.568067299 +0100 +--- ./bin/pie.rpm 2026-03-19 15:22:15.000000000 +0100 ++++ ./bin/pie 2026-03-19 15:22:31.719304419 +0100 @@ -28,13 +28,14 @@ use function error_reporting; use const E_DEPRECATED; @@ -19,19 +19,19 @@ diff -up ./bin/pie.rpm ./bin/pie $container = Container::factory(); diff -up ./src/Command/SelfUpdateCommand.php.rpm ./src/Command/SelfUpdateCommand.php ---- ./src/Command/SelfUpdateCommand.php.rpm 2025-11-04 07:31:47.045962420 +0100 -+++ ./src/Command/SelfUpdateCommand.php 2025-11-04 07:34:56.202111078 +0100 -@@ -85,6 +85,7 @@ final class SelfUpdateCommand extends Co +--- ./src/Command/SelfUpdateCommand.php.rpm 2026-03-19 15:22:15.000000000 +0100 ++++ ./src/Command/SelfUpdateCommand.php 2026-03-19 15:23:34.903816597 +0100 +@@ -84,6 +84,7 @@ final class SelfUpdateCommand extends Co { - if (! PieVersion::isPharBuild()) { + if (! PieVersion::isPharBuild() || Platform::isRunningStaticPhp()) { $this->io->writeError('<comment>Aborting! You are not running a PHAR, cannot self-update.</comment>'); + $this->io->writeError('<comment>Update the pie RPM using the package manager (dnf).</comment>'); return Command::FAILURE; } diff -up ./src/Command/SelfVerifyCommand.php.rpm ./src/Command/SelfVerifyCommand.php ---- ./src/Command/SelfVerifyCommand.php.rpm 2025-11-04 07:31:47.046045232 +0100 -+++ ./src/Command/SelfVerifyCommand.php 2025-11-04 07:35:34.439595840 +0100 +--- ./src/Command/SelfVerifyCommand.php.rpm 2026-03-19 15:22:15.000000000 +0100 ++++ ./src/Command/SelfVerifyCommand.php 2026-03-19 15:22:31.719485375 +0100 @@ -43,6 +43,7 @@ final class SelfVerifyCommand extends Co { if (! PieVersion::isPharBuild()) { @@ -11,15 +11,12 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit bb8b16f1f0fa5870f9de2ee6276ff5b55a8a22f6 -%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -#global gh_date 20241003 -%global gh_branch main +%global gh_tag %{upstream_version}%{?upstream_prever:-%{upstream_prever}} %global gh_owner php %global gh_project pie -%global upstream_version 1.3.10 -#global upstream_prever rc3 +%global upstream_version 1.4.0 +%global upstream_prever alpha.3 %global bashcompdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null) %global bashcomproot %(dirname %{bashcompdir} 2>/dev/null) @@ -34,9 +31,9 @@ Summary: PHP Installer for Extensions # thephpf/attestation is BSD-3-Clause # others dependencies are MIT License: BSD-3-Clause AND MIT -URL: https://github.com/php/pie +URL: https://github.com/%{gh_owner}/%{gh_project} # tarball generated by makesrc.sh -Source0: %{gh_project}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tgz +Source0: %{gh_project}-%{gh_tag}.tgz Source1: %{name}-bash-completion # Create a git snapshot with dependencies Source9: makesrc.sh @@ -93,7 +90,7 @@ Documentation: /usr/share/doc/pie/docs/usage.md %prep -%setup -q -n %{gh_project}-%{gh_commit} +%setup -q -n %{gh_project}-%{gh_tag} %patch -P0 -p1 -b .rpm %patch -P1 -p1 -b .noxdg @@ -141,6 +138,12 @@ done %changelog +* Wed Mar 25 2026 Remi Collet <remi@remirepo.net> - 1.4.0~alpha.3-1 +- update to 1.4.0-alpha.3 + +* Thu Mar 19 2026 Remi Collet <remi@remirepo.net> - 1.4.0~alpha1-1 +- update to 1.4.0-alpha.1 + * Wed Mar 18 2026 Remi Collet <remi@remirepo.net> - 1.3.10-1 - update to 1.3.10 |