diff options
| author | Remi Collet <remi@remirepo.net> | 2020-09-09 07:07:12 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2020-09-09 07:07:12 +0200 |
| commit | aa716ec06fc56c2bb9f604e3e457fa3af3b3d901 (patch) | |
| tree | 08504c8042c681b8f34cf590921639fc6d125e73 | |
| parent | 44ebeb70db8712ef169741970e3c93b09796ae53 (diff) | |
update to 3.1.0
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | php-composer-semver3.spec | 23 |
2 files changed, 16 insertions, 9 deletions
diff --git a/composer.json b/composer.json index 117b78e..20b1c06 100644 --- a/composer.json +++ b/composer.json @@ -49,7 +49,7 @@ }, "extra": { "branch-alias": { - "dev-master": "3.x-dev" + "dev-main": "3.x-dev" } }, "scripts": { diff --git a/php-composer-semver3.spec b/php-composer-semver3.spec index a5c3c43..1564771 100644 --- a/php-composer-semver3.spec +++ b/php-composer-semver3.spec @@ -6,7 +6,10 @@ # # Please, preserve the changelog entries # -%global gh_commit 3426bd5efa8a12d230824536c42a8a4ad30b7940 + +%bcond_without tests + +%global gh_commit c64053b1543d7bc054883f0a78a86c4242ae315d %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20150717 %global gh_owner composer @@ -15,10 +18,9 @@ %global ns_project Semver %global php_home %{_datadir}/php %global major 3 -%global with_tests 0%{!?_without_tests:1} Name: php-%{gh_owner}-%{gh_project}%{major} -Version: 3.0.0 +Version: 3.1.0 Release: 1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist} Summary: Semver library version %{major} @@ -29,16 +31,17 @@ Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh BuildArch: noarch -%if %{with_tests} +%if %{with tests} # For tests # BR 7.1 as we use phpunit7 -BuildRequires: php(language) >= 7.1 +BuildRequires: php(language) >= 5.3.2 BuildRequires: php-pcre BuildRequires: php-spl # From composer.json, "require-dev": { # "symfony/phpunit-bridge": "^4.2 || ^5", # "phpstan/phpstan": "^0.12.19" -BuildRequires: phpunit7 +%global phpunit /usr/bin/phpunit +BuildRequires: %{phpunit} # Autoloader BuildRequires: php-fedora-autoloader-devel %endif @@ -81,11 +84,11 @@ cp -pr src %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major} %check -%if %{with_tests} +%if %{with tests} ret=0 for cmd in php php72 php73 php74 php80; do if which $cmd; then - $cmd %{_bindir}/phpunit7 \ + $cmd %{phpunit} \ --bootstrap %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \ --verbose || ret=1 fi @@ -98,6 +101,7 @@ exit $ret %files +# remirepo:1 %{!?_licensedir:%global license %%doc} %license LICENSE %doc composer.json @@ -107,6 +111,9 @@ exit $ret %changelog +* Wed Sep 9 2020 Remi Collet <remi@remirepo.net> - 3.1.0-1 +- update to 3.1.0 + * Wed Jun 3 2020 Remi Collet <remi@remirepo.net> - 3.0.0-1 - update to 3.0.0 - rename to php-composer-semver3 |