From 378aa6a35662b0ba0e0f96d8ed5169285deb4aec Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Thu, 6 Aug 2020 21:06:41 +0200 Subject: [PATCH] - updated to 5.0.2 --- phpMyAdmin-config.patch | 20 ++++++++++---------- phpMyAdmin-disable-version-check.patch | 8 ++++---- phpMyAdmin.spec | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/phpMyAdmin-config.patch b/phpMyAdmin-config.patch index 817e1ca..9809a01 100644 --- a/phpMyAdmin-config.patch +++ b/phpMyAdmin-config.patch @@ -1,6 +1,6 @@ -diff -ur phpMyAdmin-4.8.0-all-languages.orig/libraries/config.default.php phpMyAdmin-4.8.0-all-languages/libraries/config.default.php ---- phpMyAdmin-4.8.0-all-languages.orig/libraries/config.default.php 2018-04-07 14:55:43.000000000 +0000 -+++ phpMyAdmin-4.8.0-all-languages/libraries/config.default.php 2018-04-14 20:17:39.235327539 +0000 +diff -ur phpMyAdmin-5.0.2-all-languages.orig/libraries/config.default.php phpMyAdmin-5.0.2-all-languages/libraries/config.default.php +--- phpMyAdmin-5.0.2-all-languages.orig/libraries/config.default.php 2020-03-21 05:17:40.000000000 +0100 ++++ phpMyAdmin-5.0.2-all-languages/libraries/config.default.php 2020-08-06 21:01:31.057763731 +0200 @@ -1,18 +1,6 @@ Relational display -@@ -1348,7 +1343,7 @@ +@@ -1369,7 +1357,7 @@ * * @global boolean $cfg['ActionLinksMode'] */ @@ -72,7 +72,7 @@ diff -ur phpMyAdmin-4.8.0-all-languages.orig/libraries/config.default.php phpMyA /** * How many columns should be used for table display of a database? -@@ -1398,7 +1393,7 @@ +@@ -1419,7 +1407,7 @@ * Whether to display image or text or both image and text in table row * action segment. Value can be either of ``image``, ``text`` or ``both``. */ diff --git a/phpMyAdmin-disable-version-check.patch b/phpMyAdmin-disable-version-check.patch index 6f6182f..b29fb36 100644 --- a/phpMyAdmin-disable-version-check.patch +++ b/phpMyAdmin-disable-version-check.patch @@ -1,7 +1,7 @@ -diff -ur phpMyAdmin-4.8.1-all-languages.orig/libraries/vendor_config.php phpMyAdmin-4.8.1-all-languages/libraries/vendor_config.php ---- phpMyAdmin-4.8.1-all-languages.orig/libraries/vendor_config.php 2018-05-25 02:45:56.000000000 +0000 -+++ phpMyAdmin-4.8.1-all-languages/libraries/vendor_config.php 2018-05-28 11:02:17.740128884 +0000 -@@ -66,7 +66,7 @@ +diff -ur phpMyAdmin-5.0.2-all-languages.orig/libraries/vendor_config.php phpMyAdmin-5.0.2-all-languages/libraries/vendor_config.php +--- phpMyAdmin-5.0.2-all-languages.orig/libraries/vendor_config.php 2020-03-21 05:17:40.000000000 +0100 ++++ phpMyAdmin-5.0.2-all-languages/libraries/vendor_config.php 2020-08-06 21:02:56.026195041 +0200 +@@ -68,7 +68,7 @@ /** * Default value for check for version upgrades. */ diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec index e68d453..7329d03 100644 --- a/phpMyAdmin.spec +++ b/phpMyAdmin.spec @@ -4,12 +4,12 @@ Summary: phpMyAdmin - web-based MySQL administration Summary(pl.UTF-8): phpMyAdmin - administracja bazami MySQL przez WWW Name: phpMyAdmin -Version: 4.9.2 +Version: 5.0.2 Release: 1 License: GPL v2 Group: Applications/Databases/Interfaces Source0: https://files.phpmyadmin.net/%{name}/%{version}/%{name}-%{version}-all-languages.tar.xz -# Source0-md5: 5b5d1d84a05624430ac659e36af00f4e +# Source0-md5: 442eb85912d3a2ad2fc0b9d6c21b1527 Source1: %{name}-apache.conf Source2: %{name}-lighttpd.conf Patch0: %{name}-config.patch -- 2.46.0