diff options
| -rw-r--r-- | composer.json | 13 | ||||
| -rw-r--r-- | phpMyAdmin.spec | 18 |
2 files changed, 21 insertions, 10 deletions
diff --git a/composer.json b/composer.json index d4e4c94..d1a63b0 100644 --- a/composer.json +++ b/composer.json @@ -47,7 +47,7 @@ "ext-xml": "*", "google/recaptcha": "^1.1", "nikic/fast-route": "^1.3", - "phpmyadmin/motranslator": "~5.0.0", + "phpmyadmin/motranslator": "^5.0", "phpmyadmin/shapefile": "^2.0", "phpmyadmin/sql-parser": "^5.0", "phpmyadmin/twig-i18n-extension": "^3.0", @@ -84,7 +84,7 @@ "php-webdriver/webdriver": "^1.8", "phpmyadmin/coding-standard": "^2.1.1", "phpstan/extension-installer": "^1.1", - "phpstan/phpstan": "^0.12.61", + "phpstan/phpstan": "^0.12.73", "phpstan/phpstan-phpunit": "^0.12.17", "phpunit/phpunit": "^7.5 || ^8.0 || ^9.0", "pragmarx/google2fa-qrcode": "^1.0.1", @@ -92,12 +92,12 @@ "symfony/console": "^4.4", "symfony/finder": "^4.4", "symfony/twig-bridge": "^4.4", - "tecnickcom/tcpdf": "^6.3", - "vimeo/psalm": "^4.1.1" + "tecnickcom/tcpdf": "dev-main#456b794f1fae9aee5c151a1ee515aae2aaa619a3", + "vimeo/psalm": "^4.4.1" }, "extra": { "branch-alias": { - "dev-master": "5.1.x-dev" + "dev-master": "5.2.x-dev" } }, "scripts": { @@ -116,6 +116,7 @@ "twig-lint": "php scripts/console lint:twig templates --ansi --show-deprecations" }, "config":{ - "sort-packages": true + "sort-packages": true, + "discard-changes": true } } diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec index 15a97dc..49bed25 100644 --- a/phpMyAdmin.spec +++ b/phpMyAdmin.spec @@ -1,7 +1,7 @@ # remirepo spec file for phpMyAdmin # remirepo:3 # -# Copyright (c) 2008-2020 Remi Collet +# Copyright (c) 2008-2021 Remi Collet # # Fedora spec file for phpMyAdmin # @@ -24,7 +24,7 @@ %endif %global upstream_version 5.1.0 -%global upstream_prever rc1 +%global upstream_prever rc2 Name: phpMyAdmin Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} @@ -224,6 +224,7 @@ sed -e "/'CHANGELOG_FILE'/s@ROOT_PATH@'%{_pkgdocdir}/'@" \ %endif -e '/AUTOLOAD_FILE/s@./vendor@%{_datadir}/%{name}/vendor@' \ -e "/TEMP_DIR/s@ROOT.*tmp'@'%{_localstatedir}/lib/%{name}/temp'@" \ + -e "/CACHE_DIR/s@ROOT.*cache'@'%{_localstatedir}/lib/%{name}/cache'@" \ -i libraries/vendor_config.php # For debug @@ -278,6 +279,8 @@ install -Dpm 0644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/httpd/conf.d/phpMyAdmin install -Dpm 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/nginx/default.d/phpMyAdmin.conf %endif +mkdir -p %{buildroot}/%{_localstatedir}/lib/%{name}/{upload,save,config,temp} + rm -f %{buildroot}/%{_datadir}/%{name}/config.sample.inc.php rm -f %{buildroot}/%{_datadir}/%{name}/*txt rm -f %{buildroot}/%{_datadir}/%{name}/[CDLR]* @@ -287,6 +290,7 @@ rm -f %{buildroot}/%{_datadir}/%{name}/setup/frames/.htaccess rm -rf %{buildroot}%{_datadir}/%{name}/contrib rm %{buildroot}%{_datadir}/%{name}/composer.* rm -rf %{buildroot}%{_datadir}/%{name}/tmp/ +mv %{buildroot}%{_datadir}/%{name}/libraries/cache %{buildroot}/%{_localstatedir}/lib/%{name}/cache # JS libraries sources #rm -r %{buildroot}%{_datadir}/%{name}/js/jquery/src @@ -301,8 +305,6 @@ rm -rf %{buildroot}%{_datadir}/%{name}/doc/ mkdir -p %{buildroot}%{_datadir}/%{name}/doc/ ln -s %{_pkgdocdir}/html %{buildroot}%{_datadir}/%{name}/doc/html -mkdir -p %{buildroot}/%{_localstatedir}/lib/%{name}/{upload,save,config,temp} - mv -f %{buildroot}%{_datadir}/%{name}/js/vendor/jquery/MIT-LICENSE.txt LICENSE-jquery mv -f %{buildroot}%{_datadir}/%{name}/js/vendor/codemirror/LICENSE LICENSE-codemirror @@ -339,9 +341,17 @@ sed -e "/'blowfish_secret'/s/MUSTBECHANGEDONINSTALL/$SECRET/" \ %dir %attr(0750,apache,apache) %{_localstatedir}/lib/%{name}/save %dir %attr(0750,apache,apache) %{_localstatedir}/lib/%{name}/config %dir %attr(0750,apache,apache) %{_localstatedir}/lib/%{name}/temp +%dir %attr(0750,apache,apache) %{_localstatedir}/lib/%{name}/cache + %attr(0640,apache,apache) %{_localstatedir}/lib/%{name}/cache/* %changelog +* Wed Feb 10 2021 Remi Collet <remi@remirepo.net> - 5.1.0~rc2-1 +- update to 5.1.0-rc2 + +* Mon Dec 21 2020 Remi Collet <remi@remirepo.net> - 5.1.0~rc1-2 +- set CACHE_DIR + * 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 |