From a668e8ddc816742be9da6897f994f36bb0aacd7c Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Mon, 28 Nov 2016 14:36:19 +0100
Subject: phpMyAdmin: drop patch
---
phpMyAdmin-pr12741.patch | 24 ------------------------
phpMyAdmin.spec | 14 ++++----------
2 files changed, 4 insertions(+), 34 deletions(-)
delete mode 100644 phpMyAdmin-pr12741.patch
diff --git a/phpMyAdmin-pr12741.patch b/phpMyAdmin-pr12741.patch
deleted file mode 100644
index c095859..0000000
--- a/phpMyAdmin-pr12741.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 546dda3fdce7ee8d71707a970baf3bfe19afb01f Mon Sep 17 00:00:00 2001
-From: Remi Collet <fedora@famillecollet.com>
-Date: Sat, 26 Nov 2016 16:05:07 +0100
-Subject: [PATCH] make PMA_isAllowedDomain case insensitive, fix links on home
- page
-
-Signed-off-by: Remi Collet <fedora@famillecollet.com>
----
- libraries/core.lib.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libraries/core.lib.php b/libraries/core.lib.php
-index cb7161d..1b345d2 100644
---- a/libraries/core.lib.php
-+++ b/libraries/core.lib.php
-@@ -765,7 +765,7 @@ function PMA_isAllowedDomain($url)
- return false;
- }
- }
-- $domain = $arr["host"];
-+ $domain = strtolower($arr["host"]);
- $domainWhiteList = array(
- /* Include current domain */
- $_SERVER['SERVER_NAME'],
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 2e3cb6c..803f118 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -23,7 +23,7 @@
Name: phpMyAdmin
Version: 4.6.5.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Web based MySQL browser written in php
Group: Applications/Internet
@@ -37,8 +37,6 @@ Source1: https://files.phpmyadmin.net/%{name}/%{version}%{?prever:-%prever}/%{na
Source2: phpMyAdmin.htaccess
Source3: phpMyAdmin.nginx
-Patch0: %{name}-pr12741.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: unzip
@@ -98,13 +96,6 @@ is available in 50 languages
%prep
%setup -qn phpMyAdmin-%{version}%{?prever:-%prever}-all-languages
-%patch0 -p1
-
-# Fix links on home page to match allowed domains
-# see https://github.com/phpmyadmin/phpmyadmin/pull/1291
-sed -e 's/www.phpmyadmin.net/www.phpMyAdmin.net/' \
- -i index.php
-
# Minimal configuration file
sed -e "/'extension'/s@'mysql'@'mysqli'@" \
-e "/'blowfish_secret'/s@''@'MUSTBECHANGEDONINSTALL'@" \
@@ -230,6 +221,9 @@ sed -e "/'blowfish_secret'/s/MUSTBECHANGEDONINSTALL/$SECRET/" \
%changelog
+* Mon Nov 28 2016 Remi Collet <remi@remirepo.net> 4.6.5.1-2
+- drop unneeded patch
+
* Sat Nov 26 2016 Remi Collet <remi@remirepo.net> 4.6.5.1-1
- update to 4.6.5.1 (2016-11-26, bug fixes)
- add patch to fix broken links on home page,
--
cgit