summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json4
-rw-r--r--phpMyAdmin.spec7
2 files changed, 8 insertions, 3 deletions
diff --git a/composer.json b/composer.json
index d1a63b0..c074d95 100644
--- a/composer.json
+++ b/composer.json
@@ -84,7 +84,7 @@
"php-webdriver/webdriver": "^1.8",
"phpmyadmin/coding-standard": "^2.1.1",
"phpstan/extension-installer": "^1.1",
- "phpstan/phpstan": "^0.12.73",
+ "phpstan/phpstan": "^0.12.78",
"phpstan/phpstan-phpunit": "^0.12.17",
"phpunit/phpunit": "^7.5 || ^8.0 || ^9.0",
"pragmarx/google2fa-qrcode": "^1.0.1",
@@ -93,7 +93,7 @@
"symfony/finder": "^4.4",
"symfony/twig-bridge": "^4.4",
"tecnickcom/tcpdf": "dev-main#456b794f1fae9aee5c151a1ee515aae2aaa619a3",
- "vimeo/psalm": "^4.4.1"
+ "vimeo/psalm": "^4.6.1"
},
"extra": {
"branch-alias": {
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 49bed25..e7ecc28 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -24,7 +24,7 @@
%endif
%global upstream_version 5.1.0
-%global upstream_prever rc2
+#global upstream_prever rc2
Name: phpMyAdmin
Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
@@ -47,6 +47,8 @@ Patch0: phpMyAdmin-certs.patch
BuildArch: noarch
BuildRequires: gnupg2
+# ensure dependencies are there
+BuildRequires: php-symfony4-common >= 4.4.9
Requires(post): coreutils sed
Requires: webserver
@@ -346,6 +348,9 @@ sed -e "/'blowfish_secret'/s/MUSTBECHANGEDONINSTALL/$SECRET/" \
%changelog
+* Wed Feb 24 2021 Remi Collet <remi@remirepo.net> - 5.1.0-1
+- update to 5.1.0 (2021-02-24, new features release)
+
* Wed Feb 10 2021 Remi Collet <remi@remirepo.net> - 5.1.0~rc2-1
- update to 5.1.0-rc2