Compare commits
4 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6aa84acab7 | ||
|
|
0331faa802 | ||
|
|
f471d0fba5 | ||
|
|
54006c1ea8 |
4 changed files with 36 additions and 68 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -1,3 +1,7 @@
|
|||
/pie-0.3.0-dc299c3.tgz
|
||||
/pie-0.4.0-883447d.tgz
|
||||
/pie-0.5.0-b6e014b.tgz
|
||||
/pie-0.6.0-e7fcd16.tgz
|
||||
/pie-0.7.0-8304dd2.tgz
|
||||
/pie-0.8.0-108707d.tgz
|
||||
/pie-0.9.0-2c73701.tgz
|
||||
|
|
|
|||
|
|
@ -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('<comment>Aborting! You are not running a PHAR, cannot self-update.</comment>');
|
||||
+ $output->writeln('<comment>Update the pie RPM using the package manager (dnf).</comment>');
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
|
|
|||
87
pie.spec
87
pie.spec
|
|
@ -1,22 +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
|
||||
#
|
||||
|
||||
%bcond_with generators
|
||||
|
||||
%global gh_commit b6e014bdbe790a6cbb83ea0582ac9b6eb8ab31c1
|
||||
%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.5.0
|
||||
%global upstream_version 0.9.0
|
||||
#global upstream_prever dev
|
||||
#global upstream_lower DEV
|
||||
|
||||
|
|
@ -26,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
|
||||
|
|
@ -39,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
|
||||
|
|
@ -52,9 +51,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 +72,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 +97,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 +136,21 @@ done
|
|||
|
||||
|
||||
%changelog
|
||||
* Tue Apr 15 2025 Remi Collet <remi@remirepo.net> - 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 <remi@remirepo.net> - 0.8.0-1
|
||||
- update to 0.8.0
|
||||
|
||||
* Mon Mar 3 2025 Remi Collet <remi@remirepo.net> - 0.7.0-1
|
||||
- update to 0.7.0
|
||||
|
||||
* Wed Jan 29 2025 Remi Collet <remi@remirepo.net> - 0.6.0-1
|
||||
- update to 0.6.0
|
||||
- always use composer-generators
|
||||
|
||||
* Thu Jan 9 2025 Remi Collet <remi@remirepo.net> - 0.5.0-1
|
||||
- update to 0.5.0
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (pie-0.5.0-b6e014b.tgz) = e7f28f1d3bb53340711555e30bf118a6e563a45a3fe06da2a67ebcb65046aa24505ddebfecd73b0a898a8d02a2d6de55545777bcd17d9ff15a30256ffe487b0f
|
||||
SHA512 (pie-0.9.0-2c73701.tgz) = b1b524d8000176fdc34970c468f2dfe3da080f44fdbf2be57056b58f6b187c833a31ef1894e7ae9dc768b33c4801d201697994a5d52a32954513a2a4349d5ec7
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue