diff options
| -rw-r--r-- | composer.json | 6 | ||||
| -rw-r--r-- | php-twig3.spec | 27 |
2 files changed, 12 insertions, 21 deletions
diff --git a/composer.json b/composer.json index e2a092a..cc7da8e 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,6 @@ }, { "name": "Twig Team", - "homepage": "https://twig.symfony.com/contributors", "role": "Contributors" }, { @@ -24,13 +23,12 @@ } ], "require": { - "php": "^7.2.9", + "php": "^7.2.5", "symfony/polyfill-mbstring": "^1.3", "symfony/polyfill-ctype": "^1.8" }, "require-dev": { - "symfony/phpunit-bridge": "^4.4@dev|^5.0", - "symfony/debug": "^3.4|^4.2|^5.0", + "symfony/phpunit-bridge": "^4.4|^5.0", "psr/container": "^1.0" }, "autoload": { diff --git a/php-twig3.spec b/php-twig3.spec index f58e72c..fa1c3f9 100644 --- a/php-twig3.spec +++ b/php-twig3.spec @@ -2,7 +2,7 @@ # # Fedora spec file for php-twig3 # -# Copyright (c) 2014-2019 Shawn Iwinski <shawn.iwinski@gmail.com> +# Copyright (c) 2014-2020 Shawn Iwinski <shawn.iwinski@gmail.com> # Remi Collet <remi@fedoraproject.org> # # License: MIT @@ -13,7 +13,7 @@ %global with_tests 0%{!?_without_tests:1} %global github_owner twigphp %global github_name Twig -%global github_commit 9b58bb8ac7a41d72fbb5a7dc643e07923e5ccc26 +%global github_commit 28f856a4c57eeb24485916e8a68403f41a133616 %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global composer_vendor twig @@ -21,13 +21,13 @@ %global major 3 -# "php": "^7.2.9" -%global php_min_ver 7.2.9 +# "php": "^7.2.5" +%global php_min_ver 7.2.5 %global phpdir %{_datadir}/php Name: php-%{composer_project}%{major} -Version: 3.0.0 -Release: 2%{?dist} +Version: 3.0.1 +Release: 1%{?dist} Summary: The flexible, fast, and secure template engine for PHP License: BSD @@ -44,11 +44,9 @@ BuildRequires: php(language) >= %{php_min_ver} BuildRequires: phpunit7 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(symfony/debug) >= 4.2 with php-composer(symfony/debug) < 6) BuildRequires: (php-composer(psr/container) >= 1.0 with php-composer(psr/container) < 2) -# remirepo:4 +# remirepo:3 %else -BuildRequires: php-symfony3-debug >= 3.4 BuildRequires: php-psr-container >= 1.0 %endif # Workaround @@ -111,9 +109,6 @@ Autoloader: %{phpdir}/Twig%{major}/autoload.php %build : Create classmap autoloader phpab --template fedora --output src/autoload.php src -cat << 'EOF' | tee -a src/autoload.php -require_once '%{phpdir}/Symfony/Polyfill/autoload.php'; -EOF %install @@ -136,11 +131,6 @@ cat << 'EOF' | tee -a vendor/autoload.php require_once '%{buildroot}%{phpdir}/Twig%{major}/autoload.php'; // Dependencies (require-dev) \Fedora\Autoloader\Dependencies::required([ - [ - '%{phpdir}/Symfony5/Component/Debug/autoload.php', - '%{phpdir}/Symfony4/Component/Debug/autoload.php', - '%{phpdir}/Symfony3/Component/Debug/autoload.php', - ], '%{phpdir}/Psr/Container/autoload.php', ]); EOF @@ -170,6 +160,9 @@ exit $RETURN_CODE %changelog +* Fri Jan 3 2020 Remi Collet <remi@remirepo.net> - 3.0.1-1 +- update to 3.0.1 + * Thu Nov 21 2019 Remi Collet <remi@remirepo.net> - 3.0.0-2 - fix typo in package description |