From ab1938aa95fd2d6332336566c5780f28015e2e77 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 19 Sep 2019 09:22:48 +0200
Subject: rename patch, use local copy instead of remote URI

---
 258.patch                              | 35 ----------------------------------
 php-phpmyadmin-sql-parser5-php74.patch | 35 ++++++++++++++++++++++++++++++++++
 php-phpmyadmin-sql-parser5.spec        |  7 +++++--
 3 files changed, 40 insertions(+), 37 deletions(-)
 delete mode 100644 258.patch
 create mode 100644 php-phpmyadmin-sql-parser5-php74.patch

diff --git a/258.patch b/258.patch
deleted file mode 100644
index ba6220a..0000000
--- a/258.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 579f7445f7cfd8c3ff07f20fe836a1c56518656e Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Mon, 2 Sep 2019 15:02:02 +0200
-Subject: [PATCH] fix implode arg. order
-
----
- src/Components/Expression.php      | 2 +-
- src/Components/ExpressionArray.php | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/Components/Expression.php b/src/Components/Expression.php
-index 9c21def5..108f3350 100644
---- a/src/Components/Expression.php
-+++ b/src/Components/Expression.php
-@@ -433,7 +433,7 @@ public static function parse(Parser $parser, TokensList $list, array $options =
-     public static function build($component, array $options = [])
-     {
-         if (is_array($component)) {
--            return implode($component, ', ');
-+            return implode(', ', $component);
-         }
- 
-         if ($component->expr !== '' && ! is_null($component->expr)) {
-diff --git a/src/Components/ExpressionArray.php b/src/Components/ExpressionArray.php
-index 2f44d7af..eb05aac9 100644
---- a/src/Components/ExpressionArray.php
-+++ b/src/Components/ExpressionArray.php
-@@ -122,6 +122,6 @@ public static function build($component, array $options = [])
-             $ret[] = $frag::build($frag);
-         }
- 
--        return implode($ret, ', ');
-+        return implode(', ', $ret);
-     }
- }
diff --git a/php-phpmyadmin-sql-parser5-php74.patch b/php-phpmyadmin-sql-parser5-php74.patch
new file mode 100644
index 0000000..ba6220a
--- /dev/null
+++ b/php-phpmyadmin-sql-parser5-php74.patch
@@ -0,0 +1,35 @@
+From 579f7445f7cfd8c3ff07f20fe836a1c56518656e Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Mon, 2 Sep 2019 15:02:02 +0200
+Subject: [PATCH] fix implode arg. order
+
+---
+ src/Components/Expression.php      | 2 +-
+ src/Components/ExpressionArray.php | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Components/Expression.php b/src/Components/Expression.php
+index 9c21def5..108f3350 100644
+--- a/src/Components/Expression.php
++++ b/src/Components/Expression.php
+@@ -433,7 +433,7 @@ public static function parse(Parser $parser, TokensList $list, array $options =
+     public static function build($component, array $options = [])
+     {
+         if (is_array($component)) {
+-            return implode($component, ', ');
++            return implode(', ', $component);
+         }
+ 
+         if ($component->expr !== '' && ! is_null($component->expr)) {
+diff --git a/src/Components/ExpressionArray.php b/src/Components/ExpressionArray.php
+index 2f44d7af..eb05aac9 100644
+--- a/src/Components/ExpressionArray.php
++++ b/src/Components/ExpressionArray.php
+@@ -122,6 +122,6 @@ public static function build($component, array $options = [])
+             $ret[] = $frag::build($frag);
+         }
+ 
+-        return implode($ret, ', ');
++        return implode(', ', $ret);
+     }
+ }
diff --git a/php-phpmyadmin-sql-parser5.spec b/php-phpmyadmin-sql-parser5.spec
index 340cfec..cece3a2 100644
--- a/php-phpmyadmin-sql-parser5.spec
+++ b/php-phpmyadmin-sql-parser5.spec
@@ -19,7 +19,7 @@
 
 Name:           php-%{gh_owner}-%{gh_project}%{major}
 Version:        5.0.0
-Release:        1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist}
+Release:        2%{?gh_date?%{gh_date}git%{gh_short}}%{?dist}
 Summary:        A validating SQL lexer and parser with a focus on MySQL dialect
 
 License:        GPLv2+
@@ -29,7 +29,7 @@ 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:         https://patch-diff.githubusercontent.com/raw/phpmyadmin/sql-parser/pull/258.patch
+Patch1:         %{name}-php74.patch
 
 BuildArch:      noarch
 BuildRequires:  gettext
@@ -180,6 +180,9 @@ exit $ret
 
 
 %changelog
+* Thu Sep 19 2019 Remi Collet <remi@remirepo.net> - 5.0.0-2
+- rename patch, use local copy instead of remote URI
+
 * Mon Sep  2 2019 Remi Collet <remi@remirepo.net> - 5.0.0-1
 - update to 5.0.0
 - rename to php-phpmyadmin-sql-parser5
-- 
cgit