summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json8
-rw-r--r--php-friendsofphp-proxy-manager-lts.spec18
2 files changed, 15 insertions, 11 deletions
diff --git a/composer.json b/composer.json
index 055db65..5d50962 100644
--- a/composer.json
+++ b/composer.json
@@ -18,8 +18,8 @@
"homepage": "http://ocramius.github.io/"
},
{
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
}
],
"replace": {
@@ -28,7 +28,7 @@
"require": {
"php": ">=7.1",
"laminas/laminas-code": "~3.4.1|^4.0",
- "symfony/filesystem": "^4.4.17|^5.0"
+ "symfony/filesystem": "^4.4.17|^5.0|^6.0"
},
"conflict": {
"zendframework/zend-stdlib": "<3.2.1",
@@ -36,7 +36,7 @@
},
"require-dev": {
"ext-phar": "*",
- "symfony/phpunit-bridge": "^5.2"
+ "symfony/phpunit-bridge": "^5.2|^6.0"
},
"autoload": {
"psr-4": {
diff --git a/php-friendsofphp-proxy-manager-lts.spec b/php-friendsofphp-proxy-manager-lts.spec
index bff099c..b93309c 100644
--- a/php-friendsofphp-proxy-manager-lts.spec
+++ b/php-friendsofphp-proxy-manager-lts.spec
@@ -9,8 +9,8 @@
%global github_owner FriendsOfPHP
%global github_name proxy-manager-lts
-%global github_version 1.0.3
-%global github_commit 121af47c9aee9c03031bdeca3fac0540f59aa5c3
+%global github_version 1.0.4
+%global github_commit 587bfddfd9847c1d0417c4cf07d1dbf19aa6d136
%global github_short %(c=%{github_commit}; echo ${c:0:7})
%global major %nil
@@ -26,7 +26,7 @@
Name: php-%{composer_vendor}-%{composer_project}%{major}
Version: %{github_version}
-Release: 2%{?github_release}%{?dist}
+Release: 1%{?github_release}%{?dist}
Summary: OOP proxy wrappers utilities
License: MIT
@@ -44,10 +44,10 @@ BuildRequires: php-spl
# remirepo:1
%if 0%{?fedora} >= 32 || 0%{?rhel} >= 9
BuildRequires:(php-composer(laminas/laminas-code) >= 4 with php-composer(laminas/laminas-code) < 5)
-BuildRequires:(php-composer(symfony/filesystem) >= 4.4.17 with php-composer(symfony/filesystem) < 6)
+BuildRequires:(php-composer(symfony/filesystem) >= 4.4.17 with php-composer(symfony/filesystem) < 7)
## composer.json (require-dev)
# "ext-phar": "*",
-# "symfony/phpunit-bridge": "^5.2"
+# "symfony/phpunit-bridge": "^5.2|^6.0"
# remirepo:4
%else
BuildRequires: php-laminas-code >= 3.4.1
@@ -62,13 +62,13 @@ BuildRequires: php-fedora-autoloader-devel
# composer.json
# "php": ">=7.1",
# "laminas/laminas-code": "~3.4.1|^4.0",
-# "symfony/filesystem": "^4.4.17|^5.0"
+# "symfony/filesystem": "^4.4.17|^5.0|^6.0"
Requires: php(language) >= 7.1
# remirepo:1
%if 0%{?fedora} >= 32 || 0%{?rhel} >= 9
# prefer v4 required for PHP 8, better with PHP 7.4
Requires: (php-composer(laminas/laminas-code) >= 4.0 with php-composer(laminas/laminas-code) < 5)
-Requires: (php-composer(symfony/filesystem) >= 4.4.17 with php-composer(symfony/filesystem) < 6)
+Requires: (php-composer(symfony/filesystem) >= 4.4.17 with php-composer(symfony/filesystem) < 7)
# remirepo:4
%else
Requires: php-laminas-code >= 3.4.1
@@ -129,6 +129,7 @@ if (PHP_VERSION_ID < 70400) {
\Fedora\Autoloader\Dependencies::required([
$code,
[
+ '%{phpdir}/Symfony6/Component/Filesystem/autoload.php',
'%{phpdir}/Symfony5/Component/Filesystem/autoload.php',
'%{phpdir}/Symfony4/Component/Filesystem/autoload.php',
],
@@ -182,6 +183,9 @@ exit $ret
%changelog
+* Thu May 20 2021 Remi Collet <remi@remirepo.net> - 1.0.4-1
+- update to 1.0.4
+
* Thu Jan 28 2021 Remi Collet <remi@remirepo.net> - 1.0.3-2
- fix description and summary