summaryrefslogtreecommitdiffstats
path: root/composer.spec
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2016-02-12 19:13:31 +0100
committerRemi Collet <fedora@famillecollet.com>2016-02-12 19:13:31 +0100
commit6316a7a79125d960bfa976e3db8a49a27d6f978e (patch)
tree42b7037ea9ec526b849c83a25643f0e764f2a1ce /composer.spec
parentaf13b24d07b0f33bdda434be064c378ac576e60e (diff)
composer-1.0.0-0.20.20160212git25e089e
Diffstat (limited to 'composer.spec')
-rw-r--r--composer.spec19
1 files changed, 16 insertions, 3 deletions
diff --git a/composer.spec b/composer.spec
index 02556a0..66de997 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,10 +6,10 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit cd21505c8d58499a9b4d38573881cfec49c51ffd
+%global gh_commit 25e089eee90799ed0f6046dfd17521804b113f25
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_branch 1.0-dev
-%global gh_date 20160127
+%global gh_date 20160212
%global gh_owner composer
%global gh_project composer
%global with_tests %{?_without_tests:0}%{!?_without_tests:1}
@@ -18,7 +18,7 @@
Name: composer
Version: 1.0.0
-Release: 0.19.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}%{?dist}
+Release: 0.20.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}%{?dist}
Summary: Dependency Manager for PHP
Group: Development/Libraries
@@ -30,6 +30,10 @@ Source2: %{name}-bootstrap.php
# Use our autoloader, resources path, fix for tests
Patch0: %{name}-rpm.patch
+# See https://github.com/composer/composer/pull/4912
+Patch1: %{name}-pr4912.patch
+# See https://github.com/composer/composer/pull/4913
+Patch2: %{name}-pr4913.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -136,6 +140,8 @@ Documentation: https://getcomposer.org/doc/
%setup -q -n %{gh_project}-%{gh_commit}
%patch0 -p1 -b .rpm
+%patch1 -p1 -b .rpm
+%patch2 -p1 -b .rpm
find . -name \*.rpm -exec rm {} \; -print
cp -p %{SOURCE1} src/Composer/autoload.php
@@ -221,6 +227,13 @@ rm -rf %{buildroot}
%changelog
+* Fri Feb 12 2016 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.20.20160212git25e089e
+- new snapshot
+- don't relying on result order which may vary
+ open https://github.com/composer/composer/pull/4912
+- restore compatiblity with symfony < 2.8
+ open https://github.com/composer/composer/pull/4913
+
* Wed Jan 27 2016 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.19.20160127gitcd21505
- new snapshot