up to 1.0.0-alpha9

diff --git a/composer.spec b/composer.spec
index 117b42c9f700a681872175d7bfac8ca80cf85315..e415d69184327db8a8a584ca6151e629fe3e42f0 100644 (file)
--- a/composer.spec
+++ b/composer.spec
@@ -4,18 +4,20 @@
 # Conditional build:
 %bcond_with    bootstrap               # build boostrap
 
+%define                rel             10
+#define                githash b23a3cd
+%define                subver  alpha9
 %define                php_min_version 5.3.4
-%define                githash b23a3cd
-%define                rel             9
 %include       /usr/lib/rpm/macros.php
 Summary:       Dependency Manager for PHP
 Name:          composer
 Version:       1.0.0
-Release:       %{rel}.%{githash}
+Release:       %{rel}.%{subver}
 License:       MIT
 Group:         Development/Languages/PHP
-Source0:       https://github.com/composer/composer/archive/%{githash}/%{name}-%{version}-%{githash}.tar.gz
-# Source0-md5: d9e1c78c6032ebf50ed0b068f2af15ce
+#Source0:       https://github.com/composer/composer/archive/%{githash}/%{name}-%{version}-%{githash}.tar.gz
+Source0:       https://github.com/composer/composer/archive/%{version}-%{subver}/%{name}-%{version}-%{subver}.tar.gz
+# Source0-md5: f5d0fb132995263ee2783f9e9521acbc
 %if %{with bootstrap}
 Source1:       http://getcomposer.org/download/%{version}-alpha8/%{name}.phar
 # Source1-md5: df1001975035f07d09307bf1f1e62584
@@ -119,8 +121,9 @@ if [ ! -d vendor ]; then
        %{__patch} -p1 < %{PATCH2}
 fi
 
-PACKAGE_VERSION=%{?githash} \
 RELEASE_DATE=$(LC_ALL=C date) \
+PACKAGE_VERSION=%{?!githash:%{version}-%{subver}}%{?githash} \
+DEV_VERSION=%{!?githash:0}%{?githash:1} \
 %{__php} -d phar.readonly=0 ./bin/compile
 
 # sanity check

diff --git a/no-vendors.patch b/no-vendors.patch
index b98614b0eef9d7eea9ba798938c2fde5bec151ab..0f38469164685706a410d1d817dde36498f7fc1f 100644 (file)
--- a/no-vendors.patch
+++ b/no-vendors.patch
@@ -22,19 +22,19 @@
  
          $this->addFile($phar, new \SplFileInfo(__DIR__.'/../../vendor/autoload.php'));
          $this->addFile($phar, new \SplFileInfo(__DIR__.'/../../vendor/composer/autoload_namespaces.php'));
---- composer-1.0.0-0.alpha8.2.1.ac497fe/composer.json~ 2014-06-10 17:13:12.000000000 +0300
-+++ composer-1.0.0-0.alpha8.2.1.ac497fe/composer.json  2014-06-17 15:49:32.031066363 +0300
+--- composer-1.0.0-alpha9/composer.json~       2014-12-07 19:15:20.000000000 +0200
++++ composer-1.0.0-alpha9/composer.json        2014-12-12 23:37:17.350111453 +0200
 @@ -22,12 +22,7 @@
          "issues": "https://github.com/composer/composer/issues"
      },
      "require": {
 -        "php": ">=5.3.2",
 -        "justinrainbow/json-schema": "~1.1",
--        "seld/jsonlint": "1.*",
+-        "seld/jsonlint": "~1.0",
 -        "symfony/console": "~2.3",
 -        "symfony/finder": "~2.2",
 -        "symfony/process": "~2.1"
 +        "php": ">=5.3.2"
      },
      "require-dev": {
-         "phpunit/phpunit": "~3.7.10"
+         "phpunit/phpunit": "~4.0"

diff --git a/nogit.patch b/nogit.patch
index 89af0a04c5dfb7841da343b19b42c3ba59b8186c..9c9abe118961533a48919f013ff01ff43c782ce4 100644 (file)
--- a/nogit.patch
+++ b/nogit.patch
@@ -21,7 +21,7 @@
          $this->versionDate = $date->format('Y-m-d H:i:s');
  
 -        $process = new Process('git describe --tags HEAD');
-+        $process = new Process('false');
++        $process = new Process('echo $PACKAGE_VERSION; exit $DEV_VERSION');
          if ($process->run() == 0) {
              $this->version = trim($process->getOutput());
          } else {