commit b0da7bb72f407dfe82458fd5eaabfd888248b652
Author: Elan Ruusamäe <[email protected]>
Date: Wed Aug 12 17:41:47 2015 +0300
up to 1.0.0-alpha10
composer.spec | 22 +++++++++++-----------
no-vendors.patch | 23 +++++++++++++----------
2 files changed, 24 insertions(+), 21 deletions(-)
---
diff --git a/composer.spec b/composer.spec
index 68592b1..c3e47bc 100644
--- a/composer.spec
+++ b/composer.spec
@@ -4,22 +4,22 @@
# Conditional build:
%bcond_with bootstrap # build boostrap
-%define rel 12
-# $ git rev-list 1.0.0-alpha9..%{githash} --count
-%define commits 216
-%define githash 5744981
-%define subver alpha9
+%define rel 13
+# $ git rev-list 1.0.0-alpha10..%{githash} --count
+#define githash 5744981
+#define commits 216
+%define subver alpha10
%define php_min_version 5.3.4
%include /usr/lib/rpm/macros.php
Summary: Dependency Manager for PHP
Name: composer
Version: 1.0.0
-Release: %{rel}.%{subver}.%{commits}.g%{githash}
+Release: %{rel}.%{subver}%{?commits:.%{commits}}%{?githash:.g%{githash}}
License: MIT
Group: Development/Languages/PHP
-Source0:
https://github.com/composer/composer/archive/%{githash}/%{name}-%{version}-%{subver}-%{commits}-g%{githash}.tar.gz
-# Source0-md5: d3152cbae030fedb85f5d1ac52dddd4f
-#Source0:
https://github.com/composer/composer/archive/%{version}-%{subver}/%{name}-%{version}-%{subver}.tar.gz
+#Source0:
https://github.com/composer/composer/archive/%{githash}/%{name}-%{version}-%{subver}-%{commits}-g%{githash}.tar.gz
+Source0:
https://github.com/composer/composer/archive/%{version}-%{subver}/%{name}-%{version}-%{subver}.tar.gz
+# Source0-md5: e821eec53cbb98871b4cccfc82a6bae7
%if %{with bootstrap}
Source1: http://getcomposer.org/download/%{version}-alpha8/%{name}.phar
# Source1-md5: df1001975035f07d09307bf1f1e62584
@@ -64,9 +64,9 @@ Requires: php(spl)
Requires: php(zip)
Requires: php(zlib)
%if %{without bootstrap}
-Requires: php-justinrainbow-json-schema >= 1.3
+Requires: php-justinrainbow-json-schema >= 1.4
Requires: php-seld-jsonlint >= 1.1.2
-Requires: php-symfony2-Console >= 2.3
+Requires: php-symfony2-Console >= 2.5
Requires: php-symfony2-Finder >= 2.2
Requires: php-symfony2-Process >= 2.1
%endif
diff --git a/no-vendors.patch b/no-vendors.patch
index 3459cb9..62d140c 100644
--- a/no-vendors.patch
+++ b/no-vendors.patch
@@ -1,6 +1,6 @@
---- composer-1.0.0-0.alpha8.0.20/src/Composer/Compiler.php~ 2014-04-09
20:14:20.000000000 +0300
-+++ composer-1.0.0-0.alpha8.0.20/src/Composer/Compiler.php 2014-04-09
20:14:47.969914494 +0300
-@@ -88,21 +88,6 @@
+--- composer-1.0.0-12.alpha10.216.g5744981/src/Composer/Compiler.php~
2015-08-12 17:36:25.000000000 +0300
++++ composer-1.0.0-12.alpha10.216.g5744981/src/Composer/Compiler.php
2015-08-12 17:37:00.837855396 +0300
+@@ -96,24 +96,6 @@
foreach ($finder as $file) {
$this->addFile($phar, $file, false);
}
@@ -10,10 +10,13 @@
- $finder->files()
- ->ignoreVCS(true)
- ->name('*.php')
+- ->name('LICENSE')
- ->exclude('Tests')
+- ->exclude('tests')
+- ->exclude('docs')
- ->in(__DIR__.'/../../vendor/symfony/')
-- ->in(__DIR__.'/../../vendor/seld/jsonlint/src/')
-- ->in(__DIR__.'/../../vendor/justinrainbow/json-schema/src/')
+- ->in(__DIR__.'/../../vendor/seld/jsonlint/')
+- ->in(__DIR__.'/../../vendor/justinrainbow/json-schema/')
- ;
-
- foreach ($finder as $file) {
@@ -22,19 +25,19 @@
$this->addFile($phar, new
\SplFileInfo(__DIR__.'/../../vendor/autoload.php'));
$this->addFile($phar, new
\SplFileInfo(__DIR__.'/../../vendor/composer/autoload_namespaces.php'));
---- composer-1.0.x-5744981/composer.json~ 2015-02-17 22:23:05.000000000
+0200
-+++ composer-1.0.x-5744981/composer.json 2015-02-18 00:36:27.256517738
+0200
+--- composer-1.0.0-12.alpha10.216.g5744981/composer.json~ 2015-04-15
00:18:51.000000000 +0300
++++ composer-1.0.0-12.alpha10.216.g5744981/composer.json 2015-08-12
17:37:36.376332853 +0300
@@ -22,12 +22,7 @@
"issues": "https://github.com/composer/composer/issues";
},
"require": {
- "php": ">=5.3.2",
-- "justinrainbow/json-schema": "~1.3",
+- "justinrainbow/json-schema": "~1.4",
- "seld/jsonlint": "~1.0",
-- "symfony/console": "~2.3",
+- "symfony/console": "~2.5",
- "symfony/finder": "~2.2",
- "symfony/process": "~2.1"
+ "php": ">=5.3.2"
},
"require-dev": {
- "phpunit/phpunit": "~4.0"
+ "phpunit/phpunit": "~4.5"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/composer.git/commitdiff/b0da7bb72f407dfe82458fd5eaabfd888248b652
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
