diff options
| author | Remi Collet <remi@remirepo.net> | 2018-04-20 11:35:38 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2018-04-20 11:35:38 +0200 |
| commit | 00ed292257c508b850823591e54ca3c41d0c719e (patch) | |
| tree | 94631c293f8fc02c7c3271268ecbfe7f33eb0cca | |
| parent | 2bedaa95da06b90ff58f6620cef8de36d8b42983 (diff) | |
use range dependencies on F27+
| -rw-r--r-- | composer.json | 5 | ||||
| -rw-r--r-- | php-composer-installers.spec | 29 |
2 files changed, 25 insertions, 9 deletions
diff --git a/composer.json b/composer.json index 0a7477d..6de4085 100644 --- a/composer.json +++ b/composer.json @@ -37,9 +37,11 @@ "Lavalite", "Lithium", "Magento", + "majima", "Mako", "Mautic", "Maya", + "MODX", "MODX Evo", "MediaWiki", "OXID", @@ -47,6 +49,7 @@ "MODULEWork", "Moodle", "Piwik", + "pxcms", "phpBB", "Plentymarkets", "PPI", @@ -94,7 +97,7 @@ }, "require-dev": { "composer/composer": "1.0.*@dev", - "phpunit/phpunit": "4.1.*" + "phpunit/phpunit": "^4.8.36" }, "scripts": { "test": "phpunit" diff --git a/php-composer-installers.spec b/php-composer-installers.spec index bab5b9b..4496a7a 100644 --- a/php-composer-installers.spec +++ b/php-composer-installers.spec @@ -2,7 +2,7 @@ # # Fedora spec file for php-composer-installers # -# Copyright (c) 2015-2017 Shawn Iwinski <shawn.iwinski@gmail.com> +# Copyright (c) 2015-2018 Shawn Iwinski <shawn.iwinski@gmail.com> # # License: MIT # http://opensource.org/licenses/MIT @@ -12,8 +12,8 @@ %global github_owner composer %global github_name installers -%global github_version 1.4.0 -%global github_commit 9ce17fb70e9a38dd8acff0636a29f5cf4d575c1b +%global github_version 1.5.0 +%global github_commit 049797d727261bf27f2690430d935067710049c2 %global composer_vendor composer %global composer_project installers @@ -35,7 +35,6 @@ Version: %{github_version} Release: 1%{?github_release}%{?dist} Summary: A multi-framework Composer library installer -Group: Development/Libraries License: MIT URL: http://composer.github.io/installers/ Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz @@ -44,11 +43,17 @@ BuildArch: noarch # Tests %if %{with_tests} ## composer.json -BuildRequires: php-composer(composer-plugin-api) >= %{composer_plugin_min_ver} +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-composer(composer/composer) >= %{composer_min_ver} with php-composer(composer/composer) < %{composer_max_ver}) +BuildRequires: (php-composer(composer-plugin-api) >= %{composer_plugin_min_ver} with php-composer(composer-plugin-api) < %{composer_plugin_max_ver}) +%else BuildRequires: php-composer(composer/composer) < %{composer_max_ver} BuildRequires: php-composer(composer/composer) >= %{composer_min_ver} +BuildRequires: php-composer(composer-plugin-api) < %{composer_plugin_max_ver} +BuildRequires: php-composer(composer-plugin-api) >= %{composer_plugin_min_ver} +%endif BuildRequires: php-composer(phpunit/phpunit) -## phpcompatinfo (computed from version 1.4.0) +## phpcompatinfo (computed from version 1.5.0) BuildRequires: php(language) >= 5.3.0 BuildRequires: php-pcre BuildRequires: php-spl @@ -57,9 +62,13 @@ BuildRequires: php-composer(fedora/autoloader) %endif # composer.json +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-composer(composer-plugin-api) >= %{composer_plugin_min_ver} with php-composer(composer-plugin-api) < %{composer_plugin_max_ver}) +%else Requires: php-composer(composer-plugin-api) >= %{composer_plugin_min_ver} Requires: php-composer(composer-plugin-api) < %{composer_plugin_max_ver} -# phpcompatinfo (computed from version 1.4.0) +%endif +# phpcompatinfo (computed from version 1.5.0) Requires: php(language) >= 5.3.0 Requires: php-pcre Requires: php-spl @@ -124,7 +133,7 @@ BOOTSTRAP : Upstream tests RETURN_CODE=0 PHPUNIT=$(which phpunit) -for PHP_EXEC in "" %{?rhel:php55} php56 php70 php71 php72; do +for PHP_EXEC in "" %{?rhel:php55 php56} php70 php71 php72; do if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then $PHP_EXEC $PHPUNIT --verbose --bootstrap bootstrap.php \ || RETURN_CODE=1 @@ -145,6 +154,10 @@ exit $RETURN_CODE %changelog +* Fri Apr 20 2018 Remi Collet <remi@remirepo.net> - 1.5.0-1 +- update to 1.5.0 +- use range dependencies on F27+ + * Sun Oct 08 2017 Shawn Iwinski <shawn@iwin.ski> - 1.4.0-1 - Updated to 1.4.0 (RHBZ #1479799) |