php-pecl-igbinary: switch the spec

4 files changed, 70 insertions, 451 deletions

diff --git a/REFLECTION b/REFLECTION
index e66249c..4e6ea52 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #93 igbinary version 1.2.1 ] {
+Extension [ <persistent> extension #93 igbinary version 1.2.2-dev ] {
 
   - Dependencies {
     Dependency [ standard (Required) ]
diff --git a/REFLECTION-PHP7 b/REFLECTION-PHP7
deleted file mode 100644
index 4e6ea52..0000000
--- a/REFLECTION-PHP7
+++ /dev/null
@@ -1,30 +0,0 @@
-Extension [ <persistent> extension #93 igbinary version 1.2.2-dev ] {
-
-  - Dependencies {
-    Dependency [ standard (Required) ]
-    Dependency [ session (Required) ]
-    Dependency [ apcu (Optional) ]
-  }
-
-  - INI {
-    Entry [ igbinary.compact_strings <ALL> ]
-      Current = '1'
-    }
-  }
-
-  - Functions {
-    Function [ <internal:igbinary> function igbinary_serialize ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <required> $value ]
-      }
-    }
-    Function [ <internal:igbinary> function igbinary_unserialize ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <required> $str ]
-      }
-    }
-  }
-}
-
diff --git a/php-pecl-igbinary-dev.spec b/php-pecl-igbinary-dev.spec
deleted file mode 100644
index f9767ff..0000000
--- a/php-pecl-igbinary-dev.spec
+++ /dev/null
@@ -1,393 +0,0 @@
-# remirepo spec file for php-pecl-igbinary
-# with SCL compatibility, from:
-#
-# Fedora spec file for php-pecl-igbinary
-#
-# Copyright (c) 2010-2016 Remi Collet
-# License: CC-BY-SA
-# http://creativecommons.org/licenses/by-sa/4.0/
-#
-# 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-igbinary
-%endif
-
-%global extname    igbinary
-%global with_zts   0%{!?_without_zts:%{?__ztsphp:1}}
-%global gh_commit  6a2d5b7ea71489c4d7065dc7746d37cfa80d501c
-%global gh_short   %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_date    20161018
-%global prever    -dev
-%if "%{php_version}" < "5.6"
-%global ini_name  %{extname}.ini
-%else
-%global ini_name  40-%{extname}.ini
-%endif
-
-Summary:        Replacement for the standard PHP serializer
-Name:           %{?sub_prefix}php-pecl-igbinary
-Version:        1.2.2
-%if 0%{?gh_date}
-Release:        0.6.%{gh_date}git%{gh_short}%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
-Source0:        https://github.com/%{extname}/%{extname}/archive/%{gh_commit}/%{extname}-%{version}-%{gh_short}.tar.gz
-%else
-Release:        3%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
-Source0:        http://pecl.php.net/get/%{extname}-%{version}.tgz
-%endif
-License:        BSD
-Group:          System Environment/Libraries
-
-URL:            http://pecl.php.net/package/igbinary
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  %{?scl_prefix}php-pear
-BuildRequires:  %{?scl_prefix}php-devel >= 5.2.0
-BuildRequires:  %{?sub_prefix}php-pecl-apcu-devel
-
-Requires:       %{?scl_prefix}php(zend-abi) = %{php_zend_api}
-Requires:       %{?scl_prefix}php(api) = %{php_core_api}
-%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
-
-Obsoletes:      %{?scl_prefix}php-%{extname}                <= 1.1.1
-Provides:       %{?scl_prefix}php-%{extname}                = %{version}
-Provides:       %{?scl_prefix}php-%{extname}%{?_isa}        = %{version}
-Provides:       %{?scl_prefix}php-pecl(%{extname})          = %{version}
-Provides:       %{?scl_prefix}php-pecl(%{extname})%{?_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}
-# Other third party repo stuff
-Obsoletes:     php53-pecl-%{extname}
-Obsoletes:     php53u-pecl-%{extname}
-Obsoletes:     php54-pecl-%{extname}
-Obsoletes:     php54w-pecl-%{extname}
-%if "%{php_version}" > "5.5"
-Obsoletes:     php55u-pecl-%{extname}
-Obsoletes:     php55w-pecl-%{extname}
-%endif
-%if "%{php_version}" > "5.6"
-Obsoletes:     php56u-pecl-%{extname}
-Obsoletes:     php56w-pecl-%{extname}
-%endif
-%if "%{php_version}" > "7.0"
-Obsoletes:     php70u-pecl-%{extname}
-Obsoletes:     php70w-pecl-%{extname}
-%endif
-%if "%{php_version}" > "7.1"
-Obsoletes:     php71u-pecl-%{extname}
-Obsoletes:     php71w-pecl-%{extname}
-%endif
-%endif
-
-%if 0%{?fedora} < 20 && 0%{?rhel} < 7
-# Filter shared private
-%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
-%{?filter_setup}
-%endif
-
-
-%description
-Igbinary is a drop in replacement for the standard PHP serializer.
-
-Instead of time and space consuming textual representation, 
-igbinary stores PHP data structures in a compact binary form. 
-Savings are significant when using memcached or similar memory
-based storages for serialized data.
-
-
-%package devel
-Summary:       Igbinary developer files (header)
-Group:         Development/Libraries
-Requires:      %{name}%{?_isa} = %{version}-%{release}
-Requires:      %{?scl_prefix}php-devel%{?_isa}
-
-Obsoletes:     %{?scl_prefix}php-%{extname}-devel         <= 1.1.1
-Provides:      %{?scl_prefix}php-%{extname}-devel         = %{version}-%{release}
-Provides:      %{?scl_prefix}php-%{extname}-devel%{?_isa} = %{version}-%{release}
-
-%description devel
-These are the files needed to compile programs using Igbinary
-
-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
-
-%if 0%{?gh_date}
-mv igbinary-%{gh_commit} NTS
-%{__php} -r '
-  $pkg = simplexml_load_file("NTS/package.xml");
-  $pkg->date = substr("%{gh_date}",0,4)."-".substr("%{gh_date}",4,2)."-".substr("%{gh_date}",6,2);
-  $pkg->version->release = "%{version}dev";
-  $pkg->stability->release = "devel";
-  $pkg->asXML("package.xml");
-'
-%else
-mv %{extname}-%{version} NTS
-%endif
-
-%{?_licensedir:sed -e '/COPYING/s/role="doc"/role="src"/' -i package.xml}
-
-cd NTS
-
-# Check version
-subdir="php$(%{__php} -r 'echo PHP_MAJOR_VERSION;')"
-extver=$(sed -n '/#define PHP_IGBINARY_VERSION/{s/.* "//;s/".*$//;p}' src/$subdir/igbinary.h)
-if test "x${extver}" != "x%{version}%{?prever}"; then
-   : Error: Upstream version is ${extver}, expecting %{version}%{?prever}.
-   exit 1
-fi
-cd ..
-
-%if %{with_zts}
-cp -r NTS ZTS
-%endif
-
-cat <<EOF | tee %{ini_name}
-; Enable %{extname} extension module
-extension=%{extname}.so
-
-; Enable or disable compacting of duplicate strings
-; The default is On.
-;igbinary.compact_strings=On
-
-; Use igbinary as session serializer
-;session.serialize_handler=igbinary
-
-; Use igbinary as APC serializer
-;apc.serializer=igbinary
-EOF
-
-
-%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
-rm -rf %{buildroot}
-
-make install -C NTS INSTALL_ROOT=%{buildroot}
-
-install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
-
-install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
-
-# Install the ZTS stuff
-%if %{with_zts}
-make install -C ZTS INSTALL_ROOT=%{buildroot}
-install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
-%endif
-
-# Test & Documentation
-cd NTS
-for i in $(grep 'role="test"' ../package.xml | sed -e 's/^.*name="//;s/".*$//')
-do [ -f $i       ] && install -Dpm 644 $i       %{buildroot}%{pecl_testdir}/%{extname}/$i
-   [ -f tests/$i ] && install -Dpm 644 tests/$i %{buildroot}%{pecl_testdir}/%{extname}/tests/$i
-done
-for i in $(grep 'role="doc"' ../package.xml | sed -e 's/^.*name="//;s/".*$//')
-do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{extname}/$i
-done
-
-
-%check
-MOD=""
-%if "%{php_version}" > "7.0"
-# See https://github.com/igbinary/igbinary7/issues/24
-rm */tests/igbinary_040.phpt
-%endif
-
-# APC required for test 045
-if [ -f %{php_extdir}/apcu.so ]; then
-  MOD="-d extension=apcu.so"
-fi
-if [ -f %{php_extdir}/apc.so ]; then
-  MOD="$MOD -d extension=apc.so"
-fi
-
-: simple NTS module load test, without APC, as optional
-%{_bindir}/php --no-php-ini \
-    --define extension=%{buildroot}%{php_extdir}/%{extname}.so \
-    --modules | grep %{extname}
-
-: upstream test suite
-cd NTS
-TEST_PHP_EXECUTABLE=%{_bindir}/php \
-TEST_PHP_ARGS="-n $MOD -d extension=$PWD/modules/%{extname}.so" \
-NO_INTERACTION=1 \
-REPORT_EXIT_STATUS=1 \
-%{_bindir}/php -n run-tests.php --show-diff
-
-%if %{with_zts}
-: simple ZTS module load test, without APC, as optional
-%{__ztsphp} --no-php-ini \
-    --define extension=%{buildroot}%{php_ztsextdir}/%{extname}.so \
-    --modules | grep %{extname}
-
-: upstream test suite
-cd ../ZTS
-TEST_PHP_EXECUTABLE=%{__ztsphp} \
-TEST_PHP_ARGS="-n $MOD -d extension=$PWD/modules/%{extname}.so" \
-NO_INTERACTION=1 \
-REPORT_EXIT_STATUS=1 \
-%{__ztsphp} -n run-tests.php --show-diff
-%endif
-
-
-%clean
-rm -rf %{buildroot}
-
-
-%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} %{extname} >/dev/null || :
-fi
-%endif
-
-
-%files
-%defattr(-,root,root,-)
-%{?_licensedir:%license NTS/COPYING}
-%doc %{pecl_docdir}/%{extname}
-%config(noreplace) %{php_inidir}/%{ini_name}
-
-%{php_extdir}/%{extname}.so
-%{pecl_xmldir}/%{name}.xml
-
-%if %{with_zts}
-%config(noreplace) %{php_ztsinidir}/%{ini_name}
-%{php_ztsextdir}/%{extname}.so
-%endif
-
-
-%files devel
-%defattr(-,root,root,-)
-%doc %{pecl_testdir}/%{extname}
-%{php_incldir}/ext/%{extname}
-
-%if %{with_zts}
-%{php_ztsincldir}/ext/%{extname}
-%endif
-
-
-%changelog
-* Tue Oct 18 2016 Remi Collet <remi@fedoraproject.org> - 1.2.2-0.6.20161018git6a2d5b7
-- refresh with sources from igbinary instead of old closed repo igbinary7
-
-* Wed Sep 14 2016 Remi Collet <remi@fedoraproject.org> - 1.2.2-0.5.20160724git332a3d7
-- rebuild for PHP 7.1 new API version
-
-* Mon Jul 25 2016 Remi Collet <remi@fedoraproject.org> - 1.2.2-0.4.20160724git332a3d7
-- refresh
-
-* Sat Jul 23 2016 Remi Collet <remi@fedoraproject.org> - 1.2.2-0.3.20160715gita87a993
-- ignore 1 test with 7.1
-
-* Mon Jul 18 2016 Remi Collet <remi@fedoraproject.org> - 1.2.2-0.2.20160715gita87a993
-- refresh, newer snapshot
-
-* Wed Mar  2 2016 Remi Collet <remi@fedoraproject.org> - 1.2.2-0.1.20151217git2b7c703
-- update to 1.2.2dev for PHP 7
-- ignore test results, 4 failed tests: igbinary_009.phpt, igbinary_014.phpt
-  igbinary_026.phpt and igbinary_unserialize_v1_compatible.phpt
-- session support not yet available
-
-* Fri Jun 19 2015 Remi Collet <remi@fedoraproject.org> - 1.2.1-2
-- allow build against rh-php56 (as more-php56)
-- drop runtime dependency on pear, new scriptlets
-
-* Wed Dec 24 2014 Remi Collet <remi@fedoraproject.org> - 1.2.1-1.1
-- Fedora 21 SCL mass rebuild
-
-* Fri Aug 29 2014 Remi Collet <remi@fedoraproject.org> - 1.2.1-1
-- Update to 1.2.1
-
-* Thu Aug 28 2014 Remi Collet <remi@fedoraproject.org> - 1.2.0-1
-- update to 1.2.0
-- open https://github.com/igbinary/igbinary/pull/36
-
-* Sun Aug 24 2014 Remi Collet <remi@fedoraproject.org> - 1.1.2-0.11.git3b8ab7e
-- improve SCL stuff
-
-* Wed Apr  9 2014 Remi Collet <remi@fedoraproject.org> - 1.1.2-0.10.git3b8ab7e
-- add numerical prefix to extension configuration file
-
-* Wed Mar 19 2014 Remi Collet <rcollet@redhat.com> - 1.1.2-0.9.git3b8ab7e
-- fix SCL dependencies
-
-* Fri Feb 28 2014 Remi Collet <remi@fedoraproject.org> - 1.1.2-0.8.git3b8ab7e
-- cleanups
-- move doc in pecl_docdir
-- move tests in pecl_testdir (devel)
-
-* Sat Jul 27 2013 Remi Collet <remi@fedoraproject.org> - 1.1.2-0.6.git3b8ab7e
-- latest snapshot
-- fix build with APCu
-
-* Fri Nov 30 2012 Remi Collet <remi@fedoraproject.org> - 1.1.2-0.3.git3b8ab7e
-- cleanups
-
-* Sat Mar 03 2012 Remi Collet <remi@fedoraproject.org> - 1.1.2-0.2.git3b8ab7e
-- macro usage for latest PHP
-
-* Mon Nov 14 2011 Remi Collet <remi@fedoraproject.org> - 1.1.2-0.1.git3b8ab7e
-- latest git against php 5.4
-- partial patch for https://bugs.php.net/60298
-- ignore test result because of above bug
-
-* Sat Sep 17 2011 Remi Collet <rpms@famillecollet.com> 1.1.1-2
-- use latest macro
-- build zts extension
-
-* Mon Mar 14 2011 Remi Collet <rpms@famillecollet.com> 1.1.1-1
-- version 1.1.1 published on pecl.php.net
-- rename to php-pecl-igbinary
-
-* Mon Jan 17 2011 Remi Collet <rpms@famillecollet.com> 1.1.1-2
-- allow relocation using phpname macro
-
-* Mon Jan 17 2011 Remi Collet <rpms@famillecollet.com> 1.1.1-1
-- update to 1.1.1
-
-* Fri Dec 31 2010 Remi Collet <rpms@famillecollet.com> 1.0.2-3
-- updated tests from Git.
-
-* Sat Oct 23 2010 Remi Collet <rpms@famillecollet.com> 1.0.2-2
-- filter provides to avoid igbinary.so
-- add missing %%dist
-
-* Wed Sep 29 2010 Remi Collet <rpms@famillecollet.com> 1.0.2-1
-- initital RPM
-
diff --git a/php-pecl-igbinary.spec b/php-pecl-igbinary.spec
index 39d3485..f9767ff 100644
--- a/php-pecl-igbinary.spec
+++ b/php-pecl-igbinary.spec
@@ -15,15 +15,15 @@
 %else
 %global sub_prefix %{scl_prefix}
 %endif
+%scl_package        php-pecl-igbinary
 %endif
 
-%{?scl:          %scl_package        php-pecl-igbinary}
-
-%global extname   igbinary
-%global with_zts  0%{?__ztsphp:1}
-#global commit    c35d48f3d14794373b2ef89a6d79020bb7418d7f
-#global short     %%(c=%%{commit}; echo ${c:0:7})
-#global prever    -dev
+%global extname    igbinary
+%global with_zts   0%{!?_without_zts:%{?__ztsphp:1}}
+%global gh_commit  6a2d5b7ea71489c4d7065dc7746d37cfa80d501c
+%global gh_short   %(c=%{gh_commit}; echo ${c:0:7})
+%global gh_date    20161018
+%global prever    -dev
 %if "%{php_version}" < "5.6"
 %global ini_name  %{extname}.ini
 %else
@@ -32,10 +32,10 @@
 
 Summary:        Replacement for the standard PHP serializer
 Name:           %{?sub_prefix}php-pecl-igbinary
-Version:        1.2.1
-%if 0%{?short:1}
-Release:        0.11.git%{short}%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
-Source0:        https://github.com/%{extname}/%{extname}/archive/%{commit}/%{extname}-%{version}-%{short}.tar.gz
+Version:        1.2.2
+%if 0%{?gh_date}
+Release:        0.6.%{gh_date}git%{gh_short}%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Source0:        https://github.com/%{extname}/%{extname}/archive/%{gh_commit}/%{extname}-%{version}-%{gh_short}.tar.gz
 %else
 Release:        3%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 Source0:        http://pecl.php.net/get/%{extname}-%{version}.tgz
@@ -54,13 +54,15 @@ Requires:       %{?scl_prefix}php(zend-abi) = %{php_zend_api}
 Requires:       %{?scl_prefix}php(api) = %{php_core_api}
 %{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
 
-Obsoletes:      %{?scl_prefix}php-%{extname}               <= 1.1.1
+Obsoletes:      %{?scl_prefix}php-%{extname}                <= 1.1.1
 Provides:       %{?scl_prefix}php-%{extname}                = %{version}
 Provides:       %{?scl_prefix}php-%{extname}%{?_isa}        = %{version}
 Provides:       %{?scl_prefix}php-pecl(%{extname})          = %{version}
 Provides:       %{?scl_prefix}php-pecl(%{extname})%{?_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}
 # Other third party repo stuff
@@ -76,6 +78,14 @@ Obsoletes:     php55w-pecl-%{extname}
 Obsoletes:     php56u-pecl-%{extname}
 Obsoletes:     php56w-pecl-%{extname}
 %endif
+%if "%{php_version}" > "7.0"
+Obsoletes:     php70u-pecl-%{extname}
+Obsoletes:     php70w-pecl-%{extname}
+%endif
+%if "%{php_version}" > "7.1"
+Obsoletes:     php71u-pecl-%{extname}
+Obsoletes:     php71w-pecl-%{extname}
+%endif
 %endif
 
 %if 0%{?fedora} < 20 && 0%{?rhel} < 7
@@ -100,8 +110,8 @@ Group:         Development/Libraries
 Requires:      %{name}%{?_isa} = %{version}-%{release}
 Requires:      %{?scl_prefix}php-devel%{?_isa}
 
-Obsoletes:     %{?scl_prefix}php-%{extname}-devel <= 1.1.1
-Provides:      %{?scl_prefix}php-%{extname}-devel = %{version}-%{release}
+Obsoletes:     %{?scl_prefix}php-%{extname}-devel         <= 1.1.1
+Provides:      %{?scl_prefix}php-%{extname}-devel         = %{version}-%{release}
 Provides:      %{?scl_prefix}php-%{extname}-devel%{?_isa} = %{version}-%{release}
 
 %description devel
@@ -113,10 +123,15 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 %prep
 %setup -q -c
 
-%if 0%{?short:1}
-mv igbinary-%{commit}/package.xml .
-mv igbinary-%{commit} NTS
-sed -e '/release/s/-dev/dev/' -i package.xml
+%if 0%{?gh_date}
+mv igbinary-%{gh_commit} NTS
+%{__php} -r '
+  $pkg = simplexml_load_file("NTS/package.xml");
+  $pkg->date = substr("%{gh_date}",0,4)."-".substr("%{gh_date}",4,2)."-".substr("%{gh_date}",6,2);
+  $pkg->version->release = "%{version}dev";
+  $pkg->stability->release = "devel";
+  $pkg->asXML("package.xml");
+'
 %else
 mv %{extname}-%{version} NTS
 %endif
@@ -126,7 +141,8 @@ mv %{extname}-%{version} NTS
 cd NTS
 
 # Check version
-extver=$(sed -n '/#define PHP_IGBINARY_VERSION/{s/.* "//;s/".*$//;p}' igbinary.h)
+subdir="php$(%{__php} -r 'echo PHP_MAJOR_VERSION;')"
+extver=$(sed -n '/#define PHP_IGBINARY_VERSION/{s/.* "//;s/".*$//;p}' src/$subdir/igbinary.h)
 if test "x${extver}" != "x%{version}%{?prever}"; then
    : Error: Upstream version is ${extver}, expecting %{version}%{?prever}.
    exit 1
@@ -172,7 +188,7 @@ rm -rf %{buildroot}
 
 make install -C NTS INSTALL_ROOT=%{buildroot}
 
-install -D -m 644 package2.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
+install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
 
 install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
 
@@ -184,20 +200,28 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
 
 # Test & Documentation
 cd NTS
-for i in $(grep 'role="test"' ../package2.xml | sed -e 's/^.*name="//;s/".*$//')
-do install -Dpm 644 $i %{buildroot}%{pecl_testdir}/%{extname}/$i
+for i in $(grep 'role="test"' ../package.xml | sed -e 's/^.*name="//;s/".*$//')
+do [ -f $i       ] && install -Dpm 644 $i       %{buildroot}%{pecl_testdir}/%{extname}/$i
+   [ -f tests/$i ] && install -Dpm 644 tests/$i %{buildroot}%{pecl_testdir}/%{extname}/tests/$i
 done
-for i in $(grep 'role="doc"' ../package2.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}/%{extname}/$i
 done
 
 
 %check
+MOD=""
+%if "%{php_version}" > "7.0"
+# See https://github.com/igbinary/igbinary7/issues/24
+rm */tests/igbinary_040.phpt
+%endif
+
 # APC required for test 045
 if [ -f %{php_extdir}/apcu.so ]; then
   MOD="-d extension=apcu.so"
-elif [ -f %{php_extdir}/apc.so ]; then
-  MOD="-d extension=apc.so"
+fi
+if [ -f %{php_extdir}/apc.so ]; then
+  MOD="$MOD -d extension=apc.so"
 fi
 
 : simple NTS module load test, without APC, as optional
@@ -279,8 +303,26 @@ fi
 
 
 %changelog
-* Tue Mar  8 2016 Remi Collet <remi@fedoraproject.org> - 1.2.1-3
-- adapt for F24
+* Tue Oct 18 2016 Remi Collet <remi@fedoraproject.org> - 1.2.2-0.6.20161018git6a2d5b7
+- refresh with sources from igbinary instead of old closed repo igbinary7
+
+* Wed Sep 14 2016 Remi Collet <remi@fedoraproject.org> - 1.2.2-0.5.20160724git332a3d7
+- rebuild for PHP 7.1 new API version
+
+* Mon Jul 25 2016 Remi Collet <remi@fedoraproject.org> - 1.2.2-0.4.20160724git332a3d7
+- refresh
+
+* Sat Jul 23 2016 Remi Collet <remi@fedoraproject.org> - 1.2.2-0.3.20160715gita87a993
+- ignore 1 test with 7.1
+
+* Mon Jul 18 2016 Remi Collet <remi@fedoraproject.org> - 1.2.2-0.2.20160715gita87a993
+- refresh, newer snapshot
+
+* Wed Mar  2 2016 Remi Collet <remi@fedoraproject.org> - 1.2.2-0.1.20151217git2b7c703
+- update to 1.2.2dev for PHP 7
+- ignore test results, 4 failed tests: igbinary_009.phpt, igbinary_014.phpt
+  igbinary_026.phpt and igbinary_unserialize_v1_compatible.phpt
+- session support not yet available
 
 * Fri Jun 19 2015 Remi Collet <remi@fedoraproject.org> - 1.2.1-2
 - allow build against rh-php56 (as more-php56)