From cecc4de2aff12ca52c68e71882962c0878e6e3f3 Mon Sep 17 00:00:00 2001
From: Marcin Krol <hawk@tld-linux.org>
Date: Tue, 19 Jan 2016 13:17:08 +0000
Subject: [PATCH] - updated to 4.5.3.1
---
phpMyAdmin-config.patch | 16 ++++++++--------
phpMyAdmin.spec | 10 +++++-----
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/phpMyAdmin-config.patch b/phpMyAdmin-config.patch
index a2ba87b..ded7698 100644
--- a/phpMyAdmin-config.patch
+++ b/phpMyAdmin-config.patch
@@ -1,6 +1,6 @@
-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
+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
@@ -1,18 +1,6 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
@@ -43,7 +43,7 @@ diff -ur phpMyAdmin-4.4.12-all-languages.orig/libraries/config.default.php phpMy
/**
* MySQL password (only needed with 'config' auth_type)
-@@ -853,14 +848,14 @@
+@@ -874,14 +869,14 @@
*
* @global integer $cfg['MaxNavigationItems']
*/
@@ -60,7 +60,7 @@ diff -ur phpMyAdmin-4.4.12-all-languages.orig/libraries/config.default.php phpMy
/**
* the separator to sub-tree the select-based light menu tree
-@@ -919,14 +914,14 @@
+@@ -940,14 +935,14 @@
*
* @global integer $cfg['NumRecentTables']
*/
@@ -77,7 +77,7 @@ diff -ur phpMyAdmin-4.4.12-all-languages.orig/libraries/config.default.php phpMy
/**
* display a JavaScript table filter in the navigation panel
-@@ -1124,7 +1119,7 @@
+@@ -1186,7 +1181,7 @@
*
* @global string $cfg['GridEditing']
*/
@@ -86,7 +86,7 @@ diff -ur phpMyAdmin-4.4.12-all-languages.orig/libraries/config.default.php phpMy
/**
* Options > Relational display
-@@ -1266,7 +1261,7 @@
+@@ -1333,7 +1328,7 @@
*
* @global boolean $cfg['ActionLinksMode']
*/
@@ -95,7 +95,7 @@ diff -ur phpMyAdmin-4.4.12-all-languages.orig/libraries/config.default.php phpMy
/**
* How many columns should be used for table display of a database?
-@@ -1316,7 +1311,7 @@
+@@ -1383,7 +1378,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 a115ebb..3dbb65c 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.4.13.1
+Version: 4.5.3.1
Release: 1
License: GPL v2
Group: Applications/Databases/Interfaces
Source0: https://files.phpmyadmin.net/%{name}/%{version}/%{name}-%{version}-all-languages.tar.xz
-# Source0-md5: be8ab49694ce0ea97a14143a68a5ea42
+# Source0-md5: e7e9981c75d356f5fb932e1a2e4978f8
Source1: %{name}-apache.conf
Source2: %{name}-lighttpd.conf
Patch0: %{name}-config.patch
@@ -26,7 +26,7 @@ Requires: php(filter)
Requires: php(json)
Requires: php(mbstring)
Requires: php(mcrypt)
-Requires: php(mysql)
+Requires: php(mysqli)
Requires: php(pcre)
Requires: php(session)
Requires: php(simplexml)
@@ -34,7 +34,6 @@ Requires: webapps
Requires: webserver(access)
Requires: webserver(alias)
Requires(triggerpostun): sed >= 4.0
-Suggests: php-mysqli
Suggests: webserver(indexfile)
Suggests: webserver(php)
BuildArch: noarch
@@ -95,7 +94,7 @@ rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}}
cp -p *.php *.css favicon.ico robots.txt $RPM_BUILD_ROOT%{_appdir}
-cp -a locale themes js libraries $RPM_BUILD_ROOT%{_appdir}
+cp -a js libraries locale templates themes $RPM_BUILD_ROOT%{_appdir}
cp -p libraries/config.default.php $RPM_BUILD_ROOT%{_sysconfdir}/config.inc.php
ln -sf %{_sysconfdir}/config.inc.php $RPM_BUILD_ROOT%{_appdir}/config.inc.php
@@ -137,6 +136,7 @@ rm -rf $RPM_BUILD_ROOT
%{_appdir}/js
%{_appdir}/libraries
%{_appdir}/locale
+%{_appdir}/templates
%{_appdir}/themes
%{_appdir}/*.css
%{_appdir}/*.php
--
2.49.0