v1.4.0HEADmaster

3 files changed, 38 insertions, 16 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1ab5c4f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+package-*.xml
+*.tgz
+*.tar.gz
+*.tar.xz
+*.tar.xz.asc
+*.src.rpm
+*/*rpm
diff --git a/REFLECTION b/REFLECTION
index 256ed5a..2c6269c 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,6 +1,8 @@
-Extension [ <persistent> extension #97 jsond version 1.3.0 ] {
+Extension [ <persistent> extension #100 jsond version 1.4.0 ] {
 
-  - Constants [22] {
+  - Constants [24] {
+    Constant [ integer JSOND_OBJECT_AS_ARRAY ] { 1 }
+    Constant [ integer JSOND_BIGINT_AS_STRING ] { 2 }
     Constant [ integer JSOND_HEX_TAG ] { 1 }
     Constant [ integer JSOND_HEX_AMP ] { 2 }
     Constant [ integer JSOND_HEX_APOS ] { 4 }
@@ -11,18 +13,18 @@ Extension [ <persistent> extension #97 jsond version 1.3.0 ] {
     Constant [ integer JSOND_PRETTY_PRINT ] { 128 }
     Constant [ integer JSOND_UNESCAPED_UNICODE ] { 256 }
     Constant [ integer JSOND_PARTIAL_OUTPUT_ON_ERROR ] { 512 }
+    Constant [ integer JSOND_PRESERVE_ZERO_FRACTION ] { 1024 }
     Constant [ integer JSOND_ERROR_NONE ] { 0 }
     Constant [ integer JSOND_ERROR_DEPTH ] { 1 }
     Constant [ integer JSOND_ERROR_STATE_MISMATCH ] { 2 }
     Constant [ integer JSOND_ERROR_CTRL_CHAR ] { 3 }
     Constant [ integer JSOND_ERROR_SYNTAX ] { 4 }
     Constant [ integer JSOND_ERROR_UTF8 ] { 5 }
-    Constant [ integer JSOND_ERROR_UTF16 ] { 9 }
     Constant [ integer JSOND_ERROR_RECURSION ] { 6 }
     Constant [ integer JSOND_ERROR_INF_OR_NAN ] { 7 }
     Constant [ integer JSOND_ERROR_UNSUPPORTED_TYPE ] { 8 }
-    Constant [ integer JSOND_OBJECT_AS_ARRAY ] { 1 }
-    Constant [ integer JSOND_BIGINT_AS_STRING ] { 2 }
+    Constant [ integer JSOND_ERROR_INVALID_PROPERTY_NAME ] { 9 }
+    Constant [ integer JSOND_ERROR_UTF16 ] { 10 }
   }
 
   - Functions {
diff --git a/php-pecl-jsond.spec b/php-pecl-jsond.spec
index 375f8b1..e91ce5c 100644
--- a/php-pecl-jsond.spec
+++ b/php-pecl-jsond.spec
@@ -9,7 +9,7 @@
 %{?scl:          %scl_package        php-pecl-jsond}
 
 %global pecl_name  jsond
-%global with_zts   0%{?__ztsphp:1}
+%global with_zts   0%{!?_without_zts:%{?__ztsphp:1}}
 %if "%{php_version}" < "5.6"
 %global ini_name   %{pecl_name}.ini
 %else
@@ -18,15 +18,14 @@
 
 Summary:        JavaScript Object Notation
 Name:           %{?scl_prefix}php-pecl-%{pecl_name}
-Version:        1.3.0
-Release:        5%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Version:        1.4.0
+Release:        1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 License:        PHP
 Group:          Development/Languages
 URL:            http://pecl.php.net/package/%{pecl_name}
 Source0:        http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  %{?scl_prefix}php-devel > 5.2
+BuildRequires:  %{?scl_prefix}php-devel > 5.3.3
 BuildRequires:  %{?scl_prefix}php-pear
 
 Requires:       %{?scl_prefix}php(zend-abi) = %{php_zend_api}
@@ -37,8 +36,10 @@ Provides:       %{?scl_prefix}php-%{pecl_name}               = %{version}
 Provides:       %{?scl_prefix}php-%{pecl_name}%{?_isa}       = %{version}
 Provides:       %{?scl_prefix}php-pecl(%{pecl_name})         = %{version}
 Provides:       %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
+%if "%{?scl_prefix}" != "%{?sub_prefix}"
 Provides:       %{?scl_prefix}php-pecl-%{pecl_name}          = %{version}-%{release}
 Provides:       %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{release}
+%endif
 
 %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
 # Other third party repo stuff
@@ -54,6 +55,18 @@ Obsoletes:     php55w-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php56u-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php56w-pecl-%{pecl_name} <= %{version}
 %endif
+%if "%{php_version}" > "7.0"
+Obsoletes:     php70u-pecl-%{pecl_name} <= %{version}
+Obsoletes:     php70w-pecl-%{pecl_name} <= %{version}
+%endif
+%if "%{php_version}" > "7.1"
+Obsoletes:     php71u-pecl-%{pecl_name} <= %{version}
+Obsoletes:     php71w-pecl-%{pecl_name} <= %{version}
+%endif
+%if "%{php_version}" > "7.2"
+Obsoletes:     php72u-pecl-%{pecl_name} <= %{version}
+Obsoletes:     php72w-pecl-%{pecl_name} <= %{version}
+%endif
 %endif
 
 %if 0%{?fedora} < 20 && 0%{?rhel} < 7
@@ -107,6 +120,8 @@ EOF
 
 
 %build
+%{?dtsenable}
+
 cd NTS
 %{_bindir}/phpize
 %configure \
@@ -123,7 +138,7 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf %{buildroot}
+%{?dtsenable}
 
 make -C NTS \
      install INSTALL_ROOT=%{buildroot}
@@ -200,12 +215,7 @@ REPORT_EXIT_STATUS=1 \
 %endif
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %files
-%defattr(-,root,root,-)
 %{?_licensedir:%license NTS/LICENSE}
 %doc %{pecl_docdir}/%{pecl_name}
 %{pecl_xmldir}/%{name}.xml
@@ -230,6 +240,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Aug 19 2017 Remi Collet <remi@remirepo.net> - 1.4.0-1
+- Update to 1.4.0
+
 * Tue Mar  8 2016 Remi Collet <remi@fedoraproject.org> - 1.3.0-5
 - adapt for F24
 - fix license management