summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2013-02-15 15:26:40 +0100
committerRemi Collet <fedora@famillecollet.com>2013-02-15 15:26:40 +0100
commitc0b2d36e492c48aa496bb83f5692d59db77afe9e (patch)
tree9f8e63ef5f46030a3d63253680bae3be3772402b
parent94c51c09dda8c516d12ec5f50c6abd581c74d514 (diff)
phpMyAdmin: fix MariaDB reported as MySQL (2)
-rw-r--r--phpMyAdmin.spec8
1 files changed, 8 insertions, 0 deletions
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index e647497..8c82256 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -19,6 +19,10 @@ Source14: http://downloads.sourceforge.net/sourceforge/phpmyadmin/blueorange-1.0
Source15: http://downloads.sourceforge.net/sourceforge/phpmyadmin/cleanstrap-1.0.zip
Source16: http://downloads.sourceforge.net/sourceforge/phpmyadmin/metro-1.0.zip
+# http://sourceforge.net/p/phpmyadmin/bugs/3828/
+# MariaDB reported as MySQL
+Patch0: %{name}-mariadb.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: unzip
@@ -45,6 +49,8 @@ is available in 50 languages
%prep
%setup -qn phpMyAdmin-%{version}%{?prever:-%prever}-all-languages
+%patch0 -p1
+
# Minimal configuration file
sed -e "/'extension'/s@'mysql'@'mysqli'@" \
-e "/'blowfish_secret'/s@''@'MUSTBECHANGEDONINSTALL'@" \
@@ -128,6 +134,8 @@ sed -i -e "/'blowfish_secret'/s/MUSTBECHANGEDONINSTALL/$RANDOM$RANDOM$RANDOM$RAN
%changelog
* Fri Feb 15 2013 Remi Collet <rpms@famillecollet.com> 3.5.7-1
- Upstream released 3.5.7 (bugfix)
+- patch for http://sourceforge.net/p/phpmyadmin/bugs/3828/
+ MariaDB reported as MySQL
* Mon Jan 28 2013 Remi Collet <rpms@famillecollet.com> 3.5.6-1
- Upstream released 3.5.6 (bugfix)