rename files to reflect what they really contain now

[packages/composer.git] / composer.spec

diff --git a/composer.spec b/composer.spec
index 0f31e3a8ebd50a65295540f28390e473a6acd3ce..1032b7e6395d85844a75ac81444a9ed6b48ca052 100644 (file)
--- a/composer.spec
+++ b/composer.spec
@@ -1,4 +1,3 @@
-#
 # NOTE
 # - release tarballs: http://getcomposer.org/download/
 
@@ -6,8 +5,8 @@
 %bcond_with    bootstrap               # build boostrap
 
 %define                php_min_version 5.3.4
-%define                subver  alpha7
-%define                rel             0.16
+%define                subver  alpha8
+%define                rel             0.22
 %include       /usr/lib/rpm/macros.php
 Summary:       Dependency Manager for PHP
 Name:          composer
@@ -15,14 +14,13 @@ Version:    1.0.0
 Release:       0.%{subver}.%{rel}
 License:       MIT
 Group:         Development/Languages/PHP
-#Source0:      https://github.com/composer/composer/archive/%{version}-%{subver}.tar.gz
-Source0:       http://github.com/composer/composer/tarball/master?/%{name}.tgz
-# Source0-md5: 661b31437f47e3ff23e616ab3fb21831
+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
+Patch1:                no-vendors.patch
+Patch2:                autoload-config.patch
 URL:           http://www.getcomposer.org/
 BuildRequires: /usr/bin/php
 BuildRequires: php(ctype)
@@ -39,8 +37,10 @@ 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-justinrainbow-json-schema >= 1.1.0
+Requires:      php-seld-jsonlint >= 1.1.2
+Requires:      php-symfony2-Console >= 2.3
+Requires:      php-symfony2-Finder >= 2.2
 Requires:      php-symfony2-Process >= 2.1
 Suggests:      git-core
 Suggests:      mercurial
@@ -58,8 +58,8 @@ declare the dependent libraries your project needs and it will install
 them in your project for you.
 
 %prep
-%setup -qc
-mv composer-composer-*/* .
+%setup -qc -n %{name}-%{version}-%{release}
+mv composer-*/* .
 %patch0 -p1
 %patch1 -p1
 
@@ -74,13 +74,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