summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-11-22 10:05:11 +0100
committerRemi Collet <remi@remirepo.net>2018-11-22 10:05:11 +0100
commit985167b9fcd50f89f93c1d77dab6a66f0e805c73 (patch)
tree8f2ea95a95f80e99a15b784f209ed22e1bccde62
parente4b58ff38847edb9492827719fd664107fca8e7b (diff)
update to 2.10.0
raise dependency on doctrine/persistence 1.1
-rw-r--r--composer.json14
-rw-r--r--php-doctrine-common.spec16
2 files changed, 21 insertions, 9 deletions
diff --git a/composer.json b/composer.json
index c3cd736..ee0f15a 100644
--- a/composer.json
+++ b/composer.json
@@ -1,9 +1,13 @@
{
"name": "doctrine/common",
"type": "library",
- "description": "Common Library for Doctrine projects",
- "keywords": ["collections", "spl", "eventmanager", "annotations", "persistence"],
- "homepage": "https://www.doctrine-project.org",
+ "description": "PHP Doctrine Common project is a library that provides additional functionality that other Doctrine projects depend on such as better reflection support, persistence interfaces, proxies, event system and much more.",
+ "keywords": [
+ "php",
+ "common",
+ "doctrine"
+ ],
+ "homepage": "https://www.doctrine-project.org/projects/common.html",
"license": "MIT",
"authors": [
{"name": "Guilherme Blanco", "email": "guilhermeblanco@gmail.com"},
@@ -22,7 +26,7 @@
"doctrine/annotations": "^1.0",
"doctrine/event-manager": "^1.0",
"doctrine/reflection": "^1.0",
- "doctrine/persistence": "^1.0"
+ "doctrine/persistence": "^1.1"
},
"require-dev": {
"phpunit/phpunit": "^6.3",
@@ -42,7 +46,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.9.x-dev"
+ "dev-master": "2.10.x-dev"
}
}
}
diff --git a/php-doctrine-common.spec b/php-doctrine-common.spec
index 201fb05..c7d6dc9 100644
--- a/php-doctrine-common.spec
+++ b/php-doctrine-common.spec
@@ -12,8 +12,8 @@
%global github_owner doctrine
%global github_name common
-%global github_version 2.9.0
-%global github_commit a210246d286c77d2b89040f8691ba7b3a713d2c1
+%global github_version 2.10.0
+%global github_commit 30e33f60f64deec87df728c02b107f82cdafad9d
%global composer_vendor doctrine
%global composer_project common
@@ -46,8 +46,8 @@
# "doctrine/reflection": "^1.0"
%global doctrine_refl_min_ver 1.0
%global doctrine_refl_max_ver 2
-# "doctrine/persistence": "^1.0"
-%global doctrine_pers_min_ver 1.0
+# "doctrine/persistence": "^1.1"
+%global doctrine_pers_min_ver 1.1
%global doctrine_pers_max_ver 2
# Build using "--without tests" to disable tests
@@ -77,6 +77,7 @@ BuildRequires: php-cli
%if %{with_tests}
## composer.json
BuildRequires: php(language) >= %{php_min_ver}
+# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
BuildRequires: (php-composer(doctrine/annotations) >= %{doctrine_annotations_min_ver} with php-composer(doctrine/annotations) < %{doctrine_annotations_max_ver})
BuildRequires: (php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} with php-composer(doctrine/cache) < %{doctrine_cache_max_ver})
@@ -86,6 +87,7 @@ BuildRequires: (php-composer(doctrine/lexer) >= %{doctrine_lexer_min_ver} with p
BuildRequires: (php-composer(doctrine/event-manager) >= %{doctrine_event_min_ver} with php-composer(doctrine/event-manager) < %{doctrine_event_max_ver})
BuildRequires: (php-composer(doctrine/reflection) >= %{doctrine_refl_min_ver} with php-composer(doctrine/reflection) < %{doctrine_refl_max_ver})
BuildRequires: (php-composer(doctrine/persistence) >= %{doctrine_pers_min_ver} with php-composer(doctrine/persistence) < %{doctrine_pers_max_ver})
+# remirepo:18
%else
BuildRequires: php-composer(doctrine/annotations) < %{doctrine_annotations_max_ver}
BuildRequires: php-composer(doctrine/annotations) >= %{doctrine_annotations_min_ver}
@@ -117,6 +119,7 @@ BuildRequires: php-composer(fedora/autoloader)
# composer.json
Requires: php(language) >= %{php_min_ver}
+# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
Requires: (php-composer(doctrine/annotations) >= %{doctrine_annotations_min_ver} with php-composer(doctrine/annotations) < %{doctrine_annotations_max_ver})
Requires: (php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} with php-composer(doctrine/cache) < %{doctrine_cache_max_ver})
@@ -126,6 +129,7 @@ Requires: (php-composer(doctrine/lexer) >= %{doctrine_lexer_min_ver} with p
Requires: (php-composer(doctrine/event-manager) >= %{doctrine_event_min_ver} with php-composer(doctrine/event-manager) < %{doctrine_event_max_ver})
Requires: (php-composer(doctrine/reflection) >= %{doctrine_refl_min_ver} with php-composer(doctrine/reflection) < %{doctrine_refl_max_ver})
Requires: (php-composer(doctrine/persistence) >= %{doctrine_pers_min_ver} with php-composer(doctrine/persistence) < %{doctrine_pers_max_ver})
+# remirepo:18
%else
Requires: php-composer(doctrine/annotations) >= %{doctrine_annotations_min_ver}
Requires: php-composer(doctrine/annotations) < %{doctrine_annotations_max_ver}
@@ -241,6 +245,10 @@ exit $RETURN_CODE
%changelog
+* Thu Nov 22 2018 Remi Collet <remi@remirepo.net> - 2.10.0-1
+- update to 2.10.0
+- raise dependency on doctrine/persistence 1.1
+
* Thu Oct 18 2018 Remi Collet <remi@remirepo.net> - 2.9.0-1
- update to 2.9.0
- switch to phpunit6