summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--composer-autoload.php5
-rw-r--r--composer-pr4262.patch92
-rw-r--r--composer-rpm.patch21
-rw-r--r--composer.spec18
4 files changed, 15 insertions, 121 deletions
diff --git a/composer-autoload.php b/composer-autoload.php
index 65c331f..b1404ec 100644
--- a/composer-autoload.php
+++ b/composer-autoload.php
@@ -14,8 +14,11 @@ $fedoraClassLoader->addPrefixes(array(
'Seld\\JsonLint\\' => $vendorDir,
'Seld\\PharUtils\\' => $vendorDir,
'Seld\\CliPrompt\\' => $vendorDir,
- 'JsonSchema\\' => $vendorDir,
'Symfony\\Component\\' => $vendorDir,
'Composer\\' => dirname(__DIR__)
));
$fedoraClassLoader->register();
+
+// Dependencies
+require_once $vendorDir . '/Composer/Spdx/autoload.php';
+require_once $vendorDir . '/JsonSchema/autoload.php';
diff --git a/composer-pr4262.patch b/composer-pr4262.patch
deleted file mode 100644
index 5508f0e..0000000
--- a/composer-pr4262.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From b0b73751be69058ca61109bde9eafeda114c620a Mon Sep 17 00:00:00 2001
-From: Remi Collet <fedora@famillecollet.com>
-Date: Thu, 16 Jul 2015 09:20:36 +0200
-Subject: [PATCH 1/2] fix for changes in justinrainbow/json-schema 1.4.4
-
----
- composer.json | 2 +-
- tests/Composer/Test/Json/ComposerSchemaTest.php | 12 ++++++------
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/composer.json b/composer.json
-index ffac4f2..91e385e 100644
---- a/composer.json
-+++ b/composer.json
-@@ -23,7 +23,7 @@
- },
- "require": {
- "php": ">=5.3.2",
-- "justinrainbow/json-schema": "~1.4",
-+ "justinrainbow/json-schema": "^1.4.4",
- "seld/jsonlint": "~1.0",
- "symfony/console": "~2.5",
- "symfony/finder": "~2.2",
-diff --git a/tests/Composer/Test/Json/ComposerSchemaTest.php b/tests/Composer/Test/Json/ComposerSchemaTest.php
-index 1b8805f..cf44d4a 100644
---- a/tests/Composer/Test/Json/ComposerSchemaTest.php
-+++ b/tests/Composer/Test/Json/ComposerSchemaTest.php
-@@ -23,18 +23,18 @@ public function testRequiredProperties()
- {
- $json = '{ }';
- $this->assertEquals(array(
-- array('property' => '', 'message' => 'the property name is required'),
-- array('property' => '', 'message' => 'the property description is required'),
-+ array('property' => 'name', 'message' => 'The property name is required'),
-+ array('property' => 'description', 'message' => 'The property description is required'),
- ), $this->check($json));
-
- $json = '{ "name": "vendor/package" }';
- $this->assertEquals(array(
-- array('property' => '', 'message' => 'the property description is required'),
-+ array('property' => 'description', 'message' => 'The property description is required'),
- ), $this->check($json));
-
- $json = '{ "description": "generic description" }';
- $this->assertEquals(array(
-- array('property' => '', 'message' => 'the property name is required'),
-+ array('property' => 'name', 'message' => 'The property name is required'),
- ), $this->check($json));
- }
-
-@@ -44,7 +44,7 @@ public function testMinimumStabilityValues()
- $this->assertEquals(array(
- array(
- 'property' => 'minimum-stability',
-- 'message' => 'does not match the regex pattern ^dev|alpha|beta|rc|RC|stable$'
-+ 'message' => 'Does not match the regex pattern ^dev|alpha|beta|rc|RC|stable$'
- ),
- ), $this->check($json), 'empty string');
-
-@@ -52,7 +52,7 @@ public function testMinimumStabilityValues()
- $this->assertEquals(array(
- array(
- 'property' => 'minimum-stability',
-- 'message' => 'does not match the regex pattern ^dev|alpha|beta|rc|RC|stable$'
-+ 'message' => 'Does not match the regex pattern ^dev|alpha|beta|rc|RC|stable$'
- ),
- ), $this->check($json), 'dummy');
-
-
-From 128901a8d0bb3ff54c0b2dc94638632e07f7ad79 Mon Sep 17 00:00:00 2001
-From: Remi Collet <fedora@famillecollet.com>
-Date: Thu, 16 Jul 2015 09:21:13 +0200
-Subject: [PATCH 2/2] ignore this test with 'jsonc'
-
----
- tests/Composer/Test/Json/JsonFileTest.php | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/tests/Composer/Test/Json/JsonFileTest.php b/tests/Composer/Test/Json/JsonFileTest.php
-index 279ccd9..ee65629 100644
---- a/tests/Composer/Test/Json/JsonFileTest.php
-+++ b/tests/Composer/Test/Json/JsonFileTest.php
-@@ -54,6 +54,9 @@ public function testParseErrorSkipsEscapedBackslash()
-
- public function testParseErrorDetectSingleQuotes()
- {
-+ if (defined('JSON_PARSER_NOTSTRICT')) {
-+ $this->markTestSkipped('jsonc issue');
-+ }
- $json = '{
- \'foo\': "bar"
- }';
diff --git a/composer-rpm.patch b/composer-rpm.patch
index 52d26ad..d53705a 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -22,24 +22,3 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
$schemaData = json_decode(file_get_contents($schemaFile));
if ($schema === self::LAX_SCHEMA) {
-diff -up ./src/Composer/Util/SpdxLicense.php.rpm ./src/Composer/Util/SpdxLicense.php
---- ./src/Composer/Util/SpdxLicense.php.rpm 2015-07-16 08:58:33.415021590 +0200
-+++ ./src/Composer/Util/SpdxLicense.php 2015-07-16 08:59:36.006332340 +0200
-@@ -167,7 +167,7 @@ class SpdxLicense
- return $this->licenses;
- }
-
-- $jsonFile = file_get_contents(__DIR__ . '/../../../res/spdx-licenses.json');
-+ $jsonFile = file_get_contents((getenv('BUILDROOT')?:'') . '/usr/share/composer/res/spdx-licenses.json');
- $this->licenses = json_decode($jsonFile, true);
-
- return $this->licenses;
-@@ -182,7 +182,7 @@ class SpdxLicense
- return $this->exceptions;
- }
-
-- $jsonFile = file_get_contents(__DIR__ . '/../../../res/spdx-exceptions.json');
-+ $jsonFile = file_get_contents((getenv('BUILDROOT')?:'') . '/usr/share/composer/res/spdx-exceptions.json');
- $this->exceptions = json_decode($jsonFile, true);
-
- return $this->exceptions;
diff --git a/composer.spec b/composer.spec
index e110249..04b8cc5 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,17 +6,17 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit 92faf1c7a83a73794fb914a990be435e1df373ca
+%global gh_commit 00c26791faeb83da8476b54bcc20596cf754362e
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_branch 1.0-dev
-%global gh_date 20150714
+%global gh_date 20150720
%global gh_owner composer
%global gh_project composer
%global with_tests %{?_without_tests:0}%{!?_without_tests:1}
Name: composer
Version: 1.0.0
-Release: 0.7.%{gh_date}git%{gh_short}%{?dist}
+Release: 0.8.%{gh_date}git%{gh_short}%{?dist}
Summary: Dependency Manager for PHP
Group: Development/Libraries
@@ -31,14 +31,12 @@ Patch0: %{name}-rpm.patch
# https://github.com/composer/composer/pull/4169
# skip online tests
Patch1: %{name}-pr4169.patch
-# https://github.com/composer/composer/pull/4262
-# fix for tests
-Patch2: %{name}-pr4262.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
%if %{with_tests}
BuildRequires: php-composer(justinrainbow/json-schema) >= 1.4.4
+BuildRequires: php-composer(composer/spdx-licenses) >= 1.0
BuildRequires: php-composer(seld/jsonlint) >= 1.0
BuildRequires: php-composer(symfony/console) >= 2.5
BuildRequires: php-composer(symfony/finder) >= 2.2
@@ -51,6 +49,7 @@ BuildRequires: php-zip
# From composer.json, requires
# "php": ">=5.3.2",
# "justinrainbow/json-schema": "^1.4.4",
+# "composer/spdx-licenses": "~1.0",
# "seld/jsonlint": "~1.0",
# "symfony/console": "~2.5",
# "symfony/finder": "~2.2",
@@ -61,6 +60,8 @@ Requires: php(language) >= 5.3.2
Requires: php-cli
Requires: php-composer(justinrainbow/json-schema) >= 1.4.4
Requires: php-composer(justinrainbow/json-schema) < 2
+Requires: php-composer(composer/spdx-licenses) >= 1.0
+Requires: php-composer(composer/spdx-licenses) < 2
Requires: php-composer(seld/jsonlint) >= 1.0
Requires: php-composer(seld/jsonlint) < 2
Requires: php-composer(seld/phar-utils) >= 1.0
@@ -115,7 +116,6 @@ Documentation: https://getcomposer.org/doc/
%patch0 -p1
%patch1 -p1
-%patch2 -p1
cp -p %{SOURCE1} src/Composer/autoload.php
cp -p %{SOURCE2} tests/bootstrap.php
@@ -175,6 +175,10 @@ rm -rf %{buildroot}
%changelog
+* Tue Jul 21 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.8.20150720git00c2679
+- new snapshot
+- add dependency on composer/spdx-licenses
+
* Thu Jul 16 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.7.20150714git92faf1c
- new snapshot
- raise dependency on justinrainbow/json-schema 1.4.4
generated by cgit (git 2.34.1) at 2024-11-23 05:51:41 +0000