update to 2.1.3

sources from pecl

2 files changed, 61 insertions, 4 deletions

diff --git a/REFLECTION b/REFLECTION
index 11d995e..d0cf1c2 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,9 +1,26 @@
-Extension [ <persistent> extension #79 componere version 2.1.1 ] {
+Extension [ <persistent> extension #79 componere version 2.1.3 ] {
 
   - Dependencies {
     Dependency [ reflection (Required) ]
   }
 
+  - Functions {
+    Function [ <internal:componere> function Componere\cast ] {
+
+      - Parameters [2] {
+        Parameter #0 [ <required> $Type ]
+        Parameter #1 [ <required> $object ]
+      }
+    }
+    Function [ <internal:componere> function Componere\cast_by_ref ] {
+
+      - Parameters [2] {
+        Parameter #0 [ <required> $Type ]
+        Parameter #1 [ <required> $object ]
+      }
+    }
+  }
+
   - Classes [5] {
     Class [ <internal:componere> abstract final class Componere\Abstract\Definition ] {
 
diff --git a/php-componere.spec b/php-componere.spec
index 38949f1..b60448e 100644
--- a/php-componere.spec
+++ b/php-componere.spec
@@ -12,7 +12,7 @@
 
 %{?scl:          %scl_package         php-componere}
 
-%global gh_commit   8374256328f6bb36a551798062e5802c43bbaa30
+%global gh_commit   2939a4149c27229844a3b29a3d336a3e8a14ac9a
 %global gh_short    %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner    krakjoe
 %global gh_project  componere
@@ -23,7 +23,7 @@
 
 Summary:       Composing PHP classes at runtime
 Name:          %{?scl_prefix}php-componere
-Version:       2.1.1
+Version:       2.1.3
 %if 0%{?gh_date:1}
 Release:       1%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 %else
@@ -31,7 +31,11 @@ Release:       1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_V
 %endif
 License:       PHP
 URL:           https://github.com/%{gh_owner}/%{gh_project}
+%if 0%{?gh_date:1}
 Source0:       https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz
+%else
+Source0:       http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
+%endif
 
 BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?scl_prefix}php-devel > 7
@@ -45,20 +49,31 @@ Requires:      %{?scl_prefix}php(api) = %{php_core_api}
 Provides:       %{?scl_prefix}php-%{pecl_name}               = %{version}-%{release}
 Provides:       %{?scl_prefix}php-%{pecl_name}%{?_isa}       = %{version}-%{release}
 %endif
+Provides:       %{?scl_prefix}php-pecl(%{pecl_name})         = %{version}
+Provides:       %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
+Provides:       %{?scl_prefix}php-pecl-%{pecl_name}          = %{version}-%{release}
+Provides:       %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{release}
 
 %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
 Obsoletes:     php70u-%{pecl_name}      <= %{version}
+Obsoletes:     php70u-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php70w-%{pecl_name}      <= %{version}
+Obsoletes:     php70w-pecl-%{pecl_name} <= %{version}
 %if "%{php_version}" > "7.1"
 Obsoletes:     php71u-%{pecl_name}      <= %{version}
+Obsoletes:     php71u-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php71w-%{pecl_name}      <= %{version}
+Obsoletes:     php71w-pecl-%{pecl_name} <= %{version}
 %endif
 %if "%{php_version}" > "7.2"
 Obsoletes:     php72u-%{pecl_name}      <= %{version}
+Obsoletes:     php72u-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php72w-%{pecl_name}      <= %{version}
+Obsoletes:     php72w-pecl-%{pecl_name} <= %{version}
 %endif
 %endif
 
+
 %if 0%{?fedora} < 20 && 0%{?rhel} < 7
 # Filter shared private
 %{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
@@ -78,7 +93,16 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 
 %prep
 %setup -qc
+%if 0%{?gh_date:1}
 mv %{gh_project}-%{gh_commit} NTS
+%else
+mv %{pecl_name}-%{version} NTS
+%endif
+
+# Don't install/register tests
+sed -e 's/role="test"/role="src"/' \
+    %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \
+    -i package.xml
 
 cd NTS
 # Sanity check, really often broken
@@ -128,12 +152,20 @@ make %{?_smp_mflags}
 make -C NTS install INSTALL_ROOT=%{buildroot}
 install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
 
+# Install XML package description
+install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
+
 %if %{with_zts}
 # Install the ZTS stuff
 make -C ZTS install INSTALL_ROOT=%{buildroot}
 install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
 %endif
 
+# Documentation
+for i in $(grep 'role="doc"' package.xml | sed -e 's/^.*name="//;s/".*$//')
+do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
+done
+
 
 %check
 cd NTS
@@ -167,7 +199,8 @@ REPORT_EXIT_STATUS=1 \
 
 %files
 %{?_licensedir:%license NTS/LICENSE}
-%doc NTS/README.md
+%{!?_licensedir:%doc %{pecl_docdir}/%{pecl_name}}
+%{pecl_xmldir}/%{name}.xml
 
 %config(noreplace) %{php_inidir}/%{ini_name}
 %{php_extdir}/%{pecl_name}.so
@@ -179,6 +212,13 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Wed Mar 14 2018 Remi Collet <remi@remirepo.net> - 2.1.3-1
+- update to 2.1.3
+- sources from pecl
+
+* Wed Mar  7 2018 Remi Collet <remi@remirepo.net> - 2.1.2-1
+- update to 2.1.2
+
 * Mon Mar  5 2018 Remi Collet <remi@remirepo.net> - 2.1.1-1
 - Update to 2.1.1