update to 5.1.0-rc1

add dependency on nikic/fast-route
raise dependency on phpmyadmin/motranslator 5.0
raise dependency on phpmyadmin/twig-i18n-extension 3.0
raise dependency on Symfony 4.4.9

1 files changed, 37 insertions, 38 deletions

diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 3b8eca9..15a97dc 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -23,8 +23,8 @@
 %global with_httpd     0
 %endif
 
-%global upstream_version 5.0.4
-#global upstream_prever  rc1
+%global upstream_version 5.1.0
+%global upstream_prever  rc1
 
 Name: phpMyAdmin
 Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
@@ -41,8 +41,6 @@ Source1: https://files.phpmyadmin.net/%{name}/%{upstream_version}%{?upstream_pre
 Source2: phpMyAdmin.htaccess
 Source3: phpMyAdmin.nginx
 Source4: https://files.phpmyadmin.net/phpmyadmin.keyring
-# remirepo:1
-Source10: phpMyAdmin.htaccess22
 
 # Redirect to system certificates
 Patch0:  phpMyAdmin-certs.patch
@@ -68,7 +66,7 @@ Requires:  php(httpd)
 Suggests:  httpd
 %endif
 # From composer.json, "require": {
-#        "php": "^7.1.3",
+#        "php": "^7.1.3 || ^8.0",
 #        "ext-hash": "*",
 #        "ext-iconv": "*",
 #        "ext-json": "*",
@@ -76,17 +74,17 @@ Suggests:  httpd
 #        "ext-pcre": "*",
 #        "ext-xml": "*",
 #        "google/recaptcha": "^1.1",
-#        "phpmyadmin/motranslator": "^4.0",
+#        "nikic/fast-route": "^1.3",
+#        "phpmyadmin/motranslator": "^5.0",
 #        "phpmyadmin/shapefile": "^2.0",
 #        "phpmyadmin/sql-parser": "^5.0",
-#        "phpmyadmin/twig-i18n-extension": "^2.0 || ^3.0",
+#        "phpmyadmin/twig-i18n-extension": "^3.0",
 #        "phpseclib/phpseclib": "^2.0",
-#        "symfony/config": "^4.2.8",
-#        "symfony/dependency-injection": "^4.2.8",
-#        "symfony/expression-language": "^4.2",
-#        "symfony/polyfill-ctype": "^1.8",
-#        "symfony/polyfill-mbstring": "^1.3",
-#        "symfony/yaml": "^4.2.8",
+#        "symfony/config": "^4.4.9",
+#        "symfony/dependency-injection": "^4.4.9",
+#        "symfony/expression-language": "^4.4.9",
+#        "symfony/polyfill-ctype": "^1.17.0",
+#        "symfony/polyfill-mbstring": "^1.17.0",
 #        "twig/twig": "^2.9 || ^3",
 #        "williamdes/mariadb-mysql-kbs": "^1.2"
 Requires:  php(language) >= 7.1.3
@@ -99,31 +97,31 @@ Requires:  php-xml
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 Requires:  (php-composer(google/recaptcha)             >= 1.1   with php-composer(google/recaptcha)             < 2)
-Requires:  (php-composer(phpmyadmin/motranslator)      >= 4.0   with php-composer(phpmyadmin/motranslator)      < 5)
+Requires:  (php-composer(nikic/fast-route)             >= 1.3   with php-composer(nikic/fast-route)             < 2)
+Requires:  (php-composer(phpmyadmin/motranslator)      >= 5.0   with php-composer(phpmyadmin/motranslator)      < 6)
 Requires:  (php-composer(phpmyadmin/shapefile)         >= 2.0   with php-composer(phpmyadmin/shapefile)         < 3)
 Requires:  (php-composer(phpmyadmin/sql-parser)        >= 5.0   with php-composer(phpmyadmin/sql-parser)        < 6)
-Requires:  (php-composer(phpmyadmin/twig-i18n-extension) >= 2.0 with php-composer(phpmyadmin/twig-i18n-extension) < 4)
+Requires:  (php-composer(phpmyadmin/twig-i18n-extension) >= 3.0 with php-composer(phpmyadmin/twig-i18n-extension) < 4)
 Requires:  (php-composer(phpseclib/phpseclib)          >= 2.0.9 with php-composer(phpseclib/phpseclib)          < 3)
-Requires:  (php-composer(symfony/config)               >= 4.2.8 with php-composer(symfony/config)               < 5)
-Requires:  (php-composer(symfony/dependency-injection) >= 4.2.8 with php-composer(symfony/dependency-injection) < 5)
-Requires:  (php-composer(symfony/expression-language)  >= 4.2.8 with php-composer(symfony/expression-language)  < 5)
-Requires:  (php-composer(symfony/polyfill-mbstring)    >= 1.8   with php-composer(symfony/polyfill-mbstring)    < 2)
-Requires:  (php-composer(symfony/yaml)                 >= 4.2.8 with php-composer(symfony/yaml)                 < 5)
+Requires:  (php-composer(symfony/config)               >= 4.4.9 with php-composer(symfony/config)               < 5)
+Requires:  (php-composer(symfony/dependency-injection) >= 4.4.9 with php-composer(symfony/dependency-injection) < 5)
+Requires:  (php-composer(symfony/expression-language)  >= 4.4.9 with php-composer(symfony/expression-language)  < 5)
+Requires:  (php-composer(symfony/polyfill-mbstring)    >= 1.17  with php-composer(symfony/polyfill-mbstring)    < 2)
 Requires:  (php-composer(twig/twig)                    >= 2.9   with php-composer(twig/twig)                    < 4)
 Requires:  (php-composer(williamdes/mariadb-mysql-kbs) >= 1.2   with php-composer(williamdes/mariadb-mysql-kbs) < 2)
 # remirepo:15
 %else
 Requires:  php-google-recaptcha              >= 1.1
-Requires:  php-phpmyadmin-motranslator       >= 4.0
+Requires:  php-nikic-fast-route              >= 1.3
+Requires:  php-phpmyadmin-motranslator5      >= 5.0
 Requires:  php-phpmyadmin-shapefile          >= 2.0
 Requires:  php-phpmyadmin-sql-parser5
 Requires:  php-phpmyadmin-twig-i18n-extension
 Requires:  php-phpseclib                     >= 2.0.9
-Requires:  php-symfony4-config               >= 4.1
-Requires:  php-symfony4-dependency-injection >= 4.1
-Requires:  php-symfony4-expression-language  >= 4.1
-Requires:  php-symfony-polyfill              >= 1.8.0
-Requires:  php-symfony4-yaml                 >= 4.1
+Requires:  php-symfony4-config               >= 4.4.9
+Requires:  php-symfony4-dependency-injection >= 4.4.9
+Requires:  php-symfony4-expression-language  >= 4.4.9
+Requires:  php-symfony-polyfill              >= 1.17
 Requires:  php-twig2                         >= 2.9
 Requires:  php-williamdes-mariadb-mysql-kbs  >= 1.2
 %endif
@@ -225,7 +223,7 @@ sed -e "/'CHANGELOG_FILE'/s@ROOT_PATH@'%{_pkgdocdir}/'@" \
     -e '/LICENSE_FILE/s:%_defaultdocdir:%_defaultlicensedir:' \
 %endif
     -e '/AUTOLOAD_FILE/s@./vendor@%{_datadir}/%{name}/vendor@' \
-    -e "/TEMP_DIR/s@ROOT.*tmp/'@'%{_localstatedir}/lib/%{name}/temp'@" \
+    -e "/TEMP_DIR/s@ROOT.*tmp'@'%{_localstatedir}/lib/%{name}/temp'@" \
     -i libraries/vendor_config.php
 
 # For debug
@@ -240,7 +238,8 @@ cat << 'EOF' | tee vendor/autoload.php
 require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php';
 \Fedora\Autoloader\Autoload::addPsr4('PhpMyAdmin\\',        dirname(__DIR__) . '/libraries/classes');
 \Fedora\Autoloader\Dependencies::required([
-    '%{_datadir}/php/PhpMyAdmin/MoTranslator/autoload.php', /* before sqlparser which may allow other version */
+    '%{_datadir}/php/FastRoute/autoload.php',
+    '%{_datadir}/php/PhpMyAdmin/MoTranslator5/autoload.php', /* before sqlparser which may allow other version */
     '%{_datadir}/php/PhpMyAdmin/SqlParser5/autoload.php',
     '%{_datadir}/php/PhpMyAdmin/ShapeFile/autoload.php',
     '%{_datadir}/php/phpseclib/autoload.php',
@@ -253,7 +252,6 @@ require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php';
     '%{_datadir}/php/Symfony4/Component/Config/autoload.php',
     '%{_datadir}/php/Symfony4/Component/DependencyInjection/autoload.php',
     '%{_datadir}/php/Symfony4/Component/ExpressionLanguage/autoload.php',
-    '%{_datadir}/php/Symfony4/Component/Yaml/autoload.php',
     '%{_datadir}/php/Symfony/Polyfill/autoload.php',
     '%{_datadir}/php/Williamdes/MariaDBMySQLKBS/autoload.php',
 ]);
@@ -274,14 +272,7 @@ mkdir -p %{buildroot}/%{_datadir}/%{name}
 cp -ad ./* %{buildroot}/%{_datadir}/%{name}
 install -Dpm 0640 CONFIG %{buildroot}/%{_sysconfdir}/%{name}/config.inc.php
 # Apache
-# remirepo:4
-%if 0%{?rhel} == 6
-# old config file with Apache 2.2/2.4 compatibility
-install -Dpm 0644 %{SOURCE10} %{buildroot}/%{_sysconfdir}/httpd/conf.d/phpMyAdmin.conf
-%else
 install -Dpm 0644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/httpd/conf.d/phpMyAdmin.conf
-# remirepo:1
-%endif
 # Nginx
 %if %{with_nginx}
 install -Dpm 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/nginx/default.d/phpMyAdmin.conf
@@ -293,8 +284,9 @@ rm -f %{buildroot}/%{_datadir}/%{name}/[CDLR]*
 rm -f %{buildroot}/%{_datadir}/%{name}/libraries/.htaccess
 rm -f %{buildroot}/%{_datadir}/%{name}/setup/lib/.htaccess
 rm -f %{buildroot}/%{_datadir}/%{name}/setup/frames/.htaccess
-rm -rf %{buildroot}/%{_datadir}/%{name}/contrib
-rm     %{buildroot}/%{_datadir}/%{name}/composer.*
+rm -rf %{buildroot}%{_datadir}/%{name}/contrib
+rm     %{buildroot}%{_datadir}/%{name}/composer.*
+rm -rf %{buildroot}%{_datadir}/%{name}/tmp/
 
 # JS libraries sources
 #rm -r %{buildroot}%{_datadir}/%{name}/js/jquery/src
@@ -350,6 +342,13 @@ sed -e "/'blowfish_secret'/s/MUSTBECHANGEDONINSTALL/$SECRET/" \
 
 
 %changelog
+* Mon Dec 21 2020 Remi Collet <remi@remirepo.net> - 5.1.0~rc1-1
+- update to 5.1.0-rc1
+- add dependency on nikic/fast-route
+- raise dependency on phpmyadmin/motranslator 5.0
+- raise dependency on phpmyadmin/twig-i18n-extension 3.0
+- raise dependency on Symfony 4.4.9
+
 * Fri Oct 16 2020 Remi Collet <remi@remirepo.net> - 5.0.4-1
 - update to 5.0.4 (2020-10-15, bug fix release)