summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php-doctrine-persistence2.spec17
1 files changed, 11 insertions, 6 deletions
diff --git a/php-doctrine-persistence2.spec b/php-doctrine-persistence2.spec
index 347eb10..a237a17 100644
--- a/php-doctrine-persistence2.spec
+++ b/php-doctrine-persistence2.spec
@@ -1,6 +1,6 @@
# remirepo/fedora spec file for php-doctrine-persistence2
#
-# Copyright (c) 2018-2020 Remi Collet
+# Copyright (c) 2018-2021 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
@@ -28,7 +28,7 @@
Name: php-%{pk_vendor}-%{pk_project}%{major}
Version: 2.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Doctrine Persistence abstractions
License: MIT
@@ -54,7 +54,7 @@ BuildRequires: php-spl
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
BuildRequires: (php-composer(doctrine/annotations) >= 1.0 with php-composer(doctrine/annotations) < 2)
-BuildRequires: (php-composer(doctrine/cache) >= 1.0 with php-composer(doctrine/cache) < 2)
+BuildRequires: (php-composer(doctrine/cache) >= 1.0 with php-composer(doctrine/cache) < 3)
BuildRequires: (php-composer(doctrine/collections) >= 1.0 with php-composer(doctrine/collections) < 2)
BuildRequires: (php-composer(doctrine/event-manager) >= 1.0 with php-composer(doctrine/event-manager) < 2)
BuildRequires: (php-composer(doctrine/common) >= 3.0 with php-composer(doctrine/common) < 4)
@@ -82,8 +82,7 @@ Requires: php(language) >= 7.1
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
Requires: (php-composer(doctrine/annotations) >= 1.0 with php-composer(doctrine/annotations) < 2)
-# ignore 2.0 for now
-Requires: (php-composer(doctrine/cache) >= 1.0 with php-composer(doctrine/cache) < 2)
+Requires: (php-composer(doctrine/cache) >= 1.0 with php-composer(doctrine/cache) < 3)
Requires: (php-composer(doctrine/collections) >= 1.0 with php-composer(doctrine/collections) < 2)
Requires: (php-composer(doctrine/event-manager) >= 1.0 with php-composer(doctrine/event-manager) < 2)
# remirepo:6
@@ -133,7 +132,10 @@ cat << 'EOF' | tee -a lib/%{ns_vendor}/%{ns_subproj}%{major}/autoload.php
// Dependencies
\Fedora\Autoloader\Dependencies::required([
'%{_datadir}/php/%{ns_vendor}/%{ns_project}/Annotations/autoload.php',
- '%{_datadir}/php/%{ns_vendor}/%{ns_project}/Cache/autoload.php',
+ [
+ '%{_datadir}/php/%{ns_vendor}/%{ns_project}/Cache2/autoload.php',
+ '%{_datadir}/php/%{ns_vendor}/%{ns_project}/Cache/autoload.php',
+ ],
'%{_datadir}/php/%{ns_vendor}/%{ns_project}/Collections/autoload.php',
'%{_datadir}/php/%{ns_vendor}/%{ns_project}/EventManager/autoload.php',
]);
@@ -191,6 +193,9 @@ exit $ret
%changelog
+* Mon May 17 2021 Remi Collet <remi@remirepo.net> - 2.2.0-2
+- allow doctrine/cache v2
+
* Mon May 17 2021 Remi Collet <remi@remirepo.net> - 2.2.0-1
- update to 2.2.0
- drop runtime dependency on doctrine/reflection