diff options
Diffstat (limited to 'php-mock-phpunit/php-mock-phpunit.spec')
| -rw-r--r-- | php-mock-phpunit/php-mock-phpunit.spec | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/php-mock-phpunit/php-mock-phpunit.spec b/php-mock-phpunit/php-mock-phpunit.spec index 4fe898a..cc669aa 100644 --- a/php-mock-phpunit/php-mock-phpunit.spec +++ b/php-mock-phpunit/php-mock-phpunit.spec @@ -6,15 +6,15 @@ # # Please, preserve the changelog entries # -%global gh_commit d2edb32ec05584bb6bd8f1b7e94284022fb12d75 +%global gh_commit 359e3038c016cee4c8f8db6387bcab3fcdebada0 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner php-mock %global gh_project php-mock-phpunit %global with_tests 0%{!?_without_tests:1} Name: php-mock-phpunit -Version: 1.1.1 -Release: 2%{?dist} +Version: 1.1.2 +Release: 1%{?dist} Summary: Mock built-in PHP functions with PHPUnit. Group: Development/Libraries @@ -22,8 +22,6 @@ License: WTFPL 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 -Patch0: %{name}-upstream.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php(language) >= 5.5 @@ -36,6 +34,8 @@ BuildRequires: php-composer(phpunit/phpunit) > 4 # "php": ">=5.5", # "phpunit/phpunit": "^4.0.0 || ^5.0.0", # "php-mock/php-mock-integration": "^1" +# "conflict": { +# "phpunit/phpunit-mock-objects": "3.2.0" Requires: php(language) >= 5.5 Requires: php-composer(phpunit/phpunit) >= 4 Requires: php-composer(phpunit/phpunit) < 6 @@ -55,7 +55,6 @@ No further extension is needed. %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p1 # Same namespace than php-mock, not specific autoloader needed @@ -82,8 +81,8 @@ EOF %{_bindir}/phpunit -if which php70; then - php70 %{_bindir}/phpunit +if which php71; then + php71 %{_bindir}/phpunit fi %else : bootstrap build with test suite disabled @@ -104,8 +103,11 @@ rm -rf %{buildroot} %changelog +* Thu Jun 16 2016 Remi Collet <remi@fedoraproject.org> - 1.1.2-1 +- update to 1.1.2 (no change) + * Mon Feb 22 2016 Remi Collet <remi@fedoraproject.org> - 1.1.1-2 - Fix: license is WTFPL * Fri Feb 12 2016 Remi Collet <remi@fedoraproject.org> - 1.1.1-1 -- initial package
\ No newline at end of file +- initial package |