From 57e7c3585418be34af8170b7806fbd5e4854a3228046329cf759c9e045ff9eb6 Mon Sep 17 00:00:00 2001
From: Eric Schirra <ecsos@schirra.net>
Date: Mon, 9 May 2016 12:40:22 +0000
Subject: [PATCH] Accepting request 394335 from home:computersalat:devel:php

update to 4.6.1

OBS-URL: https://build.opensuse.org/request/show/394335
OBS-URL: https://build.opensuse.org/package/show/server:php:applications/phpMyAdmin?expand=0&rev=256
---
 phpMyAdmin-4.6.0-all-languages.tar.xz     |  3 ---
 phpMyAdmin-4.6.0-all-languages.tar.xz.asc | 17 -----------------
 phpMyAdmin-4.6.1-all-languages.tar.xz     |  3 +++
 phpMyAdmin-4.6.1-all-languages.tar.xz.asc | 17 +++++++++++++++++
 phpMyAdmin.changes                        | 10 ++++++++++
 phpMyAdmin.spec                           |  4 ++--
 6 files changed, 32 insertions(+), 22 deletions(-)
 delete mode 100644 phpMyAdmin-4.6.0-all-languages.tar.xz
 delete mode 100644 phpMyAdmin-4.6.0-all-languages.tar.xz.asc
 create mode 100644 phpMyAdmin-4.6.1-all-languages.tar.xz
 create mode 100644 phpMyAdmin-4.6.1-all-languages.tar.xz.asc

diff --git a/phpMyAdmin-4.6.0-all-languages.tar.xz b/phpMyAdmin-4.6.0-all-languages.tar.xz
deleted file mode 100644
index 9374357..0000000
--- a/phpMyAdmin-4.6.0-all-languages.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:337ef3d1234525599f25e0bcf962f85ed5a9bf550b91e4e25c48bf5604d16e9c
-size 6113584
diff --git a/phpMyAdmin-4.6.0-all-languages.tar.xz.asc b/phpMyAdmin-4.6.0-all-languages.tar.xz.asc
deleted file mode 100644
index 6586820..0000000
--- a/phpMyAdmin-4.6.0-all-languages.tar.xz.asc
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQIcBAABAgAGBQJW6oM+AAoJEM51LxeCWb2SmeMP/A2Ecmt/C0fVmof59EUq8cRp
-FZUTQ2v1/ciQ9XaqfVPkmTEseS2cdJa6qKO8H5ciZ5otV2XBymGrycCtUusNxvbu
-5psHuVlKmBNBRwgw30LsBWC4LvDOmXA+fdanfIKq/4V5DP4vDuB/XsSsglZwvfSi
-VWYvl0mnaNLpbVOjHUqfFR1sXHe00JBQXK3ipkEJk3LEzLKEn320w9pY7LwJXth5
-di3bpWwZvKAc0F9gW+LREK6HUzpxAzAajhQCyM8zInOCP/MalOkAglsO9vyOgEOX
-Jad1DNlzB0BRqCQ1OhEakvRl40LWo4d4NFKy37ZN3rmjQUXeDGjTPJIEePTugmbk
-a/cu7FOlXtfy0WQ3AXyHClKx8ox0Pse9Lnr8/pWea3+TqCDXofy1WrA0dVkJPd1h
-vWGq6BSRtDgvss4ChslJh6YvrdVAReNzIk6m282Vo4BAzpeY/tmXPEZylK+dJnHZ
-5ftRbevmeXaMy3Yq7X05HwIDSsd93m+o+p9uzC3knqIvOXX8Fpw2Kf1b6TFG7ZIS
-NeNO3DgnOHhuvaOrHQ8BsYA79Pq2flxBGj7ES4okYorKQH+PaixSayn5xFBfHD/P
-WYPFH2i4FQSdLIeL3tcJ1puRrKRT3G4ZC0KA2IBHEeYE9Xgzp+MSd6fguo0MXxFI
-mZHVZ86Hs+dwk47rQefR
-=vcbh
------END PGP SIGNATURE-----
diff --git a/phpMyAdmin-4.6.1-all-languages.tar.xz b/phpMyAdmin-4.6.1-all-languages.tar.xz
new file mode 100644
index 0000000..5484a78
--- /dev/null
+++ b/phpMyAdmin-4.6.1-all-languages.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cc85edc5b71bacf6fead0ffaecbd5395fa31fd7bfd6b4a9b12720baa7e715b66
+size 6109268
diff --git a/phpMyAdmin-4.6.1-all-languages.tar.xz.asc b/phpMyAdmin-4.6.1-all-languages.tar.xz.asc
new file mode 100644
index 0000000..65629f8
--- /dev/null
+++ b/phpMyAdmin-4.6.1-all-languages.tar.xz.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJXJ8YFAAoJEM51LxeCWb2SnlMQALvBPcVpGtGtkD/akvRj/Ydq
+MB9DLrpAmTOMAmh/dgBsEmcDDdH8lndim2eJ06H5rfkTCFNKLFsg7oMEIMJ8NMUT
+1+qNQoGPjOhZxDC3XylfzGgGY06/ZC8h8uMV5wXQEc43RZqSjfUrU+epMwllwJg/
+2E3MD9HvZro+sZblJtnoPGtrKX0qWNwLmWx44g6j/fySAjco+d5dAsqATmEponwu
+E9yKklU5zsXASEvp9DEj7RDuv35i8Faz1NUq8MLxVaPuLfB9ySb9vXGOVTwauTfo
+Kj5eb87kERsoQeZ+vtOxYY19nEma6D8cYdUOqEdd3P7b7EnbVvxmcVtD9/nOPZm0
+IIhBU6jg0wkk0HgYFjp+FUGZhODiodJDpwrWOexuUpnWMcsQnYP4BxWu9OGmsoR/
+9QxLa5jRlPE5gUr/oLcT85QTHmTWfGC94cJqp1z0S5uOBrrUR4YhvOLfEXEGSKib
+xISEWzFthgZNAS+kbZ0TyIknn9agBknOM8H1Crcue7A0hyWEN/r0M2OPTezMpRGd
+Uc5NXutMGNjCLEYupymrpJ5qokSsD5JFdRFcbFF9nQ136tKk/jbrI9CLgCfAHEon
+Tfwl/023JnA8Ja8FFkQ8Ux1RtJtTr8J62JY9/DP8ke3z43cgqUYJUZqF/NAPZG/w
+4/k/rBrL9QMW+Fbv5hsd
+=EsaU
+-----END PGP SIGNATURE-----
diff --git a/phpMyAdmin.changes b/phpMyAdmin.changes
index 6a29afd..7f10d7d 100644
--- a/phpMyAdmin.changes
+++ b/phpMyAdmin.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon May  9 10:14:44 UTC 2016 - chris@computersalat.de
+
+- phpMyAdmin 4.6.1:
+  * Problems with SQL syntax warnings from the linter/parser
+  * Fixing an error about "PMA_Util" not found
+  * Better handling of JSON columns
+  * Fixed quoting with the SQL parser, which in particular adversely
+    affected SQL imports and exports 
+
 -------------------------------------------------------------------
 Thu Mar 24 12:03:17 UTC 2016 - astieger@suse.com
 
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 8034b3c..35fd113 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package phpMyAdmin
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -29,7 +29,7 @@
 %define ap_grp nogroup
 %endif
 Name:           phpMyAdmin
-Version:        4.6.0
+Version:        4.6.1
 Release:        0
 Summary:        Administration of MySQL over the web
 License:        GPL-2.0+