summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-06-10 07:27:37 +0200
committerRemi Collet <remi@remirepo.net>2021-06-10 07:27:37 +0200
commit6986eadd7594a46c8147e6cb867180298f03ead2 (patch)
treee86a47b2c54d86dde3ea40f0c81e608c8c6c42c4
parent7820ff8f718de459d484bbcfcc7402c50d10bb35 (diff)
update to 2.1.3HEADmaster
-rw-r--r--composer-rpm.patch32
-rw-r--r--composer.spec12
2 files changed, 28 insertions, 16 deletions
diff --git a/composer-rpm.patch b/composer-rpm.patch
index 5f05a85..d63b69b 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -110,16 +110,22 @@ diff -up ./tests/Composer/Test/PolyfillTestCase.php.rpm ./tests/Composer/Test/Po
{
--- ./src/Composer/InstalledVersions.php.rpm 2021-06-07 08:18:59.326450774 +0200
+++ ./src/Composer/InstalledVersions.php 2021-06-07 08:19:11.525413189 +0200
-@@ -315,10 +315,9 @@
- }
- }
-
-- if (null === self::$installed) {
-- self::$installed = require __DIR__ . '/installed.php';
-+ if (null !== self::$installed) {
-+ $installed[] = self::$installed;
- }
-- $installed[] = self::$installed;
-
- return $installed;
- }
+@@ -251,7 +251,7 @@ class InstalledVersions
+ if (null === self::$installed) {
+ // only require the installed.php file if this file is loaded from its dumped location,
+ // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
+- if (substr(__DIR__, -8, 1) !== 'C') {
++ if (substr(__DIR__, -8, 1) !== 'C' && is_file(__DIR__ . '/installed.php')) {
+ self::$installed = include __DIR__ . '/installed.php';
+ } else {
+ self::$installed = array();
+@@ -324,7 +324,7 @@ class InstalledVersions
+ if (null === self::$installed) {
+ // only require the installed.php file if this file is loaded from its dumped location,
+ // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
+- if (substr(__DIR__, -8, 1) !== 'C') {
++ if (substr(__DIR__, -8, 1) !== 'C' && is_file(__DIR__ . '/installed.php')) {
+ self::$installed = require __DIR__ . '/installed.php';
+ } else {
+ self::$installed = array();
+
diff --git a/composer.spec b/composer.spec
index 2a4826a..60e4edc 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
# For compatibility with SCL
%undefine __brp_mangle_shebangs
-%global gh_commit e338749d4e6cc97e1136c210ce0212d4a59e3a58
+%global gh_commit fc5c4573aafce3a018eb7f1f8f91cea423970f2e
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_branch 2.0-dev
%global gh_owner composer
@@ -19,7 +19,7 @@
%global api_version 2.1.0
%global run_version 2.1.0
-%global upstream_version 2.1.1
+%global upstream_version 2.1.3
#global upstream_prever RC1
#global upstream_lower rc1
@@ -39,7 +39,7 @@
Name: composer
Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: Dependency Manager for PHP
License: MIT
@@ -330,6 +330,12 @@ exit $ret
%changelog
+* Thu Jun 10 2021 Remi Collet <remi@remirepo.net> - 2.1.3-1
+- update to 2.1.3
+
+* Mon Jun 7 2021 Remi Collet <remi@remirepo.net> - 2.1.2-1
+- update to 2.1.2
+
* Mon Jun 7 2021 Remi Collet <remi@remirepo.net> - 2.1.1-2
- fix Composer\InstalledVersions RPM installation