diff options
| -rw-r--r-- | phpMyAdmin-dev.spec | 18 | ||||
| -rw-r--r-- | phpMyAdmin-pr11481.patch | 42 |
2 files changed, 10 insertions, 50 deletions
diff --git a/phpMyAdmin-dev.spec b/phpMyAdmin-dev.spec index 24c2fc1..a0e0d46 100644 --- a/phpMyAdmin-dev.spec +++ b/phpMyAdmin-dev.spec @@ -9,7 +9,7 @@ # # Please, preserve the changelog entries # -%global prever rc1 +#global prever rc1 %{!?_pkgdocdir: %global _pkgdocdir %{_datadir}/doc/%{name}-%{version}} %if 0%{?fedora} >= 21 # nginx 1.6 with nginx-filesystem @@ -23,7 +23,7 @@ Name: phpMyAdmin Version: 4.5.0 -Release: 0.1.%{prever}%{?dist} +Release: 1%{?dist} Summary: Web based MySQL browser written in php Group: Applications/Internet @@ -35,9 +35,6 @@ Source1: https://files.phpmyadmin.net/%{name}/%{version}%{?prever:-%prever}/%{na Source2: phpMyAdmin.htaccess Source3: phpMyAdmin.nginx -# See https://github.com/phpmyadmin/phpmyadmin/pull/11481 -Patch0: %{name}-pr11481.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: unzip @@ -51,7 +48,7 @@ Requires: httpd-filesystem Requires: php(httpd) Suggests: httpd %endif -Requires: php(language) >= 5.3.7 +Requires: php(language) >= 5.5 Requires: php-bcmath Requires: php-bz2 Requires: php-ctype @@ -96,8 +93,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/' \ @@ -222,6 +217,13 @@ sed -i -e "/'blowfish_secret'/s/MUSTBECHANGEDONINSTALL/$RANDOM$RANDOM$RANDOM$RAN %changelog +* Wed Sep 23 2015 Remi Collet <remi@remirepo.net> 4.5.0-1 +- update to 4.5.0 (2015-09-23, features release) +- raise php minimal version to 5.5 + +* Sun Sep 20 2015 Remi Collet <remi@remirepo.net> 4.4.15-1 +- update to 4.4.15 (2015-09-20, last bugfix release) + * Mon Sep 14 2015 Remi Collet <remi@remirepo.net> 4.5.0-0.1.rc1 - update to 4.5.0-rc1 diff --git a/phpMyAdmin-pr11481.patch b/phpMyAdmin-pr11481.patch deleted file mode 100644 index 84efea4..0000000 --- a/phpMyAdmin-pr11481.patch +++ /dev/null @@ -1,42 +0,0 @@ -From c3af684194f25e3f15c3f5576828bcce3ac32ae5 Mon Sep 17 00:00:00 2001 -From: Remi Collet <fedora@famillecollet.com> -Date: Mon, 14 Sep 2015 16:13:05 +0200 -Subject: [PATCH] allow to use system udan11/sql-parser - -Signed-off-by: Remi Collet <remi@fedoraproject.org> ---- - libraries/common.inc.php | 2 +- - libraries/vendor_config.php | 6 +++++- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/libraries/common.inc.php b/libraries/common.inc.php -index 83ff2cc..ea15788 100644 ---- a/libraries/common.inc.php -+++ b/libraries/common.inc.php -@@ -1069,7 +1069,7 @@ - /** - * Initializes the SQL parsing library. - */ -- include_once './libraries/sql-parser/autoload.php'; -+ include_once SQL_PARSER_AUTOLOAD; - - // Loads closest context to this version. - SqlParser\Context::loadClosest( -diff --git a/libraries/vendor_config.php b/libraries/vendor_config.php -index b9c25c6..7087150 100644 ---- a/libraries/vendor_config.php -+++ b/libraries/vendor_config.php -@@ -85,8 +85,12 @@ - define('PHPSECLIB_INC_DIR', './libraries/phpseclib/'); - - /** -+ * Path to the udan11/sql-parser. Useful when you want to use system version. -+ */ -+define('SQL_PARSER_AUTOLOAD', './libraries/sql-parser/autoload.php'); -+ -+/** - * Avoid referring to nonexistent files (causes warnings when open_basedir - * is used) - */ - define('K_PATH_IMAGES', ''); -- |