From: Marcin Krol <hawk@tld-linux.org>
Date: Sat, 14 Apr 2018 20:23:50 +0000 (+0000)
Subject: - updated to 4.8.0
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=a18eac45de115412b616f9abe51229b579b49620;p=packages%2FphpMyAdmin.git
- updated to 4.8.0
---
diff --git a/phpMyAdmin-ServerSelectDisplayName.patch b/phpMyAdmin-ServerSelectDisplayName.patch
deleted file mode 100644
index cd27329..0000000
--- a/phpMyAdmin-ServerSelectDisplayName.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-*** libraries/select_server.lib.php.org Tue Aug 19 00:41:59 2008
---- libraries/select_server.lib.php Tue Aug 19 00:42:35 2008
-***************
-*** 62,68 ****
- if (!empty($server['verbose'])) {
- $label = $server['verbose'];
- } else {
-! $label = $server['host'];
- if (!empty($server['port'])) {
- $label .= ':' . $server['port'];
- }
---- 62,68 ----
- if (!empty($server['verbose'])) {
- $label = $server['verbose'];
- } else {
-! $label = isset($server['display']) ? $server['display'] : $server['host'];
- if (!empty($server['port'])) {
- $label .= ':' . $server['port'];
- }
diff --git a/phpMyAdmin-config.patch b/phpMyAdmin-config.patch
index ded7698..817e1ca 100644
--- a/phpMyAdmin-config.patch
+++ b/phpMyAdmin-config.patch
@@ -1,6 +1,6 @@
-diff -ur phpMyAdmin-4.5.3.1-all-languages.orig/libraries/config.default.php phpMyAdmin-4.5.3.1-all-languages/libraries/config.default.php
---- phpMyAdmin-4.5.3.1-all-languages.orig/libraries/config.default.php 2015-12-25 20:07:18.000000000 +0000
-+++ phpMyAdmin-4.5.3.1-all-languages/libraries/config.default.php 2016-01-19 12:55:24.778367491 +0000
+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
@@ -1,18 +1,6 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
@@ -20,30 +20,7 @@ diff -ur phpMyAdmin-4.5.3.1-all-languages.orig/libraries/config.default.php phpM
*
* All directives are explained in the documentation
*
-@@ -118,6 +106,13 @@
- $i = 1;
-
- /**
-+ * Display name
-+ *
-+ * @global string $cfg['Servers'][$i]['display']
-+ */
-+$cfg['Servers'][$i]['display'] = 'localhost';
-+
-+/**
- * MySQL hostname or IP address
- *
- * @global string $cfg['Servers'][$i]['host']
-@@ -257,7 +252,7 @@
- *
- * @global string $cfg['Servers'][$i]['user']
- */
--$cfg['Servers'][$i]['user'] = 'root';
-+$cfg['Servers'][$i]['user'] = 'mysql';
-
- /**
- * MySQL password (only needed with 'config' auth_type)
-@@ -874,14 +869,14 @@
+@@ -869,14 +864,14 @@
*
* @global integer $cfg['MaxNavigationItems']
*/
@@ -60,7 +37,7 @@ diff -ur phpMyAdmin-4.5.3.1-all-languages.orig/libraries/config.default.php phpM
/**
* the separator to sub-tree the select-based light menu tree
-@@ -940,14 +935,14 @@
+@@ -935,14 +930,14 @@
*
* @global integer $cfg['NumRecentTables']
*/
@@ -77,7 +54,7 @@ diff -ur phpMyAdmin-4.5.3.1-all-languages.orig/libraries/config.default.php phpM
/**
* display a JavaScript table filter in the navigation panel
-@@ -1186,7 +1181,7 @@
+@@ -1201,7 +1196,7 @@
*
* @global string $cfg['GridEditing']
*/
@@ -86,7 +63,7 @@ diff -ur phpMyAdmin-4.5.3.1-all-languages.orig/libraries/config.default.php phpM
/**
* Options > Relational display
-@@ -1333,7 +1328,7 @@
+@@ -1348,7 +1343,7 @@
*
* @global boolean $cfg['ActionLinksMode']
*/
@@ -95,7 +72,7 @@ diff -ur phpMyAdmin-4.5.3.1-all-languages.orig/libraries/config.default.php phpM
/**
* How many columns should be used for table display of a database?
-@@ -1383,7 +1378,7 @@
+@@ -1398,7 +1393,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.spec b/phpMyAdmin.spec
index 3dbb65c..748a5d3 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -4,16 +4,15 @@
Summary: phpMyAdmin - web-based MySQL administration
Summary(pl.UTF-8): phpMyAdmin - administracja bazami MySQL przez WWW
Name: phpMyAdmin
-Version: 4.5.3.1
+Version: 4.8.0
Release: 1
License: GPL v2
Group: Applications/Databases/Interfaces
Source0: https://files.phpmyadmin.net/%{name}/%{version}/%{name}-%{version}-all-languages.tar.xz
-# Source0-md5: e7e9981c75d356f5fb932e1a2e4978f8
+# Source0-md5: 946334c6732fe7c5e3d80786794249d1
Source1: %{name}-apache.conf
Source2: %{name}-lighttpd.conf
Patch0: %{name}-config.patch
-Patch1: %{name}-ServerSelectDisplayName.patch
URL: http://www.phpmyadmin.net/
BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: tar >= 1:1.22
@@ -25,7 +24,7 @@ Requires: php(ctype)
Requires: php(filter)
Requires: php(json)
Requires: php(mbstring)
-Requires: php(mcrypt)
+#Requires: php(mcrypt)
Requires: php(mysqli)
Requires: php(pcre)
Requires: php(session)
@@ -84,7 +83,6 @@ podrÄcznika MySQL). Aktualnie phpMyAdmin potrafi:
%prep
%setup -q -n %{name}-%{version}-all-languages
%patch0 -p1
-%patch1 -p0
# cleanup backups after patching
find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f