From d33879ecb6e2f3108eafe06bb4de8ea03bf4121c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 8 Jan 2020 07:39:03 +0100
Subject: v5.2.0
---
php-phpmyadmin-sql-parser5.spec | 36 +++++++++++++++++++++++++-----------
1 file changed, 25 insertions(+), 11 deletions(-)
(limited to 'php-phpmyadmin-sql-parser5.spec')
diff --git a/php-phpmyadmin-sql-parser5.spec b/php-phpmyadmin-sql-parser5.spec
index cece3a2..1dfb906 100644
--- a/php-phpmyadmin-sql-parser5.spec
+++ b/php-phpmyadmin-sql-parser5.spec
@@ -1,13 +1,13 @@
# remirepo/fedora spec file for php-phpmyadmin-sql-parser5
#
-# Copyright (c) 2015-2019 Remi Collet
+# Copyright (c) 2015-2020 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
# Please, preserve the changelog entries
#
-%global gh_commit 538611d5336e1bd8aea30744dab43289334f1657
+%global gh_commit bddaf056f8f43621e94b29284c98f35db8b6d93e
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner phpmyadmin
#global gh_date 20150820
@@ -18,8 +18,8 @@
%global major 5
Name: php-%{gh_owner}-%{gh_project}%{major}
-Version: 5.0.0
-Release: 2%{?gh_date?%{gh_date}git%{gh_short}}%{?dist}
+Version: 5.2.0
+Release: 1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist}
Summary: A validating SQL lexer and parser with a focus on MySQL dialect
License: GPLv2+
@@ -28,8 +28,6 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit
# Use our autoloader and locale relocation
Patch0: %{name}-autoload.patch
-# PHP 7.4
-Patch1: %{name}-php74.patch
BuildArch: noarch
BuildRequires: gettext
@@ -39,12 +37,21 @@ BuildRequires: php-composer(phpmyadmin/motranslator) >= 3.0
BuildRequires: php-mbstring
BuildRequires: php-spl
# For tests, from composer.json "require-dev": {
+# "phpmyadmin/coding-standard": "^1.0",
+# "phpmyadmin/motranslator": "^4.0",
+# "phpstan/extension-installer": "^1.0",
+# "phpstan/phpstan": "^0.12.3",
+# "phpstan/phpstan-phpunit": "^0.12.1",
# "phpunit/php-code-coverage": "*",
-# "phpunit/phpunit": "^7.4",
-# "phpmyadmin/coding-standard": "^1.0"
+# "phpunit/phpunit": "^7.4 || ^8"
+%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8
+BuildRequires: phpunit8
+%global phpunit %{_bindir}/phpunit8
+%else
BuildRequires: phpunit7 >= 7.4
%global phpunit %{_bindir}/phpunit7
%endif
+%endif
# For autoloader
BuildRequires: php-composer(fedora/autoloader)
@@ -84,7 +91,6 @@ Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/autoload.php
%setup -q -n %{gh_project}-%{gh_commit}
%patch0 -p0 -b .rpm
-%patch1 -p1
find src -name \*rpm -exec rm {} \;
: Create autoloader
@@ -140,10 +146,10 @@ EOF
sed -e 's:%{_datadir}/php:%{buildroot}%{_datadir}/php:' -i bin/*query
ret=0
-for cmdarg in "php %{phpunit}" php71 php72 php73 php74; do
+for cmdarg in "php %{phpunit}" "php71 %{_bindir}/phpunit7" php72 php73 php74; do
if which $cmdarg; then
set $cmdarg
- $1 ${2:-%{_bindir}/phpunit7} --no-coverage --verbose || ret=1
+ $1 ${2:-%{_bindir}/phpunit8} --no-coverage --verbose || ret=1
fi
done
exit $ret
@@ -180,6 +186,14 @@ exit $ret
%changelog
+* Wed Jan 8 2020 Remi Collet <remi@remirepo.net> - 5.2.0-1
+- update to 5.2.0
+
+* Tue Nov 12 2019 Remi Collet <remi@remirepo.net> - 5.1.0-1
+- update to 5.1.0
+- drop patch merged upstream
+- use phpunit8
+
* Thu Sep 19 2019 Remi Collet <remi@remirepo.net> - 5.0.0-2
- rename patch, use local copy instead of remote URI
--
cgit