From 9aab905ee8c62d517be6528f623ddcf7081e7729 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 11 Oct 2017 12:35:09 +0200 Subject: v4.2.3 --- composer.json | 3 ++- php-phpmyadmin-sql-parser.spec | 11 ++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index eb61a92..16054d7 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ }, "require": { "php": ">=5.3.0", - "ext-mbstring": "*" + "symfony/polyfill-mbstring": "^1.3" }, "require-dev": { "phpunit/php-code-coverage": "*", @@ -27,6 +27,7 @@ "phpmyadmin/motranslator": "<3.0" }, "suggest": { + "ext-mbstring": "For best performance", "phpmyadmin/motranslator": "Translate messages to your favorite locale" }, "bin": [ diff --git a/php-phpmyadmin-sql-parser.spec b/php-phpmyadmin-sql-parser.spec index 7590a6f..4d29f90 100644 --- a/php-phpmyadmin-sql-parser.spec +++ b/php-phpmyadmin-sql-parser.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # -%global gh_commit 5c8396653030a868cf1353e6733c73362a6f6ad9 +%global gh_commit ab4d910fcfb331c58269afd5cf85281cdab954ce %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phpmyadmin #global gh_date 20150820 @@ -17,7 +17,7 @@ %global ns_project SqlParser Name: php-%{gh_owner}-%{gh_project} -Version: 4.2.2 +Version: 4.2.3 Release: 1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist} Summary: A validating SQL lexer and parser with a focus on MySQL dialect @@ -46,15 +46,17 @@ BuildRequires: php-composer(fedora/autoloader) # From composer.json, "require": { # "php": ">=5.3.0", -# "ext-mbstring": "*" +# "symfony/polyfill-mbstring": "^1.3" # From composer.json, "conflict": { # "phpmyadmin/motranslator": "<3.0" # From composer.json, "suggest": { +# "ext-mbstring": "For best performance", # "phpmyadmin/motranslator": "Translate messages to your favorite locale" Requires: php(language) >= 5.3 Requires: php-composer(phpmyadmin/motranslator) < 4 Requires: php-composer(phpmyadmin/motranslator) >= 3.0 +# Mandatory to avoid symfony/polyfill-mbstring Requires: php-mbstring # From phpcompatinfo report for 4.2.0 Requires: php-pcre @@ -168,6 +170,9 @@ exit $ret %changelog +* Wed Oct 11 2017 Remi Collet - 4.2.3-1 +- Update to 4.2.3 + * Fri Sep 29 2017 Remi Collet - 4.2.2-1 - Update to 4.2.2 -- cgit