From a1db25d1202fc0f6c38012fd658c25c7cbc915da Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 27 Mar 2018 07:19:33 +0200
Subject: update to 4.8.0-rc1

---
 composer.json   |  4 ++--
 phpMyAdmin.spec | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index 65be479..b47af22 100644
--- a/composer.json
+++ b/composer.json
@@ -60,7 +60,7 @@
     "conflict": {
         "phpseclib/phpseclib": "2.0.8",
         "tecnickcom/tcpdf": "<6.2",
-        "pragmarx/google2fa": "<2.0",
+        "pragmarx/google2fa": "<3.0.1",
         "bacon/bacon-qr-code": "<1.0",
         "samyoul/u2f-php-server": "<1.1"
     },
@@ -84,7 +84,7 @@
         "phpunit/phpunit-selenium": "~1.2 || ^3.0",
         "squizlabs/php_codesniffer": "^3.0",
         "tecnickcom/tcpdf": "^6.2",
-        "pragmarx/google2fa": "^2.0",
+        "pragmarx/google2fa": "^3.0",
         "bacon/bacon-qr-code": "^1.0",
         "samyoul/u2f-php-server": "^1.1",
         "phpmyadmin/coding-standard": "^0.3"
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 7ef3548..cebf6d7 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -21,11 +21,11 @@
 %endif
 
 %global upstream_version 4.8.0
-%global upstream_prever  alpha1
+%global upstream_prever  rc1
 
 Name: phpMyAdmin
 Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release: 3%{?dist}
+Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
 # MIT (js/jquery/, js/jqplot, js/codemirror/, js/tracekit/)
@@ -74,7 +74,7 @@ Suggests:  httpd
 #    "conflict": {
 #        "phpseclib/phpseclib": "2.0.8",
 #        "tecnickcom/tcpdf": "<6.2",
-#        "pragmarx/google2fa": "<2.0",
+#        "pragmarx/google2fa": "<3.0.1",
 #        "bacon/bacon-qr-code": "<1.0",
 #        "samyoul/u2f-php-server": "<1.1"
 Requires:  php(language) >= 5.5
@@ -131,7 +131,7 @@ Requires:  php-mbstring
 %if 0%{?fedora} >= 21 || 0%{?rhel} >= 8
 Recommends: php-opcache
 Recommends: php-composer(tecnickcom/tcpdf)       >= 6.2
-Recommends: php-composer(pragmarx/google2fa)     >= 2.0
+Recommends: php-composer(pragmarx/google2fa)     >= 3.0.1
 Recommends: php-composer(bacon/bacon-qr-code)    >= 1.0
 Recommends: php-composer(samyoul/u2f-php-server) >= 1.1
 Recommends: php-tcpdf-dejavu-sans-fonts          >= 6.2
@@ -306,6 +306,9 @@ sed -e "/'blowfish_secret'/s/MUSTBECHANGEDONINSTALL/$SECRET/" \
 
 
 %changelog
+* Tue Mar 27 2018 Remi Collet <remi@remirepo.net> 4.8.0~rc1-1
+- update to 4.8.0-rc1
+
 * Wed Mar  7 2018 Remi Collet <remi@remirepo.net> 4.8.0~alpha1-3
 - add optional dependency on pragmarx/google2fa, review #1552442
 - add optional dependency on samyoul/u2f-php-server, review #1552450
-- 
cgit