summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2017-03-23 06:35:20 +0100
committerRemi Collet <fedora@famillecollet.com>2017-03-23 06:35:20 +0100
commitb30991d6ff0a98abd7c81f32b43a4214fc0b3683 (patch)
treecf0303a6af731019c61c00fb2ae9a31f22d8818e
parent7ce5b1d928d7c22864ad980fbacd924e48306944 (diff)
v1.33.0
-rw-r--r--.gitignore2
-rw-r--r--REFLECTION2
-rw-r--r--composer.json4
-rw-r--r--php-twig.spec10
4 files changed, 13 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d820c84
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*.tar.gz
+*.src.rpm
diff --git a/REFLECTION b/REFLECTION
index 191dda6..b550f15 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #75 twig version 1.32.0 ] {
+Extension [ <persistent> extension #75 twig version 1.33.0 ] {
- Functions {
Function [ <internal:twig> function twig_template_get_attributes ] {
diff --git a/composer.json b/composer.json
index f53b91b..b89f14c 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,7 @@
"php": ">=5.2.7"
},
"require-dev": {
- "symfony/phpunit-bridge": "~3.2",
+ "symfony/phpunit-bridge": "~3.3@dev",
"symfony/debug": "~2.7",
"psr/container": "^1.0"
},
@@ -41,7 +41,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.32-dev"
+ "dev-master": "1.33-dev"
}
}
}
diff --git a/php-twig.spec b/php-twig.spec
index 2f14d73..cc8e794 100644
--- a/php-twig.spec
+++ b/php-twig.spec
@@ -30,8 +30,8 @@
%global github_owner twigphp
%global github_name Twig
-%global github_version 1.32.0
-%global github_commit 9935b662e24d6e634da88901ab534cc12e8c728f
+%global github_version 1.33.0
+%global github_commit 05cf49921b13f6f01d3cfdf9018cfa7a8086fd5a
%global github_short %(c=%{github_commit}; echo ${c:0:7})
%if "%{php_version}" < "7"
@@ -225,6 +225,8 @@ sed -e '/trigger_error/d' -i lib/Twig/Autoloader.php
%build
+%{?dtsenable}
+
%if %{with_ext}
: Ext -- NTS
pushd ext/NTS
@@ -246,6 +248,7 @@ popd
%install
rm -rf %{buildroot}
+%{?dtsenable}
: Lib
mkdir -p %{buildroot}%{phpdir}
@@ -364,6 +367,9 @@ rm -rf %{buildroot}
%changelog
+* Thu Mar 23 2017 Remi Collet <remi@remirepo.net> - 1.33.0-1
+- Update to 1.33.0
+
* Mon Feb 27 2017 Remi Collet <remi@fedoraproject.org> - 1.32.0-1
- Update to 1.32.0