summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-01-03 10:27:12 +0100
committerRemi Collet <remi@remirepo.net>2020-01-03 10:27:12 +0100
commit2f2a78d97f955e9693622a9242c3bb9d0db8b739 (patch)
treeccd5df5fdce84975ff03499943222031140a2b51
parent2beebca24fe5fc0282529c94aa42aed918bd8545 (diff)
v2.12.3
-rw-r--r--composer.json4
-rw-r--r--php-twig2.spec19
2 files changed, 9 insertions, 14 deletions
diff --git a/composer.json b/composer.json
index 567d263..0d1c0ad 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,6 @@
},
{
"name": "Twig Team",
- "homepage": "https://twig.symfony.com/contributors",
"role": "Contributors"
},
{
@@ -29,8 +28,7 @@
"symfony/polyfill-ctype": "^1.8"
},
"require-dev": {
- "symfony/phpunit-bridge": "^4.4@dev|^5.0",
- "symfony/debug": "^3.4|^4.2",
+ "symfony/phpunit-bridge": "^4.4|^5.0",
"psr/container": "^1.0"
},
"autoload": {
diff --git a/php-twig2.spec b/php-twig2.spec
index 307bcfb..7f73547 100644
--- a/php-twig2.spec
+++ b/php-twig2.spec
@@ -1,8 +1,8 @@
# fedora/remirepo spec file for php-twig2, from
#
-# Fedora spec file for php-twig
+# Fedora spec file for php-twig2
#
-# 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 d761fd1f1c6b867ae09a7d8119a6d95d06dc44ed
+%global github_commit 97b6311585cae66a26833b14b33785f5797f7d39
%global github_short %(c=%{github_commit}; echo ${c:0:7})
%global composer_vendor twig
@@ -24,7 +24,7 @@
%global phpdir %{_datadir}/php
Name: php-%{composer_project}2
-Version: 2.12.2
+Version: 2.12.3
Release: 1%{?dist}
Summary: The flexible, fast, and secure template engine for PHP
@@ -42,12 +42,10 @@ BuildRequires: php(language) >= 7.1
BuildRequires: phpunit7
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(symfony/debug) >= 4.2 with php-composer(symfony/debug) < 5)
BuildRequires: (php-composer(psr/container) >= 1.0 with php-composer(psr/container) < 2)
BuildRequires: (php-composer(symfony/polyfill-mbstring) >= 1.3 with php-composer(symfony/polyfill-mbstring) < 2)
-# remirepo:7
+# remirepo:6
%else
-BuildRequires: php-symfony3-debug >= 3.4
BuildRequires: php-composer(psr/container) < 2
BuildRequires: php-composer(psr/container) >= 1.0
BuildRequires: php-symfony-polyfill < 2
@@ -150,10 +148,6 @@ cat << 'EOF' | tee -a vendor/autoload.php
require_once '%{buildroot}%{phpdir}/Twig2/autoload.php';
// Dependencies (require-dev)
\Fedora\Autoloader\Dependencies::required([
- [
- '%{phpdir}/Symfony4/Component/Debug/autoload.php',
- '%{phpdir}/Symfony3/Component/Debug/autoload.php',
- ],
'%{phpdir}/Psr/Container/autoload.php',
]);
EOF
@@ -183,6 +177,9 @@ exit $RETURN_CODE
%changelog
+* Fri Jan 3 2020 Remi Collet <remi@remirepo.net> - 2.12.3-1
+- update to 2.12.3
+
* Tue Nov 12 2019 Remi Collet <remi@remirepo.net> - 2.12.2-1
- update to 2.12.2