switch

1 files changed, 33 insertions, 34 deletions

diff --git a/php-pecl-lua.spec b/php-pecl-lua.spec
index ec76dfc..e37c29a 100644
--- a/php-pecl-lua.spec
+++ b/php-pecl-lua.spec
@@ -7,42 +7,29 @@
 # Please, preserve the changelog entries
 #
 %if 0%{?scl:1}
-%if "%{scl}" == "rh-php56"
-%global sub_prefix more-php56-
-%else
 %global sub_prefix %{scl_prefix}
-%endif
 %scl_package         php-pecl-lua
 %else
 %global _root_prefix %{_prefix}
 %endif
-%global with_zts   0%{?__ztsphp:1}
+%global with_zts   0%{!?_without_zts:%{?__ztsphp:1}}
 %global pecl_name  lua
-%if "%{php_version}" < "5.6"
-%global ini_name   %{pecl_name}.ini
-%else
 %global ini_name   40-%{pecl_name}.ini
-%endif
 
 Summary:        Embedded lua interpreter
 Name:           %{?sub_prefix}php-pecl-%{pecl_name}
-Version:        1.1.0
-Release:        6%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Version:        2.0.3
+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
 
-# https://bugs.php.net/62621 config.m4
-# https://bugs.php.net/65953 LUA 5.1
-# https://github.com/laruence/php-lua/pull/6
-# https://github.com/laruence/php-lua/pull/7
-Patch0:         %{pecl_name}-build.patch
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  lua-devel
-BuildRequires:  %{?scl_prefix}php-devel
+BuildRequires:  %{?scl_prefix}php-devel > 7
 BuildRequires:  %{?scl_prefix}php-pear
+# For tests
+BuildRequires:  %{?scl_prefix}php-json
 
 Requires:       %{?scl_prefix}php(zend-abi) = %{php_zend_api}
 Requires:       %{?scl_prefix}php(api) = %{php_core_api}
@@ -63,13 +50,15 @@ Obsoletes:     php53-pecl-%{pecl_name}
 Obsoletes:     php53u-pecl-%{pecl_name}
 Obsoletes:     php54-pecl-%{pecl_name}
 Obsoletes:     php54w-pecl-%{pecl_name}
-%if "%{php_version}" > "5.5"
 Obsoletes:     php55u-pecl-%{pecl_name}
 Obsoletes:     php55w-pecl-%{pecl_name}
-%endif
-%if "%{php_version}" > "5.6"
 Obsoletes:     php56u-pecl-%{pecl_name}
 Obsoletes:     php56w-pecl-%{pecl_name}
+Obsoletes:     php70u-pecl-%{pecl_name}
+Obsoletes:     php70w-pecl-%{pecl_name}
+%if "%{php_version}" > "7.1"
+Obsoletes:     php71u-pecl-%{pecl_name}
+Obsoletes:     php71w-pecl-%{pecl_name}
 %endif
 %endif
 
@@ -94,15 +83,12 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 
 # Don't install/register tests
 sed -e 's/role="test"/role="src"/' \
-    -e '/CREDITS/s/role="src"/role="doc"/' \
-    -e '/LICENSE/s/role="src"/role="doc"/' \
     %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \
-    package2.xml >package.xml
+    -i package.xml
 
 mv %{pecl_name}-%{version} NTS
 
 cd NTS
-%patch0 -p1 -b .fixbuild
 
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_LUA_VERSION/{s/.* "//;s/".*$//;p}' php_lua.h)
@@ -125,6 +111,8 @@ EOF
 
 
 %build
+%{?dtsenable}
+
 cd NTS
 %{_bindir}/phpize
 %configure \
@@ -145,7 +133,7 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf %{buildroot}
+%{?dtsenable}
 
 make -C NTS \
      install INSTALL_ROOT=%{buildroot}
@@ -201,7 +189,7 @@ cd NTS
 
 # Upstream test suite  for NTS extension
 TEST_PHP_EXECUTABLE=%{__php} \
-TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{pecl_name}.so" \
+TEST_PHP_ARGS="-n -d extension=json.so -d extension=%{buildroot}/%{php_extdir}/%{pecl_name}.so" \
 NO_INTERACTION=1 \
 REPORT_EXIT_STATUS=1 \
 %{__php} -n run-tests.php
@@ -215,22 +203,18 @@ cd ../ZTS
 
 # Upstream test suite  for ZTS extension
 TEST_PHP_EXECUTABLE=%{__ztsphp} \
-TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{pecl_name}.so" \
+TEST_PHP_ARGS="-n -d extension=json.so -d extension=%{buildroot}/%{php_ztsextdir}/%{pecl_name}.so" \
 NO_INTERACTION=1 \
 REPORT_EXIT_STATUS=1 \
 %{__ztsphp} -n run-tests.php
 %endif
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %files
-%defattr(-,root,root,-)
 %{?_licensedir:%license NTS/LICENSE}
 %doc %{pecl_docdir}/%{pecl_name}
 %{pecl_xmldir}/%{name}.xml
+
 %config(noreplace) %{php_inidir}/%{ini_name}
 %{php_extdir}/%{pecl_name}.so
 
@@ -241,6 +225,21 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Feb 10 2017 Remi Collet <remi@fedoraproject.org> - 2.0.3-1
+- update to 2.0.3 (php 7, stable)
+
+* Thu Dec  1 2016 Remi Collet <remi@fedoraproject.org> - 2.0.2-3
+- rebuild with PHP 7.1.0 GA
+
+* Wed Sep 14 2016 Remi Collet <remi@fedoraproject.org> - 2.0.2-2
+- rebuild for PHP 7.1 new API version
+
+* Thu May 26 2016 Remi Collet <remi@fedoraproject.org> - 2.0.2-1
+- update to 2.0.2 for PHP 7
+
+* Tue Apr 12 2016 Remi Collet <remi@fedoraproject.org> - 2.0.1-1
+- update to 2.0.1 for PHP 7
+
 * Tue Mar  8 2016 Remi Collet <remi@fedoraproject.org> - 1.1.0-6
 - adapt for F24
 - drop runtime dependency on pear, new scriptlets