From b85b6beeae8a3a0b02c3056efe8a6b1a8f973e0e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Thu, 26 Nov 2015 13:32:41 +0200 Subject: [PATCH] fix output of composer --version --- composer.spec | 4 +++- version.patch | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 version.patch diff --git a/composer.spec b/composer.spec index 94f74aa..4b1fe20 100644 --- a/composer.spec +++ b/composer.spec @@ -1,7 +1,7 @@ # NOTE # - release tarballs: http://getcomposer.org/download/ -%define rel 14 +%define rel 15 #define githash 5744981 # $ git rev-list 1.0.0-alpha11..%{githash} --count #define commits 216 @@ -23,6 +23,7 @@ Source3: autoload.php Patch0: autoload.patch Patch1: update-memory-limit.patch Patch2: svn-ignore-externals.patch +Patch3: version.patch URL: http://www.getcomposer.org/ BuildRequires: rpm-php-pearprov >= 4.4.2-11 BuildRequires: rpmbuild(macros) >= 1.673 @@ -81,6 +82,7 @@ mv composer-*/* . %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 mv composer.lock{,.disabled} # NOTE: do not use %{__php} macro here, need unversioned php binary diff --git a/version.patch b/version.patch new file mode 100644 index 0000000..69ffb1e --- /dev/null +++ b/version.patch @@ -0,0 +1,19 @@ +fix output of composer --version + +before: +Composer version @package_branch_alias_version@ (1.0.0-alpha11) 2015-11-14 16:21:07 + +after: +Composer version 1.0.0-alpha11 2015-11-14 16:21:07 + +--- composer-1.0.0-14.alpha11/src/Composer/Composer.php~ 2015-11-14 18:21:07.000000000 +0200 ++++ composer-1.0.0-14.alpha11/src/Composer/Composer.php 2015-11-26 13:29:12.626795442 +0200 +@@ -29,7 +29,7 @@ + class Composer + { + const VERSION = '1.0.0-alpha11'; +- const BRANCH_ALIAS_VERSION = '@package_branch_alias_version@'; ++ const BRANCH_ALIAS_VERSION = ''; + const RELEASE_DATE = '2015-11-14 16:21:07'; + + /** -- 2.44.0