From b835b730e36966fbe967022a705835dfd5d3d62a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 7 Feb 2020 15:26:21 +0100 Subject: update to 3.0.0 raise dependency on PHP 7.3 rename to php-sebastian-resource-operations3 move to /usr/share/php/SebastianBergmann/ResourceOperations3 --- composer.json | 10 +++++--- php-sebastian-resource-operations3.spec | 44 ++++++++++++++++++++++----------- 2 files changed, 37 insertions(+), 17 deletions(-) diff --git a/composer.json b/composer.json index a5e2320..f4ed96d 100644 --- a/composer.json +++ b/composer.json @@ -9,8 +9,12 @@ "email": "sebastian@phpunit.de" } ], + "prefer-stable": true, "require": { - "php": "^7.1" + "php": "^7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.0" }, "autoload": { "classmap": [ @@ -19,14 +23,14 @@ }, "config": { "platform": { - "php": "7.1.0" + "php": "7.3.0" }, "optimize-autoloader": true, "sort-packages": true }, "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "3.0-dev" } } } diff --git a/php-sebastian-resource-operations3.spec b/php-sebastian-resource-operations3.spec index d0bba09..437e459 100644 --- a/php-sebastian-resource-operations3.spec +++ b/php-sebastian-resource-operations3.spec @@ -1,29 +1,33 @@ -# remirepo/fedora spec file for php-sebastian-resource-operations2 +# remirepo/fedora spec file for php-sebastian-resource-operations3 # -# Copyright (c) 2015-2018 Remi Collet +# Copyright (c) 2015-2020 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 4d7a795d35b889bf80a0cc04e08d77cedfa917a9 +%global gh_commit 8c98bf0dfa1f9256d0468b9803a1e1df31b6fa98 #global gh_date 20150728 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project resource-operations %global php_home %{_datadir}/php +# Packagist +%global pk_vendor sebastian +%global pk_project %{gh_project} +# Namespace %global ns_vendor SebastianBergmann %global ns_project ResourceOperations -%global major 2 +%global major 3 %if %{bootstrap} %global with_tests 0%{?_with_tests:1} %else %global with_tests 0%{!?_without_tests:1} %endif -Name: php-sebastian-resource-operations%{major} -Version: 2.0.1 +Name: php-%{pk_vendor}-%{pk_project}%{major} +Version: 3.0.0 %global specrel 1 Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} Summary: Provides a list of PHP built-in functions that operate on resources @@ -33,20 +37,23 @@ URL: https://github.com/%{gh_owner}/%{gh_project} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz BuildArch: noarch -BuildRequires: php(language) >= 7.1 +BuildRequires: php(language) >= 7.3 BuildRequires: php-fedora-autoloader-devel %if %{with_tests} -BuildRequires: phpunit7 +# from composer.json +# "phpunit/phpunit": "^9.0" +# TODO test suite passes with v8, switch to v9 when available +BuildRequires: phpunit8 %endif # from composer.json -# "php": "^7.1" -Requires: php(language) >= 7.1 +# "php": "^7.3" +Requires: php(language) >= 7.3 # Autoloader Requires: php-composer(fedora/autoloader) -# from phpcompatinfo report for version 1.0.0: nothing +# from phpcompatinfo report for version 3.0.0: nothing -Provides: php-composer(sebastian/resource-operations) = %{version} +Provides: php-composer(%{pk_vendor}/%{pk_project}) = %{version} %description @@ -73,12 +80,15 @@ cp -pr src %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major} %check %if %{with_tests} +mkdir vendor +touch vendor/autoload.php + : Run upstream test suite ret=0 -for cmd in php php71 php72 php73; do +for cmd in php php73 php74; do if which $cmd; then $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \ - %{_bindir}/phpunit7 --verbose tests || ret=1 + %{_bindir}/phpunit8 --verbose tests || ret=1 fi done exit $ret @@ -96,6 +106,12 @@ exit $ret %changelog +* Fri Feb 7 2020 Remi Collet - 3.0.0-1 +- update to 3.0.0 +- raise dependency on PHP 7.3 +- rename to php-sebastian-resource-operations3 +- move to /usr/share/php/SebastianBergmann/ResourceOperations3 + * Thu Oct 4 2018 Remi Collet - 2.0.1-1 - update to 2.0.1 - drop patch merged upstream -- cgit