diff options
| -rw-r--r-- | php-doctrine-common.spec | 39 |
1 files changed, 32 insertions, 7 deletions
diff --git a/php-doctrine-common.spec b/php-doctrine-common.spec index 364e75f..6753ed6 100644 --- a/php-doctrine-common.spec +++ b/php-doctrine-common.spec @@ -2,7 +2,7 @@ # # Fedora spec file for php-doctrine-common # -# Copyright (c) 2013-2017 Shawn Iwinski <shawn.iwinski@gmail.com> +# Copyright (c) 2013-2018 Shawn Iwinski <shawn.iwinski@gmail.com> # # License: MIT # http://opensource.org/licenses/MIT @@ -12,8 +12,8 @@ %global github_owner doctrine %global github_name common -%global github_version 2.7.2 -%global github_commit 930297026c8009a567ac051fd545bf6124150347 +%global github_version 2.7.3 +%global github_commit 4acb8f89626baafede6ee5475bc5844096eba8a9 %global composer_vendor doctrine %global composer_project common @@ -47,6 +47,7 @@ %{!?phpdir: %global phpdir %{_datadir}/php} Name: php-%{composer_vendor}-%{composer_project} +Epoch: 1 Version: %{github_version} Release: 1%{?dist} Summary: Common library for Doctrine projects @@ -67,6 +68,13 @@ BuildRequires: php-cli %if %{with_tests} ## composer.json BuildRequires: php(language) >= %{php_min_ver} +%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}) +BuildRequires: (php-composer(doctrine/collections) >= %{doctrine_collections_min_ver} with php-composer(doctrine/collections) < %{doctrine_collections_max_ver}) +BuildRequires: (php-composer(doctrine/inflector) >= %{doctrine_inflector_min_ver} with php-composer(doctrine/inflector) < %{doctrine_inflector_max_ver}) +BuildRequires: (php-composer(doctrine/lexer) >= %{doctrine_lexer_min_ver} with php-composer(doctrine/lexer) < %{doctrine_lexer_max_ver}) +%else BuildRequires: php-composer(doctrine/annotations) < %{doctrine_annotations_max_ver} BuildRequires: php-composer(doctrine/annotations) >= %{doctrine_annotations_min_ver} BuildRequires: php-composer(doctrine/cache) < %{doctrine_cache_max_ver} @@ -79,6 +87,7 @@ BuildRequires: php-doctrine-inflector >= %{doctrine_inflector_min_ver} BuildRequires: php-composer(doctrine/lexer) < %{doctrine_lexer_max_ver} #BuildRequires: php-composer(doctrine/lexer) >= %%{doctrine_lexer_min_ver} BuildRequires: php-doctrine-lexer >= %{doctrine_lexer_min_ver} +%endif BuildRequires: php-composer(phpunit/phpunit) ## phpcompatinfo (computed from version 2.7.2) BuildRequires: php-date @@ -92,6 +101,13 @@ BuildRequires: php-composer(fedora/autoloader) # composer.json Requires: php(language) >= %{php_min_ver} +%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}) +Requires: (php-composer(doctrine/collections) >= %{doctrine_collections_min_ver} with php-composer(doctrine/collections) < %{doctrine_collections_max_ver}) +Requires: (php-composer(doctrine/inflector) >= %{doctrine_inflector_min_ver} with php-composer(doctrine/inflector) < %{doctrine_inflector_max_ver}) +Requires: (php-composer(doctrine/lexer) >= %{doctrine_lexer_min_ver} with php-composer(doctrine/lexer) < %{doctrine_lexer_max_ver}) +%else Requires: php-composer(doctrine/annotations) >= %{doctrine_annotations_min_ver} Requires: php-composer(doctrine/annotations) < %{doctrine_annotations_max_ver} Requires: php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} @@ -104,6 +120,8 @@ Requires: php-composer(doctrine/inflector) < %{doctrine_inflector_max_ver} #Requires: php-composer(doctrine/lexer) >= %%{doctrine_lexer_min_ver} Requires: php-doctrine-lexer >= %{doctrine_lexer_min_ver} Requires: php-composer(doctrine/lexer) < %{doctrine_lexer_max_ver} +%endif +# phpcompatinfo (computed from version 2.8.1) # phpcompatinfo (computed from version 2.7.2) Requires: php-pcre Requires: php-reflection @@ -130,9 +148,6 @@ Autoloader: %{phpdir}/Doctrine/Common/autoload.php %prep %setup -qn %{github_name}-%{github_commit} -: Fix version -sed -i 's#2.7.0-DEV#%{version}#' lib/Doctrine/Common/Version.php - %build : Create autoloader @@ -187,7 +202,7 @@ sed -e 's/function testGetManagerForAliasedClass/function SKIP_testGetManagerFor : Upstream tests RETURN_CODE=0 PHPUNIT=$(which phpunit) -for PHP_EXEC in "" %{?rhel:php54 php55} php56 php70 php71 php72; do +for PHP_EXEC in "" %{?rhel:php54 php55 php56} php70 php71 php72; do if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then $PHP_EXEC $PHPUNIT --verbose || RETURN_CODE=1 fi @@ -212,6 +227,16 @@ exit $RETURN_CODE %changelog +* Sun Apr 22 2018 Shawn Iwinski <shawn.iwinski@gmail.com> - 1:2.7.3-1 +- Downgraded to 2.7.3 (i.e. latest version less than 2.8 which is required by + php-doctrine-dbal-2.5.12) + +* Sun Apr 22 2018 Shawn Iwinski <shawn.iwinski@gmail.com> - 2.8.1-1 +- Updated to 2.8.1 (RHBZ #1258673) +- Update get source script to save source in same directory +- Add range version dependencies for Fedora >= 27 || RHEL >= 8 +- Add composer.json to repo + * Sun Jul 09 2017 Shawn Iwinski <shawn.iwinski@gmail.com> - 2.7.2-1 - Updated to 2.7.2 (RHBZ #1258673) |