summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2015-04-17 10:09:49 +0200
committerRemi Collet <fedora@famillecollet.com>2015-04-17 10:09:49 +0200
commit8e024151a911bf568af1aa2b6f0f0ec712e15759 (patch)
treee020fe11f872c26c1bc955096be81fb41e77cfa4
parent08684b7217d4f9143844b0f06be58d7e88b7b26b (diff)
composer 1.0.0-0.3.20150415git921b3a0
-rw-r--r--composer-rpm.patch34
-rw-r--r--composer.spec15
2 files changed, 33 insertions, 16 deletions
diff --git a/composer-rpm.patch b/composer-rpm.patch
index b065e68..c40e7ef 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -3,7 +3,7 @@ diff -up ./bin/composer.rpm ./bin/composer
+++ ./bin/composer 2015-02-26 10:25:16.012610034 +0100
@@ -1,11 +1,11 @@
-#!/usr/bin/env php
-+#!/usr/bin/php
++#!/usr/bin/env php
<?php
if (PHP_SAPI !== 'cli') {
@@ -27,18 +27,30 @@ 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/SpdxLicenseIdentifier.php.rpm ./src/Composer/Util/SpdxLicenseIdentifier.php
---- ./src/Composer/Util/SpdxLicenseIdentifier.php.rpm 2015-02-25 20:44:34.000000000 +0100
-+++ ./src/Composer/Util/SpdxLicenseIdentifier.php 2015-02-26 10:25:16.012610034 +0100
-@@ -61,7 +61,7 @@ class SpdxLicenseIdentifier
- */
- private function initIdentifiers()
+diff -up src/Composer/Util/SpdxLicense.php.old src/Composer/Util/SpdxLicense.php
+--- ./src/Composer/Util/SpdxLicense.php.old 2015-04-17 09:57:53.680999733 +0200
++++ ./src/Composer/Util/SpdxLicense.php 2015-04-17 09:59:50.397498276 +0200
+@@ -38,7 +38,7 @@ class SpdxLicense
+ return $this->licenses;
+ }
+
+- $jsonFile = new JsonFile(__DIR__ . '/../../../res/spdx-licenses.json');
++ $jsonFile = new JsonFile((getenv('BUILDROOT')?:'') . '/usr/share/composer/res/spdx-licenses.json');
+ $this->licenses = $jsonFile->read();
+
+ return $this->licenses;
+diff -up src/Composer/Util/SpdxLicensesUpdater.php.old src/Composer/Util/SpdxLicensesUpdater.php
+--- ./src/Composer/Util/SpdxLicensesUpdater.php.old 2015-04-17 09:58:00.645029479 +0200
++++ ./src/Composer/Util/SpdxLicensesUpdater.php 2015-04-17 10:00:36.578695534 +0200
+@@ -28,7 +28,7 @@ class SpdxLicensesUpdater
{
-- $jsonFile = new JsonFile(__DIR__ . '/../../../res/spdx-identifier.json');
-+ $jsonFile = new JsonFile((getenv('BUILDROOT')?:'') . '/usr/share/composer/res/spdx-identifier.json');
- $this->identifiers = $jsonFile->read();
+ $json = json_encode($this->getLicenses(), true);
+ $prettyJson = JsonFormatter::format($json, true, true);
+- file_put_contents(__DIR__ . '/../../../res/spdx-licenses.json', $prettyJson);
++ file_put_contents((getenv('BUILDROOT')?:'') . '/usr/share/composer/res/spdx-licenses.json', $prettyJson);
}
-
+
+ private function getLicenses()
diff -up ./tests/Composer/Test/Json/JsonFileTest.php.rpm ./tests/Composer/Test/Json/JsonFileTest.php
--- ./tests/Composer/Test/Json/JsonFileTest.php.rpm 2015-02-26 10:26:10.607821640 +0100
+++ ./tests/Composer/Test/Json/JsonFileTest.php 2015-02-26 10:27:05.430034125 +0100
diff --git a/composer.spec b/composer.spec
index 3b114c7..a16c89c 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,10 +6,10 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit 4d134ce8a2aacb9566fee8deb8c514248fd2a983
+%global gh_commit 921b3a0eba139820716f7aeefb553197c14656d8
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_branch 1.0-dev
-%global gh_date 20150408
+%global gh_date 20150415
%global gh_owner composer
%global gh_project composer
%global with_tests %{?_without_tests:0}%{!?_without_tests:1}
@@ -32,7 +32,7 @@ Patch0: %{name}-rpm.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
%if %{with_tests}
-BuildRequires: php-composer(justinrainbow/json-schema) >= 1.3
+BuildRequires: php-composer(justinrainbow/json-schema) >= 1.4
BuildRequires: php-composer(seld/jsonlint) >= 1.0
BuildRequires: php-composer(symfony/console) >= 2.5
BuildRequires: php-composer(symfony/finder) >= 2.2
@@ -43,13 +43,13 @@ BuildRequires: %{_bindir}/phpunit
# From composer.json, requires
# "php": ">=5.3.2",
-# "justinrainbow/json-schema": "~1.3",
+# "justinrainbow/json-schema": "~1.4",
# "seld/jsonlint": "~1.0",
# "symfony/console": "~2.5",
# "symfony/finder": "~2.2",
# "symfony/process": "~2.1"
Requires: php(language) >= 5.3.2
-Requires: php-composer(justinrainbow/json-schema) >= 1.3
+Requires: php-composer(justinrainbow/json-schema) >= 1.4
Requires: php-composer(justinrainbow/json-schema) < 2
Requires: php-composer(seld/jsonlint) >= 1.0
Requires: php-composer(seld/jsonlint) < 2
@@ -157,6 +157,11 @@ rm -rf %{buildroot}
%changelog
+* Fri Apr 17 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.3.20150415git921b3a0
+- new snapshot
+- raise dependency on justinrainbow/json-schema ~1.4
+- keep upstream shebang with /usr/bin/env (for SCL)
+
* Thu Apr 9 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.3.20150408git4d134ce
- new snapshot
- lower dependency on justinrainbow/json-schema ~1.3