From: Marcin Krol <hawk@tld-linux.org>
Date: Sat, 25 Jul 2015 15:45:55 +0000 (+0000)
Subject: - updated to 4.4.12
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=5a94fc27884170486f6191eb57e4bea9f0331f07;p=packages%2FphpMyAdmin.git

- updated to 4.4.12
---

diff --git a/phpMyAdmin-config.patch b/phpMyAdmin-config.patch
index 8a9328f..a2ba87b 100644
--- a/phpMyAdmin-config.patch
+++ b/phpMyAdmin-config.patch
@@ -1,5 +1,6 @@
---- phpMyAdmin-4.2.2-all-languages/libraries/config.default.php.orig	2014-05-20 12:33:33.000000000 +0000
-+++ phpMyAdmin-4.2.2-all-languages/libraries/config.default.php	2014-06-05 07:05:50.969396745 +0000
+diff -ur phpMyAdmin-4.4.12-all-languages.orig/libraries/config.default.php phpMyAdmin-4.4.12-all-languages/libraries/config.default.php
+--- phpMyAdmin-4.4.12-all-languages.orig/libraries/config.default.php	2015-07-20 12:55:42.000000000 +0000
++++ phpMyAdmin-4.4.12-all-languages/libraries/config.default.php	2015-07-25 15:38:01.668514288 +0000
 @@ -1,18 +1,6 @@
  <?php
  /* vim: set expandtab sw=4 ts=4 sts=4: */
@@ -42,7 +43,7 @@
  
  /**
   * MySQL password (only needed with 'config' auth_type)
-@@ -859,14 +854,14 @@
+@@ -853,14 +848,14 @@
   *
   * @global integer $cfg['MaxNavigationItems']
   */
@@ -59,7 +60,7 @@
  
  /**
   * the separator to sub-tree the select-based light menu tree
-@@ -918,14 +913,14 @@
+@@ -919,14 +914,14 @@
   *
   * @global integer $cfg['NumRecentTables']
   */
@@ -76,16 +77,16 @@
  
  /**
   * display a JavaScript table filter in the navigation panel
-@@ -1115,7 +1110,7 @@
+@@ -1124,7 +1119,7 @@
   *
   * @global string $cfg['GridEditing']
   */
 -$cfg['GridEditing'] ='double-click';
 +$cfg['GridEditing'] ='disabled';
  
- 
- /*******************************************************************************
-@@ -1244,7 +1239,7 @@
+ /**
+  * Options > Relational display
+@@ -1266,7 +1261,7 @@
   *
   * @global boolean $cfg['ActionLinksMode']
   */
@@ -94,7 +95,7 @@
  
  /**
   * How many columns should be used for table display of a database?
-@@ -1294,7 +1289,7 @@
+@@ -1316,7 +1311,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 ba34751..62b27f3 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.3.9
-Release:	2
+Version:	4.4.12
+Release:	1
 License:	GPL v2
 Group:		Applications/Databases/Interfaces
-Source0:	http://downloads.sourceforge.net/phpmyadmin/%{name}-%{version}-all-languages.tar.xz
-# Source0-md5:	b1a6cc51818999b62497cdf57303ff18
+Source0:	https://files.phpmyadmin.net/%{name}/%{version}/%{name}-%{version}-all-languages.tar.xz
+# Source0-md5:	61647a8ab0f47bf99ed3c79103237017
 Source1:	%{name}-apache.conf
 Source2:	%{name}-lighttpd.conf
 Patch0:		%{name}-config.patch