summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-12-03 11:25:05 +0100
committerRemi Collet <remi@remirepo.net>2018-12-03 11:25:05 +0100
commit90824195d03c7d21e2ab4cfe4760b88b33a4b3ca (patch)
treebc91a9289c48797cc7eae531cfc696e090ea7587
parentefd99612314759c7ed20cdf52747a0eab0f81284 (diff)
v1.8.0
-rw-r--r--composer-bootstrap.php2
-rw-r--r--composer.json2
-rw-r--r--composer.spec12
3 files changed, 6 insertions, 10 deletions
diff --git a/composer-bootstrap.php b/composer-bootstrap.php
index 279f1cc..19d75b3 100644
--- a/composer-bootstrap.php
+++ b/composer-bootstrap.php
@@ -1,5 +1,3 @@
<?php
require 'Composer/autoload.php';
\Fedora\Autoloader\Autoload::addPsr0('Composer\\Test\\', __DIR__ . '/');
-require __DIR__.'/Composer/TestCase.php';
-
diff --git a/composer.json b/composer.json
index 91da0ec..3a1efaa 100644
--- a/composer.json
+++ b/composer.json
@@ -55,7 +55,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.7-dev"
+ "dev-master": "1.8-dev"
}
},
"autoload": {
diff --git a/composer.spec b/composer.spec
index cc37533..02cbd20 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
# For compatibility with SCL
%undefine __brp_mangle_shebangs
-%global gh_commit e965b9aaa8854c3067f1ed2ae45f436572d73eb7
+%global gh_commit d8aef3af866b28786ce9b8647e52c42496436669
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_branch 1.0-dev
%global gh_owner composer
@@ -18,7 +18,7 @@
%global with_tests %{?_without_tests:0}%{!?_without_tests:1}
%global api_version 1.1.0
-%global upstream_version 1.7.3
+%global upstream_version 1.8.0
#global upstream_prever RC
%if 0
@@ -250,11 +250,6 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
: Online tests
rm tests/Composer/Test/Util/RemoteFilesystemTest.php
-: Known to fail - regression in recent symfony version
-sed -e 's/testDevWarningPrevented/SKIP_testDevWarningPrevented/' \
- -e 's/testDevWarningPreventedAlias/SKIP_testDevWarningPreventedAlias/' \
- -i tests/Composer/Test/ApplicationTest.php
-
: Ensure not used
rm -rf res
@@ -288,6 +283,9 @@ exit $ret
%changelog
+* Mon Dec 3 2018 Remi Collet <remi@remirepo.net> - 1.8.0-1
+- update to 1.8.0
+
* Fri Nov 2 2018 Remi Collet <remi@remirepo.net> - 1.7.3-1
- update to 1.7.3