[packages/composer] include git hash to runtime version; BR consistency
glen
glen at pld-linux.org
Thu Jun 19 11:19:18 CEST 2014
commit e2164043627f26eb8bbe9a380adeff733b433fd5
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Thu Jun 19 12:19:16 2014 +0300
include git hash to runtime version; BR consistency
composer.spec | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/composer.spec b/composer.spec
index ba430b2..98781b0 100644
--- a/composer.spec
+++ b/composer.spec
@@ -28,15 +28,16 @@ Patch0: nogit.patch
Patch1: no-vendors.patch
Patch2: autoload-config.patch
URL: http://www.getcomposer.org/
+BuildRequires: %{php_name}-ctype
+BuildRequires: %{php_name}-hash
+BuildRequires: %{php_name}-json
+BuildRequires: %{php_name}-openssl
+BuildRequires: %{php_name}-phar
+BuildRequires: %{php_name}-program
+BuildRequires: %{php_name}-zip
+BuildRequires: %{php_name}-zlib
BuildRequires: /usr/bin/phar
BuildRequires: /usr/bin/php
-BuildRequires: php(ctype)
-BuildRequires: php(hash)
-BuildRequires: php(json)
-BuildRequires: php(openssl)
-BuildRequires: php(phar)
-BuildRequires: php(zip)
-BuildRequires: php(zlib)
BuildRequires: rpm-php-pearprov >= 4.4.2-11
BuildRequires: rpmbuild(macros) >= 1.673
%if %{without bootstrap}
@@ -114,7 +115,7 @@ if [ ! -d vendor ]; then
%{__patch} -p1 < %{PATCH2}
fi
-COMPOSER_VERSION=%{version}%{?subver:-%{subver}} \
+COMPOSER_VERSION=%{version}%{?subver:-%{subver}}%{?githash:@%{githash}} \
%{__php} -d phar.readonly=0 ./bin/compile
# sanity check
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/composer.git/commitdiff/e2164043627f26eb8bbe9a380adeff733b433fd5
More information about the pld-cvs-commit
mailing list