diff options
| -rw-r--r-- | composer.json | 18 | ||||
| -rw-r--r-- | php-phpmyadmin-motranslator5.spec | 71 |
2 files changed, 52 insertions, 37 deletions
diff --git a/composer.json b/composer.json index f7726f8..b7f75a7 100644 --- a/composer.json +++ b/composer.json @@ -15,14 +15,24 @@ "issues": "https://github.com/phpmyadmin/motranslator/issues", "source": "https://github.com/phpmyadmin/motranslator" }, + "scripts": { + "phpcbf": "phpcbf", + "phpcs": "phpcs", + "phpunit": "phpunit --color=always", + "test": [ + "@phpcs", + "@phpunit" + ] + }, "require": { - "php": ">=5.3.0", - "symfony/expression-language": "^4.0 || ^3.2 || ^2.8" + "php": "^7.1", + "symfony/expression-language": "^4.0 || ^5.0" }, "require-dev": { - "apigen/apigen": "^4.1", + "sami/sami": "^4.0", "phpunit/php-code-coverage": "*", - "phpunit/phpunit": "~4.8 || ~5.7 || ~6.5" + "phpunit/phpunit": "^7.4 || ^8", + "phpmyadmin/coding-standard": "^1.0" }, "autoload": { "psr-4": { diff --git a/php-phpmyadmin-motranslator5.spec b/php-phpmyadmin-motranslator5.spec index b8892fe..e6c9a24 100644 --- a/php-phpmyadmin-motranslator5.spec +++ b/php-phpmyadmin-motranslator5.spec @@ -1,30 +1,27 @@ -# remirepo/fedora spec file for php-phpmyadmin-motranslator +# remirepo/fedora spec file for php-phpmyadmin-motranslator5 # -# Copyright (c) 2017-2018 Remi Collet +# Copyright (c) 2017-2020 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global gh_commit fcb370254998fda7eeccfd7c787b4deb71b0d77c +%global gh_commit d1982c7e468df332b6ff0d73fb599519140d393f %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phpmyadmin %global gh_project motranslator %global with_tests 0%{!?_without_tests:1} %global ns_vendor PhpMyAdmin %global ns_project MoTranslator +%global major 5 -%global sym_min_ver 2.8 -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -%global sym_max_ver 5 -%else -%global sym_max_ver 4 -%endif +%global sym_min_ver 4.0 +%global sym_max_ver 6 -Name: php-%{gh_owner}-%{gh_project} -Version: 4.0 -Release: 3%{?dist} +Name: php-%{gh_owner}-%{gh_project}%{major} +Version: 5.0.0 +Release: 1%{?dist} Summary: Translation API for PHP using Gettext MO files Group: Development/Libraries @@ -34,36 +31,36 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit BuildArch: noarch %if %{with_tests} -BuildRequires: php(language) >= 5.3 +BuildRequires: php(language) >= 7.1 BuildRequires: php-pcre +# remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-composer(symfony/expression-language) >= %{sym_min_ver} with php-composer(symfony/expression-language) < %{sym_max_ver}) +# remirepo:3 %else -BuildRequires: php-composer(symfony/expression-language) < %{sym_max_ver} +BuildRequires: php-symfony4-expression-language %endif # For tests, from composer.json "require-dev": { # "phpunit/php-code-coverage": "*", -# "phpunit/phpunit": "~4.8 || ~5.7 || ~6.5" -%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 -%global phpunit %{_bindir}/phpunit6 -%else -%global phpunit %{_bindir}/phpunit -%endif +# "phpunit/phpunit": "^7.4 || ^8" +%global phpunit %{_bindir}/phpunit8 BuildRequires: %{phpunit} %endif # For autoloader BuildRequires: php-composer(fedora/autoloader) # From composer.json, "require": { -# "php": ">=5.3.0", -# "symfony/expression-language": ""^4.0 || ^3.2 || ^2.8" +# "php": "^7.1", +# "symfony/expression-language": ""^4.0 || ^5.0" +# remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-composer(symfony/expression-language) >= %{sym_min_ver} with php-composer(symfony/expression-language) < %{sym_max_ver}) +# remirepo:3 %else -Requires: php-composer(symfony/expression-language) < %{sym_max_ver} +Requires: php-symfony4-expression-language %endif -Requires: php(language) >= 5.3 -# From phpcompatinfo report for 1.2 +Requires: php(language) >= 7.1 +# From phpcompatinfo report for 5.0.0 Requires: php-pcre # For generated autoloader Requires: php-composer(fedora/autoloader) @@ -88,7 +85,7 @@ Limitations * Not suitable for huge MO files which you don't want to store in memory * Input and output encoding has to match (preferably UTF-8) -Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php +Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/autoload.php %prep @@ -104,9 +101,8 @@ require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('%{ns_vendor}\\%{ns_project}\\', __DIR__); \Fedora\Autoloader\Dependencies::required(array(array( + '%{_datadir}/php/Symfony5/Component/ExpressionLanguage/autoload.php', '%{_datadir}/php/Symfony4/Component/ExpressionLanguage/autoload.php', - '%{_datadir}/php/Symfony3/Component/ExpressionLanguage/autoload.php', - '%{_datadir}/php/Symfony/Component/ExpressionLanguage/autoload.php', ))); AUTOLOAD @@ -114,7 +110,7 @@ AUTOLOAD %install : Library mkdir -p %{buildroot}%{_datadir}/php/%{ns_vendor} -cp -pr src %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project} +cp -pr src %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}%{major} %check @@ -122,14 +118,14 @@ cp -pr src %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project} mkdir vendor cat << 'EOF' | tee vendor/autoload.php <?php -require '%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php'; +require '%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/autoload.php'; EOF ret=0 -for cmd in "php %{phpunit}" php71 php72 php73; do +for cmd in "php %{phpunit}" php72 php73 "php74 %{_bindir}/phpunit9"; do if which $cmd; then set $cmd - $1 ${2:-%{_bindir}/phpunit6} --no-coverage --verbose || ret=1 + $1 ${2:-%{_bindir}/phpunit8} --no-coverage --verbose || ret=1 fi done exit $ret @@ -139,15 +135,24 @@ exit $ret %files +# remirepo:1 %{!?_licensedir:%global license %%doc} %license LICENSE %doc composer.json %doc *.md %dir %{_datadir}/php/%{ns_vendor}/ - %{_datadir}/php/%{ns_vendor}/%{ns_project} + %{_datadir}/php/%{ns_vendor}/%{ns_project}%{major} %changelog +* Wed Mar 4 2020 Remi Collet <remi@remirepo.net> - 5.0.0-1 +- update to 5.0.0 +- rename to php-phpmyadmin-motranslator5 +- move to /usr/share/php/PhpMyAdmin/MoTranslator5 +- raise dependency on PHP 7.1 +- raise dependency on Symfony 4 and allow Symfony 5 +- switch to phpunit8 + * Fri Dec 7 2018 Remi Collet <remi@remirepo.net> - 4.0-3 - use range dependencies |