From a5d935056409c6c09ef625a2eb23ad11e75ef305 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 31 Mar 2022 16:05:48 +0200 Subject: update to 3.0.0 rename to php-composer-pcre3 install in /usr/share/php/Composer/Pcre3 raise dependency on PHP 7.4 --- composer.json | 8 ++++---- php-composer-pcre3.spec | 24 +++++++++++++++--------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/composer.json b/composer.json index e49047c..40477ff 100644 --- a/composer.json +++ b/composer.json @@ -17,10 +17,10 @@ } ], "require": { - "php": "^5.3.2 || ^7.0 || ^8.0" + "php": "^7.4 || ^8.0" }, "require-dev": { - "symfony/phpunit-bridge": "^4.2 || ^5", + "symfony/phpunit-bridge": "^5", "phpstan/phpstan": "^1.3", "phpstan/phpstan-strict-rules": "^1.1" }, @@ -36,11 +36,11 @@ }, "extra": { "branch-alias": { - "dev-main": "1.x-dev" + "dev-main": "3.x-dev" } }, "scripts": { - "test": "SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT=1 vendor/bin/simple-phpunit", + "test": "vendor/bin/simple-phpunit", "phpstan": "phpstan analyse" } } diff --git a/php-composer-pcre3.spec b/php-composer-pcre3.spec index 859b785..e25564d 100644 --- a/php-composer-pcre3.spec +++ b/php-composer-pcre3.spec @@ -1,4 +1,4 @@ -# remirepo/fedora spec file for php-composer-pcre +# remirepo/fedora spec file for php-composer-pcre3 # # Copyright (c) 2021-2022 Remi Collet # License: CC-BY-SA @@ -9,7 +9,7 @@ %bcond_without tests -%global gh_commit 67a32d7d6f9f560b726ab25a061b38ff3a80c560 +%global gh_commit e300eb6c535192decd27a85bc72a9290f0d6b3bd %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20150717 %global gh_owner composer @@ -17,12 +17,12 @@ %global ns_vendor Composer %global ns_project Pcre %global php_home %{_datadir}/php -%global major %nil +%global major 3 Name: php-%{gh_owner}-%{gh_project}%{major} -Version: 1.0.1 +Version: 3.0.0 Release: 1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist} -Summary: PCRE wrapping library version 1 +Summary: PCRE wrapping library version %{major} License: MIT URL: https://github.com/%{gh_owner}/%{gh_project} @@ -33,11 +33,11 @@ Source1: makesrc.sh BuildArch: noarch %if %{with tests} # For tests -BuildRequires: php(language) >= 5.3.2 +BuildRequires: php(language) >= 7.4 BuildRequires: php-pcre BuildRequires: php-spl # From composer.json, "require-dev": { -# "symfony/phpunit-bridge": "^4.2 || ^5", +# "symfony/phpunit-bridge": "^5", # "phpstan/phpstan": "^1.3", # "phpstan/phpstan-strict-rules": "^1.1" %global phpunit /usr/bin/phpunit9 @@ -47,8 +47,8 @@ BuildRequires: php-fedora-autoloader-devel %endif # From composer.json, "require": { -# "php": "^5.3.2 || ^7.0 || ^8.0" -Requires: php(language) >= 5.3.2 +# "php": "^7.4 || ^8.0" +Requires: php(language) >= 7.4 # From phpcompatinfo report for version 1.0.0 Requires: php-pcre Requires: php-spl @@ -120,6 +120,12 @@ exit $ret %changelog +* Thu Mar 31 2022 Remi Collet - 3.0.0-1 +- update to 3.0.0 +- rename to php-composer-pcre3 +- install in /usr/share/php/Composer/Pcre3 +- raise dependency on PHP 7.4 + * Sat Jan 22 2022 Remi Collet - 1.0.1-1 - update to 1.0.1 -- cgit