summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--composer-autoload.php6
-rw-r--r--composer-rpm.patch28
-rw-r--r--composer.json12
-rw-r--r--composer.spec33
4 files changed, 43 insertions, 36 deletions
diff --git a/composer-autoload.php b/composer-autoload.php
index c103501..19206ae 100644
--- a/composer-autoload.php
+++ b/composer-autoload.php
@@ -17,7 +17,9 @@ if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
$vendorDir . '/Composer/CaBundle/autoload.php',
$vendorDir . '/Composer/Spdx/autoload.php',
$vendorDir . '/Composer/Semver/autoload.php',
- $vendorDir . '/JsonSchema2/autoload.php',
$vendorDir . '/Psr/Log/autoload.php',
-));
+ array(
+ $vendorDir . '/JsonSchema4/autoload.php',
+ $vendorDir . '/JsonSchema2/autoload.php',
+)));
diff --git a/composer-rpm.patch b/composer-rpm.patch
index 2e2d330..1cdfd7d 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,6 +1,6 @@
diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm 2016-04-29 18:32:14.000000000 +0200
-+++ ./bin/composer 2016-04-30 10:07:31.835289957 +0200
+--- ./bin/composer.rpm 2016-12-12 10:30:58.174009561 +0100
++++ ./bin/composer 2016-12-12 10:32:17.465427241 +0100
@@ -5,7 +5,7 @@ if (PHP_SAPI !== 'cli') {
echo 'Warning: Composer should be invoked via the CLI version of PHP, not the '.PHP_SAPI.' SAPI'.PHP_EOL;
}
@@ -8,12 +8,12 @@ diff -up ./bin/composer.rpm ./bin/composer
-require __DIR__.'/../src/bootstrap.php';
+require '/usr/share/php/Composer/autoload.php';
- use Composer\Console\Application;
-
+ use Composer\Factory;
+ use Composer\XdebugHandler;
diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm 2016-04-30 10:07:31.836289961 +0200
-+++ ./src/Composer/Autoload/AutoloadGenerator.php 2016-04-30 10:08:50.489640789 +0200
-@@ -288,7 +288,7 @@ EOF;
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm 2016-12-11 17:04:50.000000000 +0100
++++ ./src/Composer/Autoload/AutoloadGenerator.php 2016-12-12 10:30:58.175009567 +0100
+@@ -305,7 +305,7 @@ EOF;
file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion));
$this->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php');
@@ -23,8 +23,8 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo
if ($this->runScripts) {
$this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
---- ./src/Composer/Compiler.php.rpm 2016-04-29 18:32:14.000000000 +0200
-+++ ./src/Composer/Compiler.php 2016-04-30 10:07:31.836289961 +0200
+--- ./src/Composer/Compiler.php.rpm 2016-12-11 17:04:50.000000000 +0100
++++ ./src/Composer/Compiler.php 2016-12-12 10:30:58.175009567 +0100
@@ -97,7 +97,7 @@ class Compiler
$finder = new Finder();
$finder->files()
@@ -35,8 +35,8 @@ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
->sort($finderSort)
;
diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm 2016-04-29 18:32:14.000000000 +0200
-+++ ./src/Composer/Json/JsonFile.php 2016-04-30 10:07:31.836289961 +0200
+--- ./src/Composer/Json/JsonFile.php.rpm 2016-12-11 17:04:50.000000000 +0100
++++ ./src/Composer/Json/JsonFile.php 2016-12-12 10:30:58.175009567 +0100
@@ -156,7 +156,7 @@ class JsonFile
self::validateSyntax($content, $this->path);
}
@@ -47,9 +47,9 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
if ($schema === self::LAX_SCHEMA) {
diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php
---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm 2016-04-29 18:32:14.000000000 +0200
-+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2016-04-30 10:07:31.836289961 +0200
-@@ -87,7 +87,7 @@ class ComposerSchemaTest extends \PHPUni
+--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm 2016-12-11 17:04:50.000000000 +0100
++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2016-12-12 10:30:58.175009567 +0100
+@@ -95,7 +95,7 @@ class ComposerSchemaTest extends \PHPUni
private function check($json)
{
diff --git a/composer.json b/composer.json
index fc3d584..8e9ba21 100644
--- a/composer.json
+++ b/composer.json
@@ -23,15 +23,15 @@
},
"require": {
"php": "^5.3.2 || ^7.0",
- "justinrainbow/json-schema": "^1.6 || ^2.0",
+ "justinrainbow/json-schema": "^1.6 || ^2.0 || ^3.0 || ^4.0",
"composer/ca-bundle": "^1.0",
"composer/semver": "^1.0",
"composer/spdx-licenses": "^1.0",
"seld/jsonlint": "^1.4",
- "symfony/console": "^2.5 || ^3.0",
- "symfony/finder": "^2.2 || ^3.0",
- "symfony/process": "^2.1 || ^3.0",
- "symfony/filesystem": "^2.5 || ^3.0",
+ "symfony/console": "^2.7 || ^3.0",
+ "symfony/finder": "^2.7 || ^3.0",
+ "symfony/process": "^2.7 || ^3.0",
+ "symfony/filesystem": "^2.7 || ^3.0",
"seld/phar-utils": "^1.0",
"seld/cli-prompt": "^1.0",
"psr/log": "^1.0"
@@ -59,7 +59,7 @@
"bin": ["bin/composer"],
"extra": {
"branch-alias": {
- "dev-master": "1.2-dev"
+ "dev-master": "1.3-dev"
}
},
"scripts": {
diff --git a/composer.spec b/composer.spec
index 636d857..f904230 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,18 +6,18 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit 7895e4a7e0e05b06e0ebfae96fc154c6a2ba75f0
+%global gh_commit a72a8caa9ae569581449cec4a263cf77ead7ecd6
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_branch 1.0-dev
%global gh_owner composer
%global gh_project composer
%global with_tests %{?_without_tests:0}%{!?_without_tests:1}
%global api_version 1.1.0
-#global prever RC
+%global prever RC
Name: composer
-Version: 1.2.4
-Release: 1%{?dist}
+Version: 1.3.0
+Release: 0.1.%{prever}%{?dist}
Summary: Dependency Manager for PHP
Group: Development/Libraries
@@ -63,22 +63,22 @@ BuildRequires: php-PsrLog >= 1.0.0-8
# From composer.json, "require": {
# "php": "^5.3.2 || ^7.0",
-# "justinrainbow/json-schema": "^1.6 || ^2.0",
+# "justinrainbow/json-schema": "^1.6 || ^2.0 || ^3.0 || ^4.0",
# "composer/ca-bundle": "^1.0",
# "composer/semver": "^1.0",
# "composer/spdx-licenses": "^1.0",
# "seld/jsonlint": "~1.4",
-# "symfony/console": "^2.5 || ^3.0",
-# "symfony/finder": "^2.2 || ^3.0",
-# "symfony/process": "^2.1 || ^3.0",
-# "symfony/filesystem": "^2.5 || ^3.0",
+# "symfony/console": "^2.7 || ^3.0",
+# "symfony/finder": "^2.7 || ^3.0",
+# "symfony/process": "^2.7 || ^3.0",
+# "symfony/filesystem": "^2.7 || ^3.0",
# "seld/phar-utils": "^1.0",
# "seld/cli-prompt": "^1.0",
# "psr/log": "^1.0"
Requires: php(language) >= 5.3.2
Requires: php-cli
Requires: php-composer(justinrainbow/json-schema) >= 2.0
-Requires: php-composer(justinrainbow/json-schema) < 3
+Requires: php-composer(justinrainbow/json-schema) < 5
Requires: php-composer(composer/spdx-licenses) >= 1.0
Requires: php-composer(composer/spdx-licenses) < 2
Requires: php-composer(composer/ca-bundle) >= 1.0
@@ -93,13 +93,13 @@ Requires: php-composer(seld/cli-prompt) >= 1.0
Requires: php-composer(seld/cli-prompt) < 2
Requires: php-composer(psr/log) >= 1.0
Requires: php-composer(psr/log) < 2
-Requires: php-composer(symfony/console) >= 2.5
+Requires: php-composer(symfony/console) >= 2.7
Requires: php-composer(symfony/console) < 4
-Requires: php-composer(symfony/finder) >= 2.2
+Requires: php-composer(symfony/finder) >= 2.7
Requires: php-composer(symfony/finder) < 4
-Requires: php-composer(symfony/process) >= 2.1
+Requires: php-composer(symfony/process) >= 2.7
Requires: php-composer(symfony/process) < 4
-Requires: php-composer(symfony/filesystem) >= 2.5
+Requires: php-composer(symfony/filesystem) >= 2.7
Requires: php-composer(symfony/filesystem) < 4
# From composer.json, suggest
# "ext-zip": "Enabling the zip extension allows you to unzip archives, and allows gzip compression of all internet traffic",
@@ -259,6 +259,11 @@ rm -rf %{buildroot}
%changelog
+* Mon Dec 12 2016 Remi Collet <remi@fedoraproject.org> - 1.3.0-0.1.RC
+- update to 1.3.0-RC
+- raise dependency on symfony 2.7
+- allow justinrainbow/json-schema 4
+
* Wed Dec 7 2016 Remi Collet <remi@fedoraproject.org> - 1.2.4-1
- update to 1.2.4
generated by cgit (git 2.34.1) at 2024-11-29 14:19:45 +0000