summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-06-07 08:28:36 +0200
committerRemi Collet <remi@remirepo.net>2021-06-07 08:28:36 +0200
commit7820ff8f718de459d484bbcfcc7402c50d10bb35 (patch)
tree0caedace843e0f7f961d6614653f401dadeed063
parentd4002065905b78befe6f16ee6f7d832dc3779169 (diff)
fix Composer\InstalledVersions RPM installation
-rw-r--r--composer-rpm.patch15
-rw-r--r--composer.spec5
2 files changed, 19 insertions, 1 deletions
diff --git a/composer-rpm.patch b/composer-rpm.patch
index bbf0feb..5f05a85 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -108,3 +108,18 @@ diff -up ./tests/Composer/Test/PolyfillTestCase.php.rpm ./tests/Composer/Test/Po
} else {
abstract class PolyfillTestCase extends TestCase
{
+--- ./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;
+ }
diff --git a/composer.spec b/composer.spec
index 854049a..2a4826a 100644
--- a/composer.spec
+++ b/composer.spec
@@ -39,7 +39,7 @@
Name: composer
Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Dependency Manager for PHP
License: MIT
@@ -330,6 +330,9 @@ exit $ret
%changelog
+* Mon Jun 7 2021 Remi Collet <remi@remirepo.net> - 2.1.1-2
+- fix Composer\InstalledVersions RPM installation
+
* Fri Jun 4 2021 Remi Collet <remi@remirepo.net> - 2.1.1-1
- update to 2.1.1