summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--composer.json19
-rw-r--r--php-doctrine-persistence3.spec62
2 files changed, 36 insertions, 45 deletions
diff --git a/composer.json b/composer.json
index a77cf49..9918ad4 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
"orm",
"odm"
],
- "homepage": "https://doctrine-project.org/projects/persistence.html",
+ "homepage": "https://www.doctrine-project.org/projects/persistence.html",
"license": "MIT",
"authors": [
{"name": "Guilherme Blanco", "email": "guilhermeblanco@gmail.com"},
@@ -20,30 +20,29 @@
{"name": "Marco Pivetta", "email": "ocramius@gmail.com"}
],
"require": {
- "php": "^7.1 || ^8.0",
- "doctrine/cache": "^1.11 || ^2.0",
+ "php": "^7.2 || ^8.0",
"doctrine/collections": "^1.0",
"doctrine/event-manager": "^1.0",
- "psr/cache": "^1.0 || ^2.0 || ^3.0",
- "doctrine/deprecations": "^0.5.3"
+ "psr/cache": "^1.0 || ^2.0 || ^3.0"
},
"require-dev": {
"composer/package-versions-deprecated": "^1.11",
- "phpstan/phpstan": "~1.4.10 || 1.5.0",
- "doctrine/annotations": "^1.0",
+ "phpstan/phpstan": "1.5.0",
+ "phpstan/phpstan-phpunit": "^1",
+ "phpstan/phpstan-strict-rules": "^1.1",
+ "doctrine/annotations": "^1.7",
"doctrine/coding-standard": "^9.0",
"doctrine/common": "^3.0",
- "phpunit/phpunit": "^7.5.20 || ^8.5 || ^9.5",
+ "phpunit/phpunit": "^8.5 || ^9.5",
"symfony/cache": "^4.4 || ^5.4 || ^6.0",
"vimeo/psalm": "4.22.0"
},
"conflict": {
- "doctrine/annotations": "<1.0 || >=2.0",
+ "doctrine/annotations": "<1.7 || >=2.0",
"doctrine/common": "<2.10"
},
"autoload": {
"psr-4": {
- "Doctrine\\Common\\": "src/Common",
"Doctrine\\Persistence\\": "src/Persistence"
}
},
diff --git a/php-doctrine-persistence3.spec b/php-doctrine-persistence3.spec
index 4e13e16..8e00002 100644
--- a/php-doctrine-persistence3.spec
+++ b/php-doctrine-persistence3.spec
@@ -1,4 +1,4 @@
-# remirepo/fedora spec file for php-doctrine-persistence2
+# remirepo/fedora spec file for php-doctrine-persistence3
#
# Copyright (c) 2018-2022 Remi Collet
# License: CC-BY-SA
@@ -8,11 +8,11 @@
#
%global bootstrap 0
-%global gh_commit 4473480044c88f30e0e8288e7123b60c7eb9efa3
+%global gh_commit e6103cb9e0982a4312e05ad94bb7be3f8e2d5869
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner doctrine
%global gh_project persistence
-%global major 2
+%global major 3
# packagist
%global pk_vendor %{gh_owner}
%global pk_project %{gh_project}
@@ -27,9 +27,9 @@
%endif
Name: php-%{pk_vendor}-%{pk_project}%{major}
-Version: 2.5.1
+Version: 3.0.0
Release: 1%{?dist}
-Summary: Doctrine Persistence abstractions
+Summary: Doctrine Persistence abstractions, version %{major}
License: MIT
URL: https://github.com/%{gh_owner}/%{gh_project}
@@ -39,66 +39,58 @@ Source1: makesrc.sh
BuildArch: noarch
BuildRequires: php-fedora-autoloader-devel
%if %{with_tests}
-BuildRequires: php(language) >= 7.1
+BuildRequires: php(language) >= 7.2
BuildRequires: php-reflection
BuildRequires: php-pcre
BuildRequires: php-spl
# From composer.json
# "composer/package-versions-deprecated": "^1.11",
-# "phpstan/phpstan": "1.4.6",
-# "doctrine/annotations": "^1.0",
+# "phpstan/phpstan": "1.5.0",
+# "phpstan/phpstan-phpunit": "^1",
+# "phpstan/phpstan-strict-rules": "^1.1",
+# "doctrine/annotations": "^1.7",
# "doctrine/coding-standard": "^9.0",
# "doctrine/common": "^3.0",
-# "phpunit/phpunit": "^7.5.20 || ^8.5 || ^9.5",
+# "phpunit/phpunit": "^8.5 || ^9.5",
# "symfony/cache": "^4.4 || ^5.4 || ^6.0",
# "vimeo/psalm": "4.21.0"
# 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.11 with php-composer(doctrine/cache) < 3)
+BuildRequires: (php-composer(doctrine/annotations) >= 1.7 with php-composer(doctrine/annotations) < 2)
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)
-BuildRequires: (php-composer(doctrine/deprecations) >= 0.5.3 with php-composer(doctrine/deprecations) < 1)
BuildRequires: (php-composer(symfony/cache) >= 4.4 with php-composer(symfony/cache) < 7)
BuildRequires: (php-composer(psr/cache) >= 1.0 with php-composer(psr/cache) < 2)
-# remirepo:10
+# remirepo:8
%else
-BuildRequires: php-doctrine-annotations >= 1.0
-BuildRequires: php-doctrine-cache >= 1.0
+BuildRequires: php-doctrine-annotations >= 1.7
BuildRequires: php-doctrine-collections >= 1.0
BuildRequires: php-doctrine-event-manager >= 1.0
BuildRequires: php-doctrine-common3 >= 3.0
-BuildRequires: php-doctrine-deprecations >= 0.5.3
BuildRequires: php-symfony4-cache >= 4.4
BuildRequires: php-psr-cache >= 1.0
%endif
%global phpunit %{_bindir}/phpunit9
-BuildRequires: phpunit9
+BuildRequires: phpunit9 >= 9.5
%endif
# From composer.json
-# "php": "^7.1 || ^8.0"
-# "doctrine/cache": "^1.11 || ^2.0",
+# "php": "^7.2 || ^8.0"
# "doctrine/collections": "^1.0",
# "doctrine/event-manager": "^1.0",
-# "psr/cache": "^1.0 || ^2.0 || ^3.0",
-# "doctrine/deprecations": "^0.5.3"
-Requires: php(language) >= 7.1
+# "psr/cache": "^1.0 || ^2.0 || ^3.0"
+Requires: php(language) >= 7.2
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires: (php-composer(doctrine/cache) >= 1.11 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)
-Requires: (php-composer(doctrine/deprecations) >= 0.5.3 with php-composer(doctrine/deprecations) < 1)
# ignore v2 and v3
Requires: (php-composer(psr/cache) >= 1.0 with php-composer(psr/cache) < 2)
-# remirepo:7
+# remirepo:5
%else
-Requires: php-doctrine-cache >= 1.0
Requires: php-doctrine-collections >= 1.0
Requires: php-doctrine-event-manager >= 1.0
-Requires: php-doctrine-deprecations >= 0.5.3
Requires: php-psr-cache >= 1.0
%endif
# From phpcompatinfo report for version 1.0.0
@@ -126,8 +118,6 @@ Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_subproj}%{major}/autoload.php
mv src/%{ns_subproj} \
src/%{ns_subproj}%{major}
-mv src/%{ns_project}/%{ns_subproj} \
- src/%{ns_project}/%{ns_subproj}%{major}
%build
@@ -141,11 +131,6 @@ cat << 'EOF' | tee -a src/%{ns_subproj}%{major}/autoload.php
// Dependencies
\Fedora\Autoloader\Dependencies::required([
'%{_datadir}/php/Psr/Cache/autoload.php',
- '%{_datadir}/php/%{ns_vendor}/Deprecations/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',
]);
@@ -204,11 +189,18 @@ exit $ret
%license LICENSE
%doc *.md
%doc composer.json
-%{_datadir}/php/%{ns_vendor}/%{ns_project}/%{ns_subproj}%{major}
%{_datadir}/php/%{ns_vendor}/%{ns_subproj}%{major}
%changelog
+* Tue Apr 19 2022 Remi Collet <remi@remirepo.net> - 3.0.0-1
+- update to 3.0.0
+- rename to php-doctrine-persistence3
+- install in /usr/share/php/Doctrine/Persistence3
+- raise dependency on PHP 7.2
+- drop dependency on doctrine/cache
+- drop dependency on doctrine/deprecations
+
* Tue Apr 19 2022 Remi Collet <remi@remirepo.net> - 2.5.1-1
- update to 2.5.1
generated by cgit (git 2.34.1) at 2024-11-23 17:26:30 +0000