cleanup

1 files changed, 37 insertions, 28 deletions

diff --git a/php-pecl-xdiff.spec b/php-pecl-xdiff.spec
index 52d5869..060dbf4 100644
--- a/php-pecl-xdiff.spec
+++ b/php-pecl-xdiff.spec
@@ -1,11 +1,15 @@
 # remirepo spec file for php-pecl-xdiff
 #
-# Copyright (c) 2016-2017 Remi Collet
+# Copyright (c) 2016-2012 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
+
+# we don't want -z defs linker flag
+%undefine _strict_symbol_defs_build
+
 %if 0%{?scl:1}
 %global sub_prefix %{scl_prefix}
 %scl_package       php-pecl-xdiff
@@ -16,10 +20,9 @@
 %global ini_name    40-%{pecl_name}.ini
 
 Name:           %{?sub_prefix}php-pecl-%{pecl_name}
-Version:        1.5.2
-Release:        1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Version:        2.0.1
+Release:        3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 Summary:        File differences/patches
-Group:          Development/Languages
 # libxdiff is LGPLv2+, xdiff extension is PHP
 License:        PHP and LGPLv2+
 URL:            http://pecl.php.net/package/%{pecl_name}
@@ -27,11 +30,8 @@ Source0:        http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 # bundles the lib, as libxdiff from spot is not compatible
 Source1:        http://www.xmailserver.org/libxdiff-0.23.tar.gz
 Source2:        config.m4
-# http://git.php.net/?p=pecl/text/xdiff.git;a=blob_plain;f=LICENSE;hb=HEAD
-Source3:        LICENSE
 
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires:  %{?scl_prefix}php-devel
+BuildRequires:  %{?scl_prefix}php-devel >= 7
 BuildRequires:  %{?scl_prefix}php-pear
 
 Requires:       %{?scl_prefix}php(zend-abi) = %{php_zend_api}
@@ -53,13 +53,19 @@ Obsoletes:     php53-pecl-%{pecl_name}  <= %{version}
 Obsoletes:     php53u-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php54-pecl-%{pecl_name}  <= %{version}
 Obsoletes:     php54w-pecl-%{pecl_name} <= %{version}
-%if "%{php_version}" > "5.5"
 Obsoletes:     php55u-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php55w-pecl-%{pecl_name} <= %{version}
-%endif
-%if "%{php_version}" > "5.6"
 Obsoletes:     php56u-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php56w-pecl-%{pecl_name} <= %{version}
+Obsoletes:     php70u-pecl-%{pecl_name} <= %{version}
+Obsoletes:     php70w-pecl-%{pecl_name} <= %{version}
+%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
 
@@ -82,13 +88,10 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 %setup -q -c -a1
 mv %{pecl_name}-%{version} NTS
 
-# Missing in old version
-cp -p %{SOURCE3} NTS/LICENSE
-
 # Bundles libxdiff
 mv libxdiff-0.23/xdiff NTS/libxdiff
 cp -p %{SOURCE2} NTS/config.m4
-cp -p libxdiff-0.23/COPYING NTS/libxdiff_COPYING
+cp -p libxdiff-0.23/COPYING libxdiff_COPYING
 
 # Don't install/register tests
 sed -e 's/role="test"/role="src"/' \
@@ -97,8 +100,8 @@ sed -e 's/role="test"/role="src"/' \
 
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_XDIFF_VERSION/{s/.* "//;s/".*$//;p}' NTS/php_xdiff.h)
-if test "x${extver}" != "x%{version}-beta"; then
-   : Error: Upstream extension version is ${extver}, expecting %{version}-beta.
+if test "x${extver}" != "x%{version}"; then
+   : Error: Upstream extension version is ${extver}, expecting %{version}.
    exit 1
 fi
 
@@ -114,6 +117,8 @@ cp -pr NTS ZTS
 
 
 %build
+%{?dtsenable}
+
 cd NTS
 %{_bindir}/phpize
 %configure --with-php-config=%{_bindir}/php-config
@@ -128,7 +133,7 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf %{buildroot}
+%{?dtsenable}
 
 make install -C NTS INSTALL_ROOT=%{buildroot}
 
@@ -144,13 +149,15 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
 %endif
 
 # Documentation
+i=libxdiff_COPYING
+%{!?_licensedir:install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i}
 cd NTS
-for i in %{!?_licensedir:libxdiff_COPYING LICENSE} $(grep 'role="doc"' ../package.xml | sed -e 's/^.*name="//;s/".*$//')
+for i in $(grep 'role="doc"' ../package.xml | sed -e 's/^.*name="//;s/".*$//')
 do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
 done
 
 
-%if 0%{?fedora} < 24
+%if 0%{?fedora} < 24 && 0%{?rhel} < 8
 # when pear installed alone, after us
 %triggerin -- %{?scl_prefix}php-pear
 if [ -x %{__pecl} ] ; then
@@ -201,13 +208,9 @@ REPORT_EXIT_STATUS=1 \
 %endif
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %files
-%defattr(-,root,root,-)
-%{?_licensedir:%license NTS/LICENSE NTS/libxdiff_COPYING}
+%{?_licensedir:%license NTS/LICENSE}
+%{?_licensedir:%license libxdiff_COPYING}
 %doc %{pecl_docdir}/%{pecl_name}
 %{pecl_xmldir}/%{name}.xml
 
@@ -221,6 +224,12 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Wed Oct 12 2016 Remi Collet <remi@fedoraproject.org> - 1.5.2-1
-- initial package, version 1.5.2 (beta) with bundled libxdiff 0.23
+* Tue Jul 18 2017 Remi Collet <remi@remirepo.net> - 2.0.1-3
+- rebuild for PHP 7.2.0beta1 new API
+
+* Thu Dec  1 2016 Remi Collet <remi@fedoraproject.org> - 2.0.1-2
+- rebuild with PHP 7.1.0 GA
+
+* Wed Oct 12 2016 Remi Collet <remi@fedoraproject.org> - 2.0.1-1
+- initial package, version 2.0.2 with bundled libxdiff 0.23