commit b3a11e21a58745e41a6d8ace9788534be407930e
Author: Elan Ruusamäe <g...@delfi.ee>
Date: Wed Apr 9 19:41:47 2014 +0300
up to 1.0.0-alpha8, supports psr-4
composer.spec | 17 +++++++----------
no-bundle-symfony.patch | 6 +++---
system-symfony.patch | 10 +++++-----
3 files changed, 15 insertions(+), 18 deletions(-)
---
diff --git a/composer.spec b/composer.spec
index fbed9af..80bc30e 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,9 +6,8 @@
%bcond_with bootstrap # build boostrap
%define php_min_version 5.3.4
-%define githash f134e09
-%define subver alpha7
-%define rel 0.17
+%define subver alpha8
+%define rel 0.19
%include /usr/lib/rpm/macros.php
Summary: Dependency Manager for PHP
Name: composer
@@ -16,10 +15,10 @@ Version: 1.0.0
Release: 0.%{subver}.%{rel}
License: MIT
Group: Development/Languages/PHP
-Source0:
https://github.com/composer/composer/archive/%{githash}/%{name}-%{version}-%{githash}.tar.gz
-# Source0-md5: 21a70f5ec468b68429a03551f1ef150e
+Source0:
https://github.com/composer/composer/archive/%{version}-%{subver}/%{name}-%{version}-%{subver}.tar.gz
+# Source0-md5: a304aecf48b8406730d572e204afd6db
Source1:
http://getcomposer.org/download/%{version}-%{subver}/%{name}.phar
-# Source1-md5: f9b1dbd4ad0e3707bfe216690b210a7e
+# Source1-md5: df1001975035f07d09307bf1f1e62584
Patch0: nogit.patch
Patch1: no-bundle-symfony.patch
Patch2: system-symfony.patch
@@ -74,13 +73,11 @@ composer=composer
%endif
if [ ! -d vendor ]; then
COMPOSER_HOME=${PWD:=$(pwd)} \
- $composer install --prefer-dist -v
+ $composer install --prefer-dist -v --no-dev
%{__patch} -p1 < %{PATCH2}
fi
-V=$(echo composer-composer-*)
-V=${V#composer-composer-}
-COMPOSER_VERSION=%{version}%{?subver:-%{subver}}${V:+-g$V} \
+COMPOSER_VERSION=%{version}%{?subver:-%{subver}} \
%{__php} -d phar.readonly=0 ./bin/compile
# sanity check
diff --git a/no-bundle-symfony.patch b/no-bundle-symfony.patch
index 18f19dd..6a732cf 100644
--- a/no-bundle-symfony.patch
+++ b/no-bundle-symfony.patch
@@ -8,8 +8,8 @@
->in(__DIR__.'/../../vendor/seld/jsonlint/src/')
->in(__DIR__.'/../../vendor/justinrainbow/json-schema/src/')
;
---- composer-1.0.0-0.alpha7.0.17/composer.json~ 2013-11-11
15:41:21.000000000 +0200
-+++ composer-1.0.0-0.alpha7.0.17/composer.json 2013-11-13 09:38:09.329316303
+0200
+--- composer-1.0.0-0.alpha8.0.18/composer.json~ 2014-01-06
20:39:59.000000000 +0200
++++ composer-1.0.0-0.alpha8.0.18/composer.json 2014-04-09 19:23:59.964432023
+0300
@@ -24,10 +24,7 @@
"require": {
"php": ">=5.3.2",
@@ -17,7 +17,7 @@
- "seld/jsonlint": "1.*",
- "symfony/console": "~2.3",
- "symfony/finder": "~2.2",
-- "symfony/process": "~2.1@dev"
+- "symfony/process": "~2.1"
+ "seld/jsonlint": "1.*"
},
"require-dev": {
diff --git a/system-symfony.patch b/system-symfony.patch
index 892452e..b4d7044 100644
--- a/system-symfony.patch
+++ b/system-symfony.patch
@@ -1,5 +1,5 @@
---- composer-1.0.0/vendor/composer/autoload_namespaces.php~ 2013-04-12
18:41:14.000000000 +0300
-+++ composer-1.0.0/vendor/composer/autoload_namespaces.php 2013-04-12
18:42:10.735493349 +0300
+--- composer-1.0.0-0.alpha8.0.18/vendor/composer/autoload_namespaces.php~
2014-04-09 19:25:49.000000000 +0300
++++ composer-1.0.0-0.alpha8.0.18/vendor/composer/autoload_namespaces.php
2014-04-09 19:27:08.119493444 +0300
@@ -4,8 +4,12 @@
$vendorDir = dirname(dirname(__FILE__));
@@ -10,6 +10,6 @@
+ 'Symfony\\Component\\Process\\' => $pearDir,
+ 'Symfony\\Component\\Finder' => $pearDir,
+ 'Symfony\\Component\\Console\\' => $pearDir,
- 'Seld\\JsonLint' => $vendorDir . '/seld/jsonlint/src/',
- 'JsonSchema' => $vendorDir . '/justinrainbow/json-schema/src/',
- 'Composer' => $baseDir . '/src/',
+ 'Seld\\JsonLint' => array($vendorDir . '/seld/jsonlint/src'),
+ 'JsonSchema' => array($vendorDir . '/justinrainbow/json-schema/src'),
+ 'Composer' => array($baseDir . '/src'),
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/composer.git/commitdiff/b3a11e21a58745e41a6d8ace9788534be407930e
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
