From 19c570a6c92997ee6e04e620f683707cea57cd22 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 30 Oct 2024 11:53:32 +0100 Subject: refresh dependencies add patches from composer to skip XDG and drop bundled cacert.rpm --- pie.spec | 100 +++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 56 insertions(+), 44 deletions(-) (limited to 'pie.spec') diff --git a/pie.spec b/pie.spec index d00beef..f33d4ed 100644 --- a/pie.spec +++ b/pie.spec @@ -30,11 +30,11 @@ 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 -License: BSD-3-Clause and MIT +License: BSD-3-Clause AND MIT URL: https://github.com/php/pie # tarball generated by makesrc.sh Source0: %{gh_project}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tgz @@ -44,6 +44,10 @@ Source9: makesrc.sh # Fix autoloader path Patch0: %{name}-rpm.patch +# Don't use XDG directories +Patch1: %{name}-noxdg.patch +# Don't use bundled cacert.pem +Patch2: %{name}-nocacert.patch BuildArch: noarch # platform set in makesrc.sh @@ -78,46 +82,46 @@ Requires: php-phar %if %{without generators} # Bundled libraries # License MIT -Provides: bundled(php-composer-ca-bundle) = 1.5.2 -Provides: bundled(php-composer-class-map-generator) = 1.4.0 -Provides: bundled(php-composer-composer) = dev-main -Provides: bundled(php-composer-metadata-minifier) = 1.0.0 -Provides: bundled(php-composer-pcre) = 3.3.1 -Provides: bundled(php-composer-semver) = 3.4.3 -Provides: bundled(php-composer-spdx-licenses) = 1.5.8 -Provides: bundled(php-composer-xdebug-handler) = 3.0.5 -Provides: bundled(php-guzzlehttp-guzzle) = 7.9.2 -Provides: bundled(php-guzzlehttp-promises) = 2.0.3 -Provides: bundled(php-guzzlehttp-psr7) = 2.7.0 -Provides: bundled(php-illuminate-container) = v10.48.22 -Provides: bundled(php-illuminate-contracts) = v10.48.22 -Provides: bundled(php-justinrainbow-json-schema) = 5.3.0 -Provides: bundled(php-psr-container) = 2.0.2 -Provides: bundled(php-psr-http-client) = 1.0.3 -Provides: bundled(php-psr-http-factory) = 1.1.0 -Provides: bundled(php-psr-http-message) = 2.0 -Provides: bundled(php-psr-log) = 3.0.2 -Provides: bundled(php-psr-simple-cache) = 3.0.0 -Provides: bundled(php-ralouphie-getallheaders) = 3.0.3 -Provides: bundled(php-react-promise) = v3.2.0 -Provides: bundled(php-seld-jsonlint) = 1.11.0 -Provides: bundled(php-seld-phar-utils) = 1.2.1 -Provides: bundled(php-seld-signal-handler) = 2.0.2 -Provides: bundled(php-symfony-console) = v6.4.12 -Provides: bundled(php-symfony-deprecation-contracts) = v3.5.0 -Provides: bundled(php-symfony-filesystem) = v6.4.12 -Provides: bundled(php-symfony-finder) = v6.4.11 -Provides: bundled(php-symfony-polyfill-ctype) = v1.31.0 -Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.31.0 -Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.31.0 -Provides: bundled(php-symfony-polyfill-mbstring) = v1.31.0 -Provides: bundled(php-symfony-polyfill-php73) = v1.31.0 -Provides: bundled(php-symfony-polyfill-php80) = v1.31.0 -Provides: bundled(php-symfony-polyfill-php81) = v1.31.0 -Provides: bundled(php-symfony-process) = v6.4.12 -Provides: bundled(php-symfony-service-contracts) = v3.5.0 -Provides: bundled(php-symfony-string) = v6.4.12 -Provides: bundled(php-webmozart-assert) = 1.11.0 +Provides: bundled(php-composer(composer/ca-bundle)) = 1.5.2 +Provides: bundled(php-composer(composer/class-map-generator)) = 1.4.0 +Provides: bundled(php-composer(composer/composer)) = dev-main +Provides: bundled(php-composer(composer/metadata-minifier)) = 1.0.0 +Provides: bundled(php-composer(composer/pcre)) = 3.3.1 +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(guzzlehttp/guzzle)) = 7.9.2 +Provides: bundled(php-composer(guzzlehttp/promises)) = 2.0.4 +Provides: bundled(php-composer(guzzlehttp/psr7)) = 2.7.0 +Provides: bundled(php-composer(illuminate/container)) = v10.48.22 +Provides: bundled(php-composer(illuminate/contracts)) = v10.48.22 +Provides: bundled(php-composer(justinrainbow/json-schema)) = 5.3.0 +Provides: bundled(php-composer(psr/container)) = 2.0.2 +Provides: bundled(php-composer(psr/http-client)) = 1.0.3 +Provides: bundled(php-composer(psr/http-factory)) = 1.1.0 +Provides: bundled(php-composer(psr/http-message)) = 2.0 +Provides: bundled(php-composer(psr/log)) = 3.0.2 +Provides: bundled(php-composer(psr/simple-cache)) = 3.0.0 +Provides: bundled(php-composer(ralouphie/getallheaders)) = 3.0.3 +Provides: bundled(php-composer(react/promise)) = v3.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)) = v6.4.13 +Provides: bundled(php-composer(symfony/deprecation-contracts)) = v3.5.0 +Provides: bundled(php-composer(symfony/filesystem)) = v6.4.13 +Provides: bundled(php-composer(symfony/finder)) = v6.4.13 +Provides: bundled(php-composer(symfony/polyfill-ctype)) = v1.31.0 +Provides: bundled(php-composer(symfony/polyfill-intl-grapheme)) = v1.31.0 +Provides: bundled(php-composer(symfony/polyfill-intl-normalizer)) = v1.31.0 +Provides: bundled(php-composer(symfony/polyfill-mbstring)) = v1.31.0 +Provides: bundled(php-composer(symfony/polyfill-php73)) = v1.31.0 +Provides: bundled(php-composer(symfony/polyfill-php80)) = v1.31.0 +Provides: bundled(php-composer(symfony/polyfill-php81)) = v1.31.0 +Provides: bundled(php-composer(symfony/process)) = v6.4.13 +Provides: bundled(php-composer(symfony/service-contracts)) = v3.5.0 +Provides: bundled(php-composer(symfony/string)) = v6.4.13 +Provides: bundled(php-composer(webmozart/assert)) = 1.11.0 # Composer library Provides: php-composer(php/pie) = %{version} @@ -138,7 +142,11 @@ Documentation: /usr/share/doc/pie/docs/usage.md %setup -q -n %{gh_project}-%{gh_commit} %patch -P0 -p1 -b .rpm -find . \( -name \*.rpm -o -name \*noxdg \) -delete -print +%patch -P1 -p1 -b .noxdg +%patch -P2 -p1 -b .nocacert +find . \( -name \*.rpm -o -name \*noxdg -o -name \*nocacert \) -delete -print + +rm vendor/composer/ca-bundle/res/cacert.pem : Set version sed -e 's/@pie_version@/%{upstream_version}%{?upstream_prever}/' -i bin/pie @@ -156,7 +164,7 @@ php -r ' foreach($pkgs["packages"] as $pkg) { $lic = implode(" and ", $pkg["license"]); if (!isset($res[$lic])) $res[$lic] = []; - $res[$lic][] = sprintf("Provides: bundled(php-%s) = %s", str_replace(["/", "_"], ["-", "-"], $pkg["name"]), $pkg["version"]); + $res[$lic][] = sprintf("Provides: bundled(php-composer(%s)) = %s", $pkg["name"], $pkg["version"]); } foreach($res as $lic => $lib) { sort($lib); @@ -203,6 +211,10 @@ done %changelog +* Wed Oct 30 2024 Remi Collet - 0.1.0-2 +- refresh dependencies +- add patches from composer to skip XDG and drop bundled cacert.rpm + * Thu Oct 10 2024 Remi Collet - 0.1.0-1 - update to 0.1.0 (pre-release) -- cgit