From: Marcin Krol <hawk@tld-linux.org>
Date: Sun, 16 Aug 2020 16:28:46 +0000 (+0200)
Subject: - fix autodeps, don't use env
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=58f71afbd2fca01fcee8244a1210e072b302f128;p=packages%2FphpMyAdmin.git

- fix autodeps, don't use env
---

diff --git a/phpMyAdmin-env.patch b/phpMyAdmin-env.patch
new file mode 100644
index 0000000..ba1aa1c
--- /dev/null
+++ b/phpMyAdmin-env.patch
@@ -0,0 +1,36 @@
+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
+ <?php
+ declare(strict_types=1);
+ 
+diff -ur phpMyAdmin-5.0.2-all-languages.orig/vendor/phpmyadmin/sql-parser/bin/lint-query phpMyAdmin-5.0.2-all-languages/vendor/phpmyadmin/sql-parser/bin/lint-query
+--- phpMyAdmin-5.0.2-all-languages.orig/vendor/phpmyadmin/sql-parser/bin/lint-query	2020-03-21 05:17:39.000000000 +0100
++++ phpMyAdmin-5.0.2-all-languages/vendor/phpmyadmin/sql-parser/bin/lint-query	2020-08-16 18:20:31.658866887 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env php
++#!/usr/bin/php
+ <?php
+ declare(strict_types=1);
+ 
+diff -ur phpMyAdmin-5.0.2-all-languages.orig/vendor/phpmyadmin/sql-parser/bin/tokenize-query phpMyAdmin-5.0.2-all-languages/vendor/phpmyadmin/sql-parser/bin/tokenize-query
+--- phpMyAdmin-5.0.2-all-languages.orig/vendor/phpmyadmin/sql-parser/bin/tokenize-query	2020-03-21 05:17:39.000000000 +0100
++++ phpMyAdmin-5.0.2-all-languages/vendor/phpmyadmin/sql-parser/bin/tokenize-query	2020-08-16 18:20:27.313866887 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env php
++#!/usr/bin/php
+ <?php
+ declare(strict_types=1);
+ 
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 7329d03..bc2f731 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -1,11 +1,9 @@
-# TODO
-# - add codepress (http://codepress.org/index.php) patch
-# - use system jquery (js/jquery), tcpdf (libraries/tcpdf) and php-gettext (libraries/gettext)
+%define	_noautoreqfiles vendor/paragonie/random_compat/psalm-autoload.php
 Summary:	phpMyAdmin - web-based MySQL administration
 Summary(pl.UTF-8):	phpMyAdmin - administracja bazami MySQL przez WWW
 Name:		phpMyAdmin
 Version:	5.0.2
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Applications/Databases/Interfaces
 Source0:	https://files.phpmyadmin.net/%{name}/%{version}/%{name}-%{version}-all-languages.tar.xz
@@ -14,6 +12,7 @@ Source1:	%{name}-apache.conf
 Source2:	%{name}-lighttpd.conf
 Patch0:		%{name}-config.patch
 Patch1:		%{name}-disable-version-check.patch
+Patch2:		%{name}-env.patch
 URL:		http://www.phpmyadmin.net/
 BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	tar >= 1:1.22
@@ -85,6 +84,7 @@ 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