diff options
| -rw-r--r-- | composer.json | 4 | ||||
| -rw-r--r-- | php-mock-integration2.spec | 47 |
2 files changed, 29 insertions, 22 deletions
diff --git a/composer.json b/composer.json index c8e1c73..cf1a32c 100644 --- a/composer.json +++ b/composer.json @@ -17,8 +17,8 @@ "psr-4": {"phpmock\\integration\\": "classes/"} }, "require": { - "php": ">=5.5", - "php-mock/php-mock": "^1", + "php": ">=5.6", + "php-mock/php-mock": "^2", "phpunit/php-text-template": "^1" }, "require-dev": { diff --git a/php-mock-integration2.spec b/php-mock-integration2.spec index 845ee0d..6b68366 100644 --- a/php-mock-integration2.spec +++ b/php-mock-integration2.spec @@ -1,4 +1,4 @@ -# remirepo/fedora spec file for php-mock-integration +# remirepo/fedora spec file for php-mock-integration2 # # Copyright (c) 2016-2017 Remi Collet # License: CC-BY-SA @@ -6,15 +6,16 @@ # # Please, preserve the changelog entries # -%global gh_commit e83fb65dd20cd3cf250d554cbd4682b96b684f4b +%global gh_commit 5a0d7d7755f823bc2a230cfa45058b40f9013bc4 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner php-mock %global gh_project php-mock-integration %global with_tests 0%{!?_without_tests:1} +%global major 2 -Name: php-mock-integration -Version: 1.0.0 -Release: 4%{?dist} +Name: php-mock-integration%{major} +Version: 2.0.0 +Release: 1%{?dist} Summary: Integration package for PHP-Mock Group: Development/Libraries @@ -23,12 +24,12 @@ URL: https://github.com/%{gh_owner}/%{gh_project} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz BuildArch: noarch -BuildRequires: php(language) >= 5.5 +BuildRequires: php(language) >= 5.6 %if %{with_tests} # from composer.json, "require-dev": { # "phpunit/phpunit": "^4|^5" -BuildRequires: php-composer(php-mock/php-mock) < 2 -BuildRequires: php-composer(php-mock/php-mock) >= 1 +BuildRequires: php-composer(php-mock/php-mock) < 3 +BuildRequires: php-composer(php-mock/php-mock) >= 2 BuildRequires: php-composer(phpunit/php-text-template) < 2 BuildRequires: php-composer(phpunit/php-text-template) >= 1 BuildRequires: php-composer(phpunit/phpunit) > 4 @@ -37,16 +38,16 @@ BuildRequires: php-composer(fedora/autoloader) %endif # from composer.json, "require": { -# "php": ">=5.5", -# "php-mock/php-mock": "^1", +# "php": ">=5.6", +# "php-mock/php-mock": "^2", # "phpunit/php-text-template": "^1" -Requires: php(language) >= 5.5 -Requires: php-composer(php-mock/php-mock) >= 1 -Requires: php-composer(php-mock/php-mock) < 2 +Requires: php(language) >= 5.6 +Requires: php-composer(php-mock/php-mock) >= 2 +Requires: php-composer(php-mock/php-mock) < 3 Requires: php-composer(phpunit/php-text-template) >= 1 Requires: php-composer(phpunit/php-text-template) < 2 -# From phpcompatinfo report from version 1.0.1 -# only standard +# From phpcompatinfo report from version 2.0.0 +# only core and standard Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} @@ -67,8 +68,8 @@ This is a support package for PHP-Mock integration into other frameworks. %install mkdir -p %{buildroot}%{_datadir}/php/ -mkdir -p %{buildroot}%{_datadir}/php/phpmock -cp -pr classes %{buildroot}%{_datadir}/php/phpmock/integration +mkdir -p %{buildroot}%{_datadir}/php/phpmock%{major} +cp -pr classes %{buildroot}%{_datadir}/php/phpmock%{major}/integration %check @@ -77,8 +78,8 @@ mkdir vendor cat << 'EOF' | tee vendor/autoload.php <?php require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php'; -require_once '%{_datadir}/tests/phpmock/autoload.php'; -\Fedora\Autoloader\Autoload::addPsr4('phpmock\\', '%{buildroot}%{_datadir}/php/phpmock'); +require_once '%{_datadir}/tests/phpmock%{major}/autoload.php'; +\Fedora\Autoloader\Autoload::addPsr4('phpmock\\', '%{buildroot}%{_datadir}/php/phpmock%{major}'); EOF ret=0 @@ -98,10 +99,16 @@ exit $ret %license LICENSE %doc composer.json %doc *.md -%{_datadir}/php/phpmock/integration +%{_datadir}/php/phpmock%{major}/integration %changelog +* Tue Dec 5 2017 Remi Collet <remi@remirepo.net> - 2.0.0-1 +- rename to php-mock-integration2 +- Update to 2.0.0 +- raise dependency on PHP 5.6 +- raise dependency on php-mock 2 + * Thu May 11 2017 Remi Collet <remi@remirepo.net> - 1.0.0-4 - switch to fedora/autoloader |