diff options
| -rw-r--r-- | composer.json | 16 | ||||
| -rw-r--r-- | php-doctrine-persistence.spec | 17 |
2 files changed, 23 insertions, 10 deletions
diff --git a/composer.json b/composer.json index 4fc2e59..529d40b 100644 --- a/composer.json +++ b/composer.json @@ -1,8 +1,14 @@ { "name": "doctrine/persistence", "type": "library", - "description": "Doctrine Persistence abstractions.", - "keywords": ["persistence"], + "description": "The Doctrine Persistence project is a set of shared interfaces and functionality that the different Doctrine object mappers share.", + "keywords": [ + "persistence", + "object", + "mapper", + "orm", + "odm" + ], "homepage": "https://doctrine-project.org/projects/persistence.html", "license": "MIT", "authors": [ @@ -23,11 +29,11 @@ }, "require-dev": { "phpstan/phpstan": "^0.8", - "doctrine/coding-standard": "^4.0", + "doctrine/coding-standard": "^5.0", "phpunit/phpunit": "^7.0" }, "conflict": { - "doctrine/common": "<2.9@dev" + "doctrine/common": "<2.10@dev" }, "autoload": { "psr-4": { @@ -41,7 +47,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } } } diff --git a/php-doctrine-persistence.spec b/php-doctrine-persistence.spec index bc1516d..f13212f 100644 --- a/php-doctrine-persistence.spec +++ b/php-doctrine-persistence.spec @@ -8,7 +8,7 @@ # %global bootstrap 0 -%global gh_commit af1ec238659a83e320f03e0e454e200f689b4b97 +%global gh_commit c0f1c17602afc18b4cbd8e1c8125f264c9cf7d38 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner doctrine %global gh_project persistence @@ -26,7 +26,7 @@ %endif Name: php-%{pk_vendor}-%{pk_project} -Version: 1.0.1 +Version: 1.1.0 Release: 1%{?dist} Summary: Doctrine Persistence abstractions @@ -45,14 +45,16 @@ BuildRequires: php-pcre BuildRequires: php-spl # From composer.json # "phpstan/phpstan": "^0.8", -# "doctrine/coding-standard": "^4.0", +# "doctrine/coding-standard": "^5.0", # "phpunit/phpunit": "^7.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.0 with php-composer(doctrine/cache) < 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/reflection) >= 1.0 with php-composer(doctrine/reflection) < 2) +# remirepo:12 %else BuildRequires: php-composer(doctrine/annotations) < 2 BuildRequires: php-composer(doctrine/annotations) >= 1.0 @@ -76,12 +78,14 @@ BuildRequires: phpunit7 # "doctrine/event-manager": "^1.0", # "doctrine/reflection": "^1.0" 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) Requires: (php-composer(doctrine/cache) >= 1.0 with php-composer(doctrine/cache) < 2) 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/reflection) >= 1.0 with php-composer(doctrine/reflection) < 2) +# remirepo:12 %else Requires: php-composer(doctrine/annotations) < 2 Requires: php-composer(doctrine/annotations) >= 1.0 @@ -104,7 +108,7 @@ Requires: php-composer(fedora/autoloader) Provides: php-composer(%{pk_vendor}/%{pk_project}) = %{version} # Split off doctrine/common -Conflicts: php-doctrine-common < 2.9 +Conflicts: php-doctrine-common < 1:2.10 %description @@ -178,9 +182,12 @@ exit $ret %license LICENSE %doc *.md %doc composer.json -%{_datadir}/php/%{ns_vendor}/%{ns_project}/%{ns_subproj}/ +%{_datadir}/php/%{ns_vendor}/%{ns_project}/* %changelog +* Thu Nov 22 2018 Remi Collet <remi@remirepo.net> - 1.1.0-1 +- update to 1.1.0 + * Thu Oct 18 2018 Remi Collet <remi@remirepo.net> - 1.0.1-1 - initial package, version 1.0.1 |