From c539bf5ce3b40dfd5e33fd2ce82be41439a6d735 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 20 Dec 2021 11:12:08 +0100 Subject: update to 3.16.1 raise dependency on doctrine/dbal 3.1.4 --- php-bartlett-php-compatinfo-db.spec | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) (limited to 'php-bartlett-php-compatinfo-db.spec') diff --git a/php-bartlett-php-compatinfo-db.spec b/php-bartlett-php-compatinfo-db.spec index c10cd97..f5aa686 100644 --- a/php-bartlett-php-compatinfo-db.spec +++ b/php-bartlett-php-compatinfo-db.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # # See https://github.com/llaville/php-compatinfo-db/releases -%global gh_commit 65080937bf2d2d7606230db0d847eae5be8999b8 +%global gh_commit c2b0356a6240b52140d940fe421517ae8b7cd539 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20151031 %global gh_owner llaville @@ -28,7 +28,7 @@ %bcond_with im6 %bcond_with im7 -%global upstream_version 3.15.0 +%global upstream_version 3.16.1 #global upstream_prever RC1 Name: php-%{c_vendor}-%{c_project} @@ -44,7 +44,7 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit # Fix sqlite database path # Fix version and avoir composer/package-versions-deprecated (relying on composer.lock) # Set proxy files as static -Patch0: %{name}-3.14-rpm.patch +Patch0: %{name}-3.16-rpm.patch # Backported features affecting test suite # - CURL_SSLVERSION constants # - Phar::OPENSSL_SHA* constants @@ -66,13 +66,13 @@ BuildRequires: php-spl %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-composer(composer/semver) >= 3.0 with php-composer(composer/semver) < 4) BuildRequires: (php-composer(doctrine/orm) >= 2.7 with php-composer(doctrine/orm) < 4) -BuildRequires: (php-composer(doctrine/dbal) >= 3.1.1 with php-composer(doctrine/dbal) < 4) +BuildRequires: (php-composer(doctrine/dbal) >= 3.1.4 with php-composer(doctrine/dbal) < 4) BuildRequires: (php-composer(symfony/requirements-checker) >= 2.0 with php-composer(symfony/requirements-checker) < 3) # remirepo:6 %else BuildRequires: php-composer-semver3 BuildRequires: php-doctrine-orm >= 2.7 -BuildRequires: php-doctrine-dbal3 >= 3.1.1 +BuildRequires: php-doctrine-dbal3 >= 3.1.4 BuildRequires: php-symfony-requirements-checker >= 2.0 %endif BuildRequires: php-symfony4-cache >= 4.4 @@ -109,7 +109,7 @@ BuildRequires: php-pecl-imagick-im7 # "composer/package-versions-deprecated": "^1.8", # "composer/semver": "^1.0|^2.0|^3.0", # "doctrine/orm": "^2.7", -# "doctrine/dbal": "^2.13.1||^3.1.1", +# "doctrine/dbal": "^2.13.1||^3.1.4", # "symfony/cache": "^4.4|^5.0", # "symfony/config": "^4.4|^5.0", # "symfony/console": "^4.4|^5.0", @@ -130,13 +130,13 @@ Requires: php-spl %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-composer(composer/semver) >= 3.0 with php-composer(composer/semver) < 4) Requires: (php-composer(doctrine/orm) >= 2.7 with php-composer(doctrine/orm) < 4) -Requires: (php-composer(doctrine/dbal) >= 3.1.1 with php-composer(doctrine/dbal) < 4) +Requires: (php-composer(doctrine/dbal) >= 3.1.4 with php-composer(doctrine/dbal) < 4) Requires: (php-composer(symfony/requirements-checker) >= 2.0 with php-composer(symfony/requirements-checker) < 3) # remirepo:6 %else Requires: php-composer-semver3 >= 3.0 Requires: php-doctrine-orm >= 2.7 -Requires: php-doctrine-dbal3 >= 3.1.1 +Requires: php-doctrine-dbal3 >= 3.1.4 Requires: php-symfony-requirements-checker >= 2.0 %endif Requires: php-symfony4-cache >= 4.4 @@ -248,8 +248,9 @@ sed -e "s:%{_datadir}/php/%{ns_vendor}/%{ns_project}:$PWD/src:" \ bin/compatinfo-db >compatinfo-db export DATABASE_URL=sqlite:///${PWD}/compatinfo.sqlite +ln -s src/config config doctrine orm:generate-proxies -doctrine orm:schema-tool:create +doctrine orm:schema-tool:create --ansi : Generate the references database php -d memory_limit=2G -d date.timezone=Europe/Paris compatinfo-db db:init @@ -259,6 +260,9 @@ php -d memory_limit=2G -d date.timezone=Europe/Paris compatinfo-db doctor --json : Diag %{_bindir}/php -d date.timezone=Europe/Paris compatinfo-db diagnose +: Cleanup +rm config + %install mkdir -p %{buildroot}%{_datadir}/php/%{ns_vendor} @@ -304,6 +308,10 @@ exit $ret %changelog +* Mon Dec 20 2021 Remi Collet - 3.16.1-1 +- update to 3.16.1 +- raise dependency on doctrine/dbal 3.1.4 + * Thu Dec 2 2021 Remi Collet - 3.15.0-1 - update to 3.15.0 - raise dependency on PHP 7.3 -- cgit