From 1ac3eeccbd38c656299e6ec3a1a1c1bd2470e724 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Thu, 25 Nov 2021 03:04:07 +0100 Subject: [PATCH] - updated to 5.1.1 --- phpMyAdmin-config.patch | 24 ++++++++--------- phpMyAdmin-disable-version-check.patch | 6 ++--- phpMyAdmin-env.patch | 36 -------------------------- phpMyAdmin.spec | 11 +++----- 4 files changed, 19 insertions(+), 58 deletions(-) delete mode 100644 phpMyAdmin-env.patch diff --git a/phpMyAdmin-config.patch b/phpMyAdmin-config.patch index 9809a01..10ac2df 100644 --- a/phpMyAdmin-config.patch +++ b/phpMyAdmin-config.patch @@ -1,9 +1,8 @@ -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 @@ +diff -ur phpMyAdmin-5.1.1-all-languages.orig/libraries/config.default.php phpMyAdmin-5.1.1-all-languages/libraries/config.default.php +--- phpMyAdmin-5.1.1-all-languages.orig/libraries/config.default.php 2021-11-25 02:55:24.392642991 +0100 ++++ phpMyAdmin-5.1.1-all-languages/libraries/config.default.php 2021-11-25 02:56:22.546780860 +0100 +@@ -1,18 +1,5 @@ - * N N OOO !! DDDD OOO N N OOO TTTTT EEEE DDDD I TTTTT !! @@ -17,10 +16,11 @@ diff -ur phpMyAdmin-5.0.2-all-languages.orig/libraries/config.default.php phpMyA - * - * phpMyAdmin default configuration, you can copy values from here to your - * config.inc.php - * +- * * All directives are explained in the documentation - * -@@ -880,14 +868,14 @@ + */ + +@@ -938,14 +925,14 @@ * * @global integer $cfg['MaxNavigationItems'] */ @@ -37,7 +37,7 @@ diff -ur phpMyAdmin-5.0.2-all-languages.orig/libraries/config.default.php phpMyA /** * the separator to sub-tree the select-based light menu tree -@@ -946,14 +934,14 @@ +@@ -1004,14 +991,14 @@ * * @global integer $cfg['NumRecentTables'] */ @@ -54,7 +54,7 @@ diff -ur phpMyAdmin-5.0.2-all-languages.orig/libraries/config.default.php phpMyA /** * display a JavaScript table filter in the navigation panel -@@ -1219,7 +1207,7 @@ +@@ -1277,7 +1264,7 @@ * * @global string $cfg['GridEditing'] */ @@ -63,7 +63,7 @@ diff -ur phpMyAdmin-5.0.2-all-languages.orig/libraries/config.default.php phpMyA /** * Options > Relational display -@@ -1369,7 +1357,7 @@ +@@ -1426,7 +1413,7 @@ * * @global boolean $cfg['ActionLinksMode'] */ @@ -72,7 +72,7 @@ diff -ur phpMyAdmin-5.0.2-all-languages.orig/libraries/config.default.php phpMyA /** * How many columns should be used for table display of a database? -@@ -1419,7 +1407,7 @@ +@@ -1476,7 +1463,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 b29fb36..75e3181 100644 --- a/phpMyAdmin-disable-version-check.patch +++ b/phpMyAdmin-disable-version-check.patch @@ -1,6 +1,6 @@ -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 +diff -ur phpMyAdmin-5.1.1-all-languages.orig/libraries/vendor_config.php phpMyAdmin-5.1.1-all-languages/libraries/vendor_config.php +--- phpMyAdmin-5.1.1-all-languages.orig/libraries/vendor_config.php 2021-11-25 02:58:03.022019006 +0100 ++++ phpMyAdmin-5.1.1-all-languages/libraries/vendor_config.php 2021-11-25 02:58:11.591039316 +0100 @@ -68,7 +68,7 @@ /** * Default value for check for version upgrades. diff --git a/phpMyAdmin-env.patch b/phpMyAdmin-env.patch deleted file mode 100644 index ba1aa1c..0000000 --- a/phpMyAdmin-env.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -ur phpMyAdmin-5.0.2-all-languages.orig/vendor/paragonie/random_compat/build-phar.sh phpMyAdmin-5.0.2-all-languages/vendor/paragonie/random_compat/build-phar.sh ---- phpMyAdmin-5.0.2-all-languages.orig/vendor/paragonie/random_compat/build-phar.sh 2020-03-21 05:17:40.000000000 +0100 -+++ phpMyAdmin-5.0.2-all-languages/vendor/paragonie/random_compat/build-phar.sh 2020-08-16 18:20:12.786866887 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/bin/bash - - basedir=$( dirname $( readlink -f ${BASH_SOURCE[0]} ) ) - -diff -ur phpMyAdmin-5.0.2-all-languages.orig/vendor/phpmyadmin/sql-parser/bin/highlight-query phpMyAdmin-5.0.2-all-languages/vendor/phpmyadmin/sql-parser/bin/highlight-query ---- phpMyAdmin-5.0.2-all-languages.orig/vendor/phpmyadmin/sql-parser/bin/highlight-query 2020-03-21 05:17:39.000000000 +0100 -+++ phpMyAdmin-5.0.2-all-languages/vendor/phpmyadmin/sql-parser/bin/highlight-query 2020-08-16 18:20:23.032866887 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env php -+#!/usr/bin/php - = 1.268 BuildRequires: tar >= 1:1.22 @@ -84,7 +83,6 @@ podręcznika MySQL). Aktualnie phpMyAdmin potrafi: %setup -q -n %{name}-%{version}-all-languages %patch0 -p1 %patch1 -p1 -%patch2 -p1 # cleanup backups after patching find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f @@ -93,7 +91,7 @@ find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}/tmp} -cp -p *.php *.css *.json *.lock *.yml favicon.ico robots.txt $RPM_BUILD_ROOT%{_appdir} +cp -p *.php *.css *.json *.lock favicon.ico robots.txt $RPM_BUILD_ROOT%{_appdir} cp -a js libraries locale sql templates themes vendor $RPM_BUILD_ROOT%{_appdir} cp -p libraries/config.default.php $RPM_BUILD_ROOT%{_sysconfdir}/config.inc.php @@ -145,6 +143,5 @@ rm -rf $RPM_BUILD_ROOT %{_appdir}/*.php %{_appdir}/*.json %{_appdir}/*.lock -%{_appdir}/*.yml %{_appdir}/favicon.ico %{_appdir}/robots.txt -- 2.46.0