up to git f134e09

diff --git a/composer.spec b/composer.spec
index 114ba796a93242d95a36d8aa15392ab71939de7f..fbed9af338b18ec2c3c8149ab0bda9fbca30867c 100644 (file)
--- a/composer.spec
+++ b/composer.spec
@@ -6,9 +6,9 @@
 %bcond_with    bootstrap               # build boostrap
 
 %define                php_min_version 5.3.4
-%define                githash 46e5554
+%define                githash f134e09
 %define                subver  alpha7
-%define                rel             0.16
+%define                rel             0.17
 %include       /usr/lib/rpm/macros.php
 Summary:       Dependency Manager for PHP
 Name:          composer
@@ -17,7 +17,7 @@ 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: 8d3be5df3a0151b87b77806b75cfcf9d
+# Source0-md5: 21a70f5ec468b68429a03551f1ef150e
 Source1:       http://getcomposer.org/download/%{version}-%{subver}/%{name}.phar
 # Source1-md5: f9b1dbd4ad0e3707bfe216690b210a7e
 Patch0:                nogit.patch
@@ -39,8 +39,8 @@ BuildRequires:        %{name}
 Requires:      php(core) >= %{php_min_version}
 Requires:      php(hash)
 Requires:      php(phar)
-Requires:      php-symfony2-Console >= 2.1
-Requires:      php-symfony2-Finder >= 2.1
+Requires:      php-symfony2-Console >= 2.3
+Requires:      php-symfony2-Finder >= 2.2
 Requires:      php-symfony2-Process >= 2.1
 Suggests:      git-core
 Suggests:      mercurial

diff --git a/no-bundle-symfony.patch b/no-bundle-symfony.patch
index 3ae5c3540df4c48acb83357cf615ff839f700bf1..18f19dd90b5261c06b46cb27125c554a6ccefe6b 100644 (file)
--- a/no-bundle-symfony.patch
+++ b/no-bundle-symfony.patch
@@ -8,15 +8,15 @@
              ->in(__DIR__.'/../../vendor/seld/jsonlint/src/')
              ->in(__DIR__.'/../../vendor/justinrainbow/json-schema/src/')
          ;
---- composer-master/composer.json~     2013-04-01 13:18:27.000000000 +0300
-+++ composer-master/composer.json      2013-04-01 23:47:07.240751219 +0300
+--- 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
 @@ -24,10 +24,7 @@
      "require": {
          "php": ">=5.3.2",
          "justinrainbow/json-schema": "1.1.*",
 -        "seld/jsonlint": "1.*",
--        "symfony/console": "~2.1@dev",
--        "symfony/finder": "~2.1",
+-        "symfony/console": "~2.3",
+-        "symfony/finder": "~2.2",
 -        "symfony/process": "~2.1@dev"
 +        "seld/jsonlint": "1.*"
      },