[php-twig-ctwig] update to 1.15.0

[Remi Collet]

commit f8aa7155e4560960828a2422fcff1610bb850286
Author: Remi Collet <remi at fedoraproject.org>
Date:   Fri Dec 6 13:58:38 2013 +0100

    update to 1.15.0

 .gitignore          |    1 +
 php-twig-ctwig.spec |   18 ++++++++++++++----
 sources             |    2 +-
 3 files changed, 16 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 686607c..a3a3fb0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 clog
 php-twig-ctwig.spec~
 /CTwig-1.14.1.tgz
+/CTwig-1.15.0.tgz
diff --git a/php-twig-ctwig.spec b/php-twig-ctwig.spec
index cbff700..cd8fae5 100644
--- a/php-twig-ctwig.spec
+++ b/php-twig-ctwig.spec
@@ -8,6 +8,7 @@
 #
 %{!?php_inidir: %global php_inidir  %{_sysconfdir}/php.d}
 %{!?__pecl:     %global __pecl      %{_bindir}/pecl}
+%{!?__php:      %global __php       %{_bindir}/php}
 
 %global with_zts     0%{?__ztsphp:1}
 %global pecl_name    CTwig
@@ -16,8 +17,8 @@
 
 Summary:        Extension to improve performance of Twig
 Name:           php-twig-ctwig
-Version:        1.14.1
-Release:        3%{?dist}
+Version:        1.15.0
+Release:        1%{?dist}
 License:        BSD
 Group:          Development/Languages
 URL:            http://twig.sensiolabs.org
@@ -102,6 +103,11 @@ make -C ZTS install INSTALL_ROOT=%{buildroot}
 install -D -m 644 %{ext_name}.ini %{buildroot}%{php_ztsinidir}/%{ext_name}.ini
 %endif
 
+# Documentation
+for i in $(grep 'role="doc"' package.xml | sed -e 's/^.*name="//;s/".*$//')
+do install -Dpm 644 NTS/$i %{buildroot}%{pear_docdir}/%{pecl_name}/$i
+done
+
 
 %post
 %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
@@ -115,7 +121,7 @@ fi
 
 %check
 : Minimal load test for NTS extension
-%{_bindir}/php --no-php-ini \
+%{__php} --no-php-ini \
     --define extension=NTS/modules/%{ext_name}.so \
     --modules | grep %{ext_name}
 
@@ -128,7 +134,7 @@ fi
 
 
 %files
-%doc NTS/LICENSE
+%doc %{pear_docdir}/%{pecl_name}
 %{pecl_xmldir}/%{name}.xml
 %config(noreplace) %{php_inidir}/%{ext_name}.ini
 %{php_extdir}/%{ext_name}.so
@@ -140,6 +146,10 @@ fi
 
 
 %changelog
+* Fri Dec 06 2013 Remi Collet <remi at fedoraproject.org> - 1.15.0-1
+- Update to 1.15.0 (stable)
+- install doc in pear doc_dir (this is not from pecl channel)
+
 * Mon Oct 21 2013 Remi Collet <remi at fedoraproject.org> - 1.14.1-3
 - cleanup for review, drop SCL and EL-5 support
 
diff --git a/sources b/sources
index 1be4cc4..ccdc12c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-303d9e85e591db3fab38b8a56c01287d  CTwig-1.14.1.tgz
+ec4bbab3878d64ce0d91b08746108d9f  CTwig-1.15.0.tgz