updated nogit patch

diff --git a/composer.spec b/composer.spec
index 6e65226c74dc23921c5517d9752da4d2d97c8d0b..8f9cf457a9bc37138a1f639f18a0f01d626d35d7 100644 (file)
--- a/composer.spec
+++ b/composer.spec
@@ -4,7 +4,7 @@
 
 %define                php_min_version 5.3.4
 %define                subver  alpha7
-%define                rel             0.6
+%define                rel             0.7
 %include       /usr/lib/rpm/macros.php
 Summary:       Dependency Manager for PHP
 Name:          composer
@@ -48,7 +48,7 @@ them in your project for you.
 
 %prep
 %setup -q -n %{name}-master
-#%patch0 -p1
+%patch0 -p1
 
 %{__sed} -i -e '1s,^#!.*env php,#!%{__php},' bin/*
 

diff --git a/nogit.patch b/nogit.patch
index 6dbd9a4df78335f7f258553455af4b912bad98aa..5799ba4aad85d6035776c65677df61bc6ff85a99 100644 (file)
--- a/nogit.patch
+++ b/nogit.patch
@@ -1,32 +1,19 @@
---- composer-1.0.0-alpha6/src/Composer/Compiler.php~   2012-10-23 11:54:25.000000000 +0300
-+++ composer-1.0.0-alpha6/src/Composer/Compiler.php    2012-12-08 03:44:08.842614626 +0200
-@@ -35,16 +35,20 @@
+--- composer-alpha7/src/Composer/Compiler.php~ 2013-04-01 13:18:27.000000000 +0300
++++ composer-alpha7/src/Composer/Compiler.php  2013-04-01 22:27:27.313555304 +0300
+@@ -35,6 +35,8 @@
              unlink($pharFile);
          }
  
--        $process = new Process('git log --pretty="%h" -n1 HEAD', __DIR__);
--        if ($process->run() != 0) {
--            throw new \RuntimeException('Can\'t run git log. You must ensure to run compile from composer git repository clone and that git binary is available.');
--        }
--        $this->version = trim($process->getOutput());
 +              $this->version = getenv('COMPOSER_VERSION');
- 
--        $process = new Process('git describe --tags HEAD');
--        if ($process->run() == 0) {
--            $this->version = trim($process->getOutput());
--        }
-+              if (empty($this->version)) {
-+                      $process = new Process('git log --pretty="%h" -n1 HEAD', __DIR__);
-+                      if ($process->run() != 0) {
-+                              throw new \RuntimeException('Can\'t run git log. You must ensure to run compile from composer git repository clone and that git binary is available.');
-+                      }
-+                      $this->version = trim($process->getOutput());
-+
-+                      $process = new Process('git describe --tags HEAD');
-+                      if ($process->run() == 0) {
-+                              $this->version = trim($process->getOutput());
-+                      }
-+              }
++      if (empty($this->version)) {
+         $process = new Process('git log --pretty="%H" -n1 HEAD', __DIR__);
+         if ($process->run() != 0) {
+             throw new \RuntimeException('Can\'t run git log. You must ensure to run compile from composer git repository clone and that git binary is available.');
+@@ -45,6 +47,7 @@
+         if ($process->run() == 0) {
+             $this->version = trim($process->getOutput());
+         }
++      }
  
          $phar = new \Phar($pharFile, 0, 'composer.phar');
          $phar->setSignatureAlgorithm(\Phar::SHA1);