From 54006c1ea8aa47c78109e63e6429fb971d9992ea Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 29 Jan 2025 10:18:31 +0100 Subject: [PATCH 1/4] update to 0.6.0 always use composer-generators (cherry picked from commit cf92af6f4df42eb43f0497c1c612f4a56f8f608a) (cherry picked from commit f889f65c78fc14efb4b0a6ca873c51ecfb4161ac) --- .gitignore | 1 + pie.spec | 71 +++++------------------------------------------------- sources | 2 +- 3 files changed, 8 insertions(+), 66 deletions(-) diff --git a/.gitignore b/.gitignore index 73a3e4e..4fe0e76 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /pie-0.3.0-dc299c3.tgz /pie-0.4.0-883447d.tgz /pie-0.5.0-b6e014b.tgz +/pie-0.6.0-e7fcd16.tgz diff --git a/pie.spec b/pie.spec index 230d027..0aaa2b4 100644 --- a/pie.spec +++ b/pie.spec @@ -7,16 +7,14 @@ # Please, preserve the changelog entries # -%bcond_with generators - -%global gh_commit b6e014bdbe790a6cbb83ea0582ac9b6eb8ab31c1 +%global gh_commit e7fcd163cf77e3ae878f6bee9a590e1fd00b2a26 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20241003 %global gh_branch main %global gh_owner php %global gh_project pie -%global upstream_version 0.5.0 +%global upstream_version 0.6.0 #global upstream_prever dev #global upstream_lower DEV @@ -52,9 +50,7 @@ BuildRequires: php-cli BuildRequires: php-json BuildRequires: php-zip BuildRequires: pkgconfig(bash-completion) -%if %{with generators} BuildRequires: composer-generators -%endif # From composer.json, "require": { # "php": "8.1.*||8.2.*||8.3.*||8.4.*", @@ -75,44 +71,6 @@ Requires: php-mbstring Requires: php-posix Requires: php-phar -%if %{without generators} -# Bundled libraries -# License MIT -Provides: bundled(php-composer(composer/ca-bundle)) = 1.5.5 -Provides: bundled(php-composer(composer/class-map-generator)) = 1.5.0 -Provides: bundled(php-composer(composer/composer)) = 2.8.4 -Provides: bundled(php-composer(composer/metadata-minifier)) = 1.0.0 -Provides: bundled(php-composer(composer/pcre)) = 3.3.2 -Provides: bundled(php-composer(composer/semver)) = 3.4.3 -Provides: bundled(php-composer(composer/spdx-licenses)) = 1.5.8 -Provides: bundled(php-composer(composer/xdebug-handler)) = 3.0.5 -Provides: bundled(php-composer(fidry/cpu-core-counter)) = 1.2.0 -Provides: bundled(php-composer(illuminate/container)) = 10.48.25 -Provides: bundled(php-composer(illuminate/contracts)) = 10.48.25 -Provides: bundled(php-composer(justinrainbow/json-schema)) = 5.3.0 -Provides: bundled(php-composer(psr/container)) = 2.0.2 -Provides: bundled(php-composer(psr/log)) = 3.0.2 -Provides: bundled(php-composer(psr/simple-cache)) = 3.0.0 -Provides: bundled(php-composer(react/promise)) = 3.2.0 -Provides: bundled(php-composer(seld/jsonlint)) = 1.11.0 -Provides: bundled(php-composer(seld/phar-utils)) = 1.2.1 -Provides: bundled(php-composer(seld/signal-handler)) = 2.0.2 -Provides: bundled(php-composer(symfony/console)) = 6.4.17 -Provides: bundled(php-composer(symfony/deprecation-contracts)) = 3.5.1 -Provides: bundled(php-composer(symfony/filesystem)) = 6.4.13 -Provides: bundled(php-composer(symfony/finder)) = 6.4.17 -Provides: bundled(php-composer(symfony/polyfill-ctype)) = 1.31.0 -Provides: bundled(php-composer(symfony/polyfill-intl-grapheme)) = 1.31.0 -Provides: bundled(php-composer(symfony/polyfill-intl-normalizer)) = 1.31.0 -Provides: bundled(php-composer(symfony/polyfill-mbstring)) = 1.31.0 -Provides: bundled(php-composer(symfony/process)) = 6.4.15 -Provides: bundled(php-composer(symfony/service-contracts)) = 3.5.1 -Provides: bundled(php-composer(symfony/string)) = 6.4.15 -Provides: bundled(php-composer(webmozart/assert)) = 1.11.0 - -# Composer library -Provides: php-composer(php/pie) = %{version} -%endif %description PIE (PHP Installer for Extensions). @@ -138,27 +96,6 @@ rm vendor/composer/ca-bundle/res/cacert.pem : Set version sed -e 's/@pie_version@/%{upstream_version}%{?upstream_prever}/' -i bin/pie -%if %{without generators} -: List bundled libraries and Licenses -php -r ' - $pkgs = file_get_contents("vendor/composer/installed.json"); - $pkgs = json_decode($pkgs, true); - if (!is_array($pkgs) || !isset($pkgs["packages"])) { - echo "cant decode json file\n"; - exit(3); - } - $res = []; - foreach($pkgs["packages"] as $pkg) { - $lic = implode(" and ", $pkg["license"]); - if (!isset($res[$lic])) $res[$lic] = []; - $res[$lic][] = sprintf("Provides: bundled(php-composer(%s)) = %s", $pkg["name"], ltrim($pkg["version"], "v")); - } - foreach($res as $lic => $lib) { - sort($lib); - printf("# License %s\n%s\n", $lic, implode("\n", $lib)); - }' -%endif - %build # Nothing @@ -198,6 +135,10 @@ done %changelog +* Wed Jan 29 2025 Remi Collet - 0.6.0-1 +- update to 0.6.0 +- always use composer-generators + * Thu Jan 9 2025 Remi Collet - 0.5.0-1 - update to 0.5.0 diff --git a/sources b/sources index bbbc230..be9e295 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pie-0.5.0-b6e014b.tgz) = e7f28f1d3bb53340711555e30bf118a6e563a45a3fe06da2a67ebcb65046aa24505ddebfecd73b0a898a8d02a2d6de55545777bcd17d9ff15a30256ffe487b0f +SHA512 (pie-0.6.0-e7fcd16.tgz) = 5131ab2a69f53ca73e8e65c8ef6b85e6bd9d7b8c9a4b50649c32aa1de57d5e775f3b3f36c9584c60760caa4f3c3f417e4b5bc7ef6c5762b881d53b83e656abe5 From f471d0fba53f655ac5000cc40977fffa3113624f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 3 Mar 2025 10:52:34 +0100 Subject: [PATCH 2/4] v0.7.0 (cherry picked from commit 5bf2ebedd50c69feb39193b79bc7eb1daddaa667) --- .gitignore | 1 + pie.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 4fe0e76..22e2605 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /pie-0.4.0-883447d.tgz /pie-0.5.0-b6e014b.tgz /pie-0.6.0-e7fcd16.tgz +/pie-0.7.0-8304dd2.tgz diff --git a/pie.spec b/pie.spec index 0aaa2b4..4ed2777 100644 --- a/pie.spec +++ b/pie.spec @@ -1,20 +1,20 @@ # remirepo/fedora spec file for pie # -# SPDX-FileCopyrightText: Copyright 2024 Remi Collet +# SPDX-FileCopyrightText: Copyright 2024-2025 Remi Collet # SPDX-License-Identifier: CECILL-2.1 # http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # -%global gh_commit e7fcd163cf77e3ae878f6bee9a590e1fd00b2a26 +%global gh_commit 8304dd20d96c81be1d9e4ad7976e63cfa6670b29 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20241003 %global gh_branch main %global gh_owner php %global gh_project pie -%global upstream_version 0.6.0 +%global upstream_version 0.7.0 #global upstream_prever dev #global upstream_lower DEV @@ -135,6 +135,9 @@ done %changelog +* Mon Mar 3 2025 Remi Collet - 0.7.0-1 +- update to 0.7.0 + * Wed Jan 29 2025 Remi Collet - 0.6.0-1 - update to 0.6.0 - always use composer-generators diff --git a/sources b/sources index be9e295..121bdad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pie-0.6.0-e7fcd16.tgz) = 5131ab2a69f53ca73e8e65c8ef6b85e6bd9d7b8c9a4b50649c32aa1de57d5e775f3b3f36c9584c60760caa4f3c3f417e4b5bc7ef6c5762b881d53b83e656abe5 +SHA512 (pie-0.7.0-8304dd2.tgz) = 080fd188872a7330816ce4f8df67f41beec8d34b840b038e8c3618c8f52c3524ac946878b8bfbd8f32655c0d58233e313a0be144601344fe594d88dbe98ca018 From 0331faa8021e5d96ad392767e405d6fe34882517 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 13 Mar 2025 11:36:51 +0100 Subject: [PATCH 3/4] v0.8.0 (cherry picked from commit efa34ea12c9183dcd69b2ce132cf27ccf9885c8b) --- .gitignore | 1 + pie.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 22e2605..cf6c0b2 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /pie-0.5.0-b6e014b.tgz /pie-0.6.0-e7fcd16.tgz /pie-0.7.0-8304dd2.tgz +/pie-0.8.0-108707d.tgz diff --git a/pie.spec b/pie.spec index 4ed2777..31565a6 100644 --- a/pie.spec +++ b/pie.spec @@ -7,14 +7,14 @@ # Please, preserve the changelog entries # -%global gh_commit 8304dd20d96c81be1d9e4ad7976e63cfa6670b29 +%global gh_commit 108707df748ad2bbc96db8a1edd625b4332c364e %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20241003 %global gh_branch main %global gh_owner php %global gh_project pie -%global upstream_version 0.7.0 +%global upstream_version 0.8.0 #global upstream_prever dev #global upstream_lower DEV @@ -135,6 +135,9 @@ done %changelog +* Thu Mar 13 2025 Remi Collet - 0.8.0-1 +- update to 0.8.0 + * Mon Mar 3 2025 Remi Collet - 0.7.0-1 - update to 0.7.0 diff --git a/sources b/sources index 121bdad..34100cc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pie-0.7.0-8304dd2.tgz) = 080fd188872a7330816ce4f8df67f41beec8d34b840b038e8c3618c8f52c3524ac946878b8bfbd8f32655c0d58233e313a0be144601344fe594d88dbe98ca018 +SHA512 (pie-0.8.0-108707d.tgz) = ad1b78ee6d405765e1f50f1fc54997f4cb947a75e3396d73fda17e1f21c645c8ec569ba05899cb5732f065e41a29f72782a8f13b7e8dc500a4a2de821c560ba1 From 6aa84acab78240f4b76a6d0809159cdd70ef2f8b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 15 Apr 2025 09:19:11 +0200 Subject: [PATCH 4/4] update to 0.9.0 add notice about dnf in self-update output open https://github.com/php/pie/issues/217 broken bash completion (cherry picked from commit 4851f135420f47912b9642b8c5bc518dfe2b85af) --- .gitignore | 1 + pie-rpm.patch | 11 +++++++++++ pie.spec | 12 +++++++++--- sources | 2 +- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index cf6c0b2..4dbaf78 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /pie-0.6.0-e7fcd16.tgz /pie-0.7.0-8304dd2.tgz /pie-0.8.0-108707d.tgz +/pie-0.9.0-2c73701.tgz diff --git a/pie-rpm.patch b/pie-rpm.patch index e73d0ab..bce68f7 100644 --- a/pie-rpm.patch +++ b/pie-rpm.patch @@ -10,3 +10,14 @@ diff -up ./bin/pie.rpm ./bin/pie $container = Container::factory(); +diff -up ./src/Command/SelfUpdateCommand.php.old ./src/Command/SelfUpdateCommand.php +--- ./src/Command/SelfUpdateCommand.php.old 2025-04-15 08:39:08.283938705 +0200 ++++ ./src/Command/SelfUpdateCommand.php 2025-04-15 08:40:47.169189092 +0200 +@@ -66,6 +66,7 @@ final class SelfUpdateCommand extends Co + { + if (! PieVersion::isPharBuild()) { + $output->writeln('Aborting! You are not running a PHAR, cannot self-update.'); ++ $output->writeln('Update the pie RPM using the package manager (dnf).'); + + return 1; + } diff --git a/pie.spec b/pie.spec index 31565a6..a6d189f 100644 --- a/pie.spec +++ b/pie.spec @@ -7,14 +7,14 @@ # Please, preserve the changelog entries # -%global gh_commit 108707df748ad2bbc96db8a1edd625b4332c364e +%global gh_commit 2c73701769a0edffd1f5f051b658f1ac31c78c64 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20241003 %global gh_branch main %global gh_owner php %global gh_project pie -%global upstream_version 0.8.0 +%global upstream_version 0.9.0 #global upstream_prever dev #global upstream_lower DEV @@ -24,7 +24,7 @@ Name: pie Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release: 1%{?dist} +Release: 2%{?dist} Summary: PHP Installer for Extensions # SPDX: pie is BSD-3-Clause, all dependencies are MIT @@ -37,6 +37,7 @@ Source1: %{name}-bash-completion Source9: makesrc.sh # Fix autoloader path +# add message about dnf in self-update command Patch0: %{name}-rpm.patch # Don't use XDG directories Patch1: %{name}-noxdg.patch @@ -135,6 +136,11 @@ done %changelog +* Tue Apr 15 2025 Remi Collet - 0.9.0-2 +- update to 0.9.0 +- add notice about dnf in self-update output +- open https://github.com/php/pie/issues/217 broken bash completion + * Thu Mar 13 2025 Remi Collet - 0.8.0-1 - update to 0.8.0 diff --git a/sources b/sources index 34100cc..f0d04ef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pie-0.8.0-108707d.tgz) = ad1b78ee6d405765e1f50f1fc54997f4cb947a75e3396d73fda17e1f21c645c8ec569ba05899cb5732f065e41a29f72782a8f13b7e8dc500a4a2de821c560ba1 +SHA512 (pie-0.9.0-2c73701.tgz) = b1b524d8000176fdc34970c468f2dfe3da080f44fdbf2be57056b58f6b187c833a31ef1894e7ae9dc768b33c4801d201697994a5d52a32954513a2a4349d5ec7