From 5b42bb6de119ffb576fe9071b4efd307756d8549 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 26 Mar 2021 08:28:37 +0100 Subject: [PATCH] v1.4.6 --- .gitignore | 1 + php-composer-xdebug-handler.spec | 24 ++++++++++++++---------- sources | 2 +- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index c5fa819..3357951 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ clog /php-composer-xdebug-handler-1.4.3-ebd27a9.tgz /php-composer-xdebug-handler-1.4.4-6e076a1.tgz /php-composer-xdebug-handler-1.4.5-f28d44c.tgz +/php-composer-xdebug-handler-1.4.6-f27e06c.tgz diff --git a/php-composer-xdebug-handler.spec b/php-composer-xdebug-handler.spec index cf0073c..b6e1230 100644 --- a/php-composer-xdebug-handler.spec +++ b/php-composer-xdebug-handler.spec @@ -1,12 +1,12 @@ # remirepo/fedora spec file for php-composer-xdebug-handler # -# Copyright (c) 2018-2019 Remi Collet +# Copyright (c) 2018-2021 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global gh_commit f28d44c286812c714741478d968104c5e604a1d4 +%global gh_commit f27e06cd9675801df441b3656569b328e04aa37c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20150717 %global gh_owner composer @@ -16,11 +16,11 @@ %global ns_project XdebugHandler %global php_home %{_datadir}/php -%global with_tests 0%{!?_without_tests:1} +%bcond_without tests Name: php-%{gh_owner}-%{gh_project} -Version: 1.4.5 -Release: 2%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist} +Version: 1.4.6 +Release: 1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist} Summary: Restarts a process without Xdebug License: MIT @@ -30,7 +30,7 @@ Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh BuildArch: noarch -%if %{with_tests} +%if %{with tests} # For tests BuildRequires: php(language) >= 5.3.2 BuildRequires: php-reflection @@ -39,7 +39,8 @@ BuildRequires: php-pcre BuildRequires: php-posix BuildRequires: php-spl # From composer.json, "require-dev": { -# "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8" +# "symfony/phpunit-bridge": "^4.2 || ^5", +# "phpstan/phpstan": "^0.12.55" %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) BuildRequires: phpunit8 @@ -49,9 +50,9 @@ BuildRequires: php-PsrLog BuildRequires: php-phpunit-PHPUnit >= 4.8.35 %global phpunit %{_bindir}/phpunit %endif +%endif # Autoloader BuildRequires: php-composer(fedora/autoloader) -%endif # From composer.json, "require": { # "php": "^5.3.2 || ^7.0 || ^8.0", @@ -114,9 +115,9 @@ require_once '%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.ph \Fedora\Autoloader\Autoload::addPsr4('%{ns_vendor}\\%{ns_project}\\', dirname(__DIR__).'/tests'); EOF -%if %{with_tests} +%if %{with tests} ret=0 -for cmdarg in "php %{phpunit}" php72 php73 php74 php80; do +for cmdarg in "php %{phpunit}" php73 php74 php80; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit8} --verbose|| ret=1 @@ -138,6 +139,9 @@ exit $ret %changelog +* Fri Mar 26 2021 Remi Collet - 1.4.6-1 +- update to 1.4.6 + * Wed Jan 27 2021 Fedora Release Engineering - 1.4.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 40031ad..8bd3887 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-composer-xdebug-handler-1.4.5-f28d44c.tgz) = f6f32c4036343ffc65cbc7a23fc56bde57b729fe9cc7e1de6d4d9155a12b73a67bf4dba6d8c2c2fe45a2dce793fc3cc2d125dd32235678e7e9ebd84902d36448 +SHA512 (php-composer-xdebug-handler-1.4.6-f27e06c.tgz) = 67d21111b182315925b48ee38d42491137be517d654a27a439bf986ce99e16cc64aad4f441bd82907e689ad423bfe563ea0ddbf759e57a1cc86cd502e915581e