From 21671d5a64ed1bbc54f2450f7f14271b0fad8d7d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 17 Feb 2018 10:48:18 +0100 Subject: cleanup --- .gitignore | 9 ++ LICENSE | 68 -------------- REFLECTION | 2 +- REFLECTION-PHP7 | 62 ------------- php-pecl-xdiff-php7.spec | 228 ----------------------------------------------- php-pecl-xdiff.spec | 65 ++++++++------ 6 files changed, 47 insertions(+), 387 deletions(-) create mode 100644 .gitignore delete mode 100644 LICENSE delete mode 100644 REFLECTION-PHP7 delete mode 100644 php-pecl-xdiff-php7.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6f69818 --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +clog +package-*.xml +*.tgz +*.tar.gz +*.tar.bz2 +*.tar.xz +*.tar.xz.asc +*.src.rpm +*/*rpm diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 74c73f9..0000000 --- a/LICENSE +++ /dev/null @@ -1,68 +0,0 @@ --------------------------------------------------------------------- - The PHP License, version 3.01 -Copyright (c) 1999 - 2015 The PHP Group. All rights reserved. --------------------------------------------------------------------- - -Redistribution and use in source and binary forms, with or without -modification, is permitted provided that the following conditions -are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - - 3. The name "PHP" must not be used to endorse or promote products - derived from this software without prior written permission. For - written permission, please contact group@php.net. - - 4. Products derived from this software may not be called "PHP", nor - may "PHP" appear in their name, without prior written permission - from group@php.net. You may indicate that your software works in - conjunction with PHP by saying "Foo for PHP" instead of calling - it "PHP Foo" or "phpfoo" - - 5. The PHP Group may publish revised and/or new versions of the - license from time to time. Each version will be given a - distinguishing version number. - Once covered code has been published under a particular version - of the license, you may always continue to use it under the terms - of that version. You may also choose to use such covered code - under the terms of any subsequent version of the license - published by the PHP Group. No one other than the PHP Group has - the right to modify the terms applicable to covered code created - under this License. - - 6. Redistributions of any form whatsoever must retain the following - acknowledgment: - "This product includes PHP software, freely available from - ". - -THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND -ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PHP -DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -OF THE POSSIBILITY OF SUCH DAMAGE. - --------------------------------------------------------------------- - -This software consists of voluntary contributions made by many -individuals on behalf of the PHP Group. - -The PHP Group can be contacted via Email at group@php.net. - -For more information on the PHP Group and the PHP project, -please see . - -PHP includes the Zend Engine, freely available at -. diff --git a/REFLECTION b/REFLECTION index 7994a54..c015236 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,4 +1,4 @@ -Extension [ extension #70 xdiff version 1.5.2-beta ] { +Extension [ extension #133 xdiff version 2.0.1 ] { - Constants [3] { Constant [ integer XDIFF_PATCH_NORMAL ] { 45 } diff --git a/REFLECTION-PHP7 b/REFLECTION-PHP7 deleted file mode 100644 index c015236..0000000 --- a/REFLECTION-PHP7 +++ /dev/null @@ -1,62 +0,0 @@ -Extension [ extension #133 xdiff version 2.0.1 ] { - - - Constants [3] { - Constant [ integer XDIFF_PATCH_NORMAL ] { 45 } - Constant [ integer XDIFF_PATCH_REVERSE ] { 43 } - Constant [ integer XDIFF_PATCH_IGNORESPACE ] { 256 } - } - - - Functions { - Function [ function xdiff_file_diff ] { - } - Function [ function xdiff_file_bdiff ] { - } - Function [ function xdiff_file_patch ] { - } - Function [ function xdiff_file_bpatch ] { - } - Function [ function xdiff_file_merge3 ] { - } - Function [ function xdiff_file_rabdiff ] { - } - Function [ function xdiff_file_bdiff_size ] { - } - Function [ function xdiff_string_diff ] { - } - Function [ function xdiff_string_bdiff ] { - } - Function [ function xdiff_string_patch ] { - - - Parameters [4] { - Parameter #0 [ $param0 ] - Parameter #1 [ $param1 ] - Parameter #2 [ $param2 ] - Parameter #3 [ &$param3 ] - } - } - Function [ function xdiff_string_bpatch ] { - } - Function [ function xdiff_string_merge3 ] { - - - Parameters [4] { - Parameter #0 [ $param0 ] - Parameter #1 [ $param1 ] - Parameter #2 [ $param2 ] - Parameter #3 [ &$param3 ] - } - } - Function [ function xdiff_string_rabdiff ] { - } - Function [ function xdiff_string_bdiff_size ] { - } - Function [ function xdiff_file_diff_binary ] { - } - Function [ function xdiff_file_patch_binary ] { - } - Function [ function xdiff_string_diff_binary ] { - } - Function [ function xdiff_string_patch_binary ] { - } - } -} - diff --git a/php-pecl-xdiff-php7.spec b/php-pecl-xdiff-php7.spec deleted file mode 100644 index ff2ca26..0000000 --- a/php-pecl-xdiff-php7.spec +++ /dev/null @@ -1,228 +0,0 @@ -# remirepo spec file for php-pecl-xdiff -# -# Copyright (c) 2016-2017 Remi Collet -# License: CC-BY-SA -# http://creativecommons.org/licenses/by-sa/4.0/ -# -# Please, preserve the changelog entries -# -%if 0%{?scl:1} -%global sub_prefix %{scl_prefix} -%scl_package php-pecl-xdiff -%endif - -%global pecl_name xdiff -%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} -%global ini_name 40-%{pecl_name}.ini - -Name: %{?sub_prefix}php-pecl-%{pecl_name} -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} -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 - -BuildRequires: %{?scl_prefix}php-devel >= 7 -BuildRequires: %{?scl_prefix}php-pear - -Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} -Requires: %{?scl_prefix}php(api) = %{php_core_api} -%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}} - -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 -Obsoletes: php53-pecl-%{pecl_name} <= %{version} -Obsoletes: php53u-pecl-%{pecl_name} <= %{version} -Obsoletes: php54-pecl-%{pecl_name} <= %{version} -Obsoletes: php54w-pecl-%{pecl_name} <= %{version} -Obsoletes: php55u-pecl-%{pecl_name} <= %{version} -Obsoletes: php55w-pecl-%{pecl_name} <= %{version} -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 - -%if 0%{?fedora} < 20 && 0%{?rhel} < 7 -# Filter shared private -%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$} -%{?filter_setup} -%endif - - -%description -This extension creates and applies patches to both text and binary files. - -Documentation: http://php.net/xdiff - -Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl} by %{?scl_vendor}%{!?scl_vendor:rh})}. - - -%prep -%setup -q -c -a1 -mv %{pecl_name}-%{version} NTS - -# Bundles libxdiff -mv libxdiff-0.23/xdiff NTS/libxdiff -cp -p %{SOURCE2} NTS/config.m4 -cp -p libxdiff-0.23/COPYING libxdiff_COPYING - -# Don't install/register tests -sed -e 's/role="test"/role="src"/' \ - %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \ - -i package.xml - -# 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}"; then - : Error: Upstream extension version is ${extver}, expecting %{version}. - exit 1 -fi - -cat >%{ini_name} << 'EOF' -; Enable %{pecl_name} extension module -extension=%{pecl_name}.so -EOF - -%if %{with_zts} -# duplicate for ZTS build -cp -pr NTS ZTS -%endif - - -%build -cd NTS -%{_bindir}/phpize -%configure --with-php-config=%{_bindir}/php-config -make %{?_smp_mflags} - -%if %{with_zts} -cd ../ZTS -%{_bindir}/zts-phpize -%configure --with-php-config=%{_bindir}/zts-php-config -make %{?_smp_mflags} -%endif - - -%install -make install -C NTS INSTALL_ROOT=%{buildroot} - -# Drop in the bit of configuration -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} -make install -C ZTS INSTALL_ROOT=%{buildroot} -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 $(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 -# when pear installed alone, after us -%triggerin -- %{?scl_prefix}php-pear -if [ -x %{__pecl} ] ; then - %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : -fi - -# posttrans as pear can be installed after us -%posttrans -if [ -x %{__pecl} ] ; then - %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : -fi - -%postun -if [ $1 -eq 0 -a -x %{__pecl} ] ; then - %{pecl_uninstall} %{pecl_name} >/dev/null || : -fi -%endif - - -%check -: Minimal load test for NTS extension -%{__php} -n \ - -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \ - --modules | grep %{pecl_name} - -: Upstream test suite for NTS extension -cd NTS -TEST_PHP_EXECUTABLE=%{_bindir}/php \ -TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ -NO_INTERACTION=1 \ -REPORT_EXIT_STATUS=1 \ -%{__php} -n run-tests.php - -%if %{with_zts} -: Minimal load test for ZTS extension -%{__ztsphp} -n \ - -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \ - --modules | grep %{pecl_name} - -: Upstream test suite for ZTS extension -cd ../NTS -TEST_PHP_EXECUTABLE=%{_bindir}/php \ -TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \ -NO_INTERACTION=1 \ -REPORT_EXIT_STATUS=1 \ -%{__ztsphp} -n run-tests.php - -%endif - - -%files -%{?_licensedir:%license NTS/LICENSE} -%{?_licensedir:%license libxdiff_COPYING} -%doc %{pecl_docdir}/%{pecl_name} -%{pecl_xmldir}/%{name}.xml - -%config(noreplace) %{php_inidir}/%{ini_name} -%{php_extdir}/%{pecl_name}.so - -%if %{with_zts} -%config(noreplace) %{php_ztsinidir}/%{ini_name} -%{php_ztsextdir}/%{pecl_name}.so -%endif - - -%changelog -* Tue Jul 18 2017 Remi Collet - 2.0.1-3 -- rebuild for PHP 7.2.0beta1 new API - -* Thu Dec 1 2016 Remi Collet - 2.0.1-2 -- rebuild with PHP 7.1.0 GA - -* Wed Oct 12 2016 Remi Collet - 2.0.1-1 -- initial package, version 2.0.2 with bundled libxdiff 0.23 - 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 - 1.5.2-1 -- initial package, version 1.5.2 (beta) with bundled libxdiff 0.23 +* Tue Jul 18 2017 Remi Collet - 2.0.1-3 +- rebuild for PHP 7.2.0beta1 new API + +* Thu Dec 1 2016 Remi Collet - 2.0.1-2 +- rebuild with PHP 7.1.0 GA + +* Wed Oct 12 2016 Remi Collet - 2.0.1-1 +- initial package, version 2.0.2 with bundled libxdiff 0.23 -- cgit