cleanupphp5

4 files changed, 12 insertions, 396 deletions

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/REFLECTION-PHP7 b/REFLECTION-PHP7
deleted file mode 100644
index d9225e7..0000000
--- a/REFLECTION-PHP7
+++ /dev/null
@@ -1,24 +0,0 @@
-Extension [ <persistent> extension #66 raphf version 2.0.0 ] {
-
-  - INI {
-    Entry [ raphf.persistent_handle.limit <SYSTEM> ]
-      Current = '-1'
-    }
-  }
-
-  - Functions {
-    Function [ <internal:raphf> function raphf\stat_persistent_handles ] {
-
-      - Parameters [0] {
-      }
-    }
-    Function [ <internal:raphf> function raphf\clean_persistent_handles ] {
-
-      - Parameters [2] {
-        Parameter #0 [ <optional> $name ]
-        Parameter #1 [ <optional> $ident ]
-      }
-    }
-  }
-}
-
diff --git a/php-pecl-raphf-php7.spec b/php-pecl-raphf-php7.spec
deleted file mode 100644
index 17b3c41..0000000
--- a/php-pecl-raphf-php7.spec
+++ /dev/null
@@ -1,353 +0,0 @@
-# remirepo spec file for php-pecl-raphf
-# with SCL compatibility, from:
-#
-# Fedora spec file for php-pecl-raphf
-#
-# Copyright (c) 2013-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-raphf
-%endif
-
-%global gh_commit  b07c6f39d2ef4059d3f4cebf695e1315dc3fd5ec
-%global gh_short   %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_owner   m6w6
-%global gh_project ext-raphf
-#global gh_date    20150930
-%global with_zts   0%{!?_without_zts:%{?__ztsphp:1}}
-%global pecl_name  raphf
-#global prever     RC1
-# tests disabled because of circular dependency on pecl/http
-# tests requires pecl/http 2.0.0
-%global with_tests %{?_with_tests:1}%{!?_with_tests:0}
-%global ini_name   40-%{pecl_name}.ini
-
-Summary:        Resource and persistent handles factory
-Name:           %{?scl_prefix}php-pecl-%{pecl_name}
-Version:        2.0.0
-%if 0%{?gh_date}
-Release:        0.5.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
-Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz
-%else
-Release:        5%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
-Source0:        http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
-%endif
-License:        BSD
-Group:          Development/Languages
-URL:            http://pecl.php.net/package/%{pecl_name}
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  %{?scl_prefix}php-devel > 7
-BuildRequires:  %{?scl_prefix}php-pear
-%if %{with_tests}
-BuildRequires:  %{?scl_prefix}php-pecl-http >= 2.0.0
-%endif
-
-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}-%{release}
-Provides:       %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{release}
-Provides:       %{?scl_prefix}php-pecl(%{pecl_name})         = %{version}
-Provides:       %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
-
-%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
-A reusable split-off of pecl_http's persistent handle and resource
-factory API.
-
-Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl} by %{?scl_vendor}%{!?scl_vendor:rh})}.
-
-
-%package devel
-Summary:       %{name} developer files (header)
-Group:         Development/Libraries
-Requires:      %{name}%{?_isa} = %{version}-%{release}
-Requires:      %{?scl_prefix}php-devel%{?_isa}
-Provides:      %{?scl_prefix}php-pecl-%{pecl_name}-devel = %{version}-%{release}
-Provides:      %{?scl_prefix}php-pecl-%{pecl_name}-devel%{?_isa} = %{version}-%{release}
-
-%description devel
-These are the files needed to compile programs using %{name}.
-
-
-%prep
-%setup -qc
-%if 0%{?gh_date}
-mv %{gh_project}-%{gh_commit} NTS
-mv NTS/package.xml .
-%else
-mv %{pecl_name}-%{version}%{?prever} NTS
-%endif
-
-%{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml}
-
-cd NTS
-# Sanity check, really often broken
-extver=$(sed -n '/#define PHP_RAPHF_VERSION/{s/.* "//;s/".*$//;p}' php_raphf.h)
-if test "x${extver}" != "x%{version}%{?prever}%{?gh_date:dev}"; then
-   : Error: Upstream extension version is ${extver}, expecting %{version}%{?prever}%{?gh_date:dev}.
-   exit 1
-fi
-cd ..
-
-%if %{with_zts}
-# Duplicate source tree for NTS / ZTS build
-cp -pr NTS ZTS
-%endif
-
-# Create configuration file
-cat << 'EOF' | tee %{ini_name}
-; Enable %{pecl_name} extension module
-extension=%{pecl_name}.so
-
-; Configuration
-;raphf.persistent_handle.limit = -1
-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 -C NTS \
-     install INSTALL_ROOT=%{buildroot}
-
-# install config file
-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 -C ZTS \
-     install INSTALL_ROOT=%{buildroot}
-
-install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
-%endif
-
-# Test & Documentation
-for i in $(grep 'role="test"' package.xml | sed -e 's/^.*name="//;s/".*$//')
-do [ -f NTS/tests/$i ] && install -Dpm 644 NTS/tests/$i %{buildroot}%{pecl_testdir}/%{pecl_name}/tests/$i
-   [ -f NTS/$i ]       && install -Dpm 644 NTS/$i       %{buildroot}%{pecl_testdir}/%{pecl_name}/$i
-done
-for i in $(grep 'role="doc"' package.xml | sed -e 's/^.*name="//;s/".*$//')
-do install -Dpm 644 NTS/$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
-cd NTS
-: Minimal load test for NTS extension
-%{__php} --no-php-ini \
-    --define extension=modules/%{pecl_name}.so \
-    --modules | grep %{pecl_name}
-
-%if %{with_tests}
-for mod in json hash iconv propro; do
-  if [ -f %{php_extdir}/${mod}.so ]; then
-    modules="$modules -d extension=${mod}.so"
-  fi
-done
-
-: Upstream test suite for NTS extension
-TEST_PHP_EXECUTABLE=%{__php} \
-TEST_PHP_ARGS="-n $modules -d extension=$PWD/modules/%{pecl_name}.so -d extension=http.so" \
-NO_INTERACTION=1 \
-REPORT_EXIT_STATUS=1 \
-%{__php} -n run-tests.php
-%endif
-
-%if %{with_zts}
-cd ../ZTS
-: Minimal load test for ZTS extension
-%{__ztsphp} --no-php-ini \
-    --define extension=modules/%{pecl_name}.so \
-    --modules | grep %{pecl_name}
-
-%if %{with_tests}
-: Upstream test suite for ZTS extension
-TEST_PHP_EXECUTABLE=%{__ztsphp} \
-TEST_PHP_ARGS="-n $modules -d extension=$PWD/modules/%{pecl_name}.so -d extension=http.so" \
-NO_INTERACTION=1 \
-REPORT_EXIT_STATUS=1 \
-%{__ztsphp} -n run-tests.php
-%endif
-%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
-
-%if %{with_zts}
-%config(noreplace) %{php_ztsinidir}/%{ini_name}
-%{php_ztsextdir}/%{pecl_name}.so
-%endif
-
-%files devel
-%defattr(-,root,root,-)
-%doc %{pecl_testdir}/%{pecl_name}
-%{php_incldir}/ext/%{pecl_name}
-
-%if %{with_zts}
-%{php_ztsincldir}/ext/%{pecl_name}
-%endif
-
-
-%changelog
-* Tue Jul 18 2017 Remi Collet <remi@remirepo.net> - 2.0.0-5
-- rebuild for PHP 7.2.0beta1 new API
-
-* Thu Dec  1 2016 Remi Collet <remi@fedoraproject.org> - 2.0.0-4
-- rebuild with PHP 7.1.0 GA
-
-* Wed Sep 14 2016 Remi Collet <remi@fedoraproject.org> - 2.0.0-3
-- rebuild for PHP 7.1 new API version
-
-* Sat Mar  5 2016 Remi Collet <remi@fedoraproject.org> - 2.0.0-2
-- adapt for F24
-
-* Tue Jan 19 2016 Remi Collet <remi@fedoraproject.org> - 2.0.0-1
-- Update to 2.0.0 (stable)
-
-* Mon Dec  7 2015 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.4.RC1
-- Update to 2.0.0RC1 (beta)
-- sources from pecl tarball
-
-* Tue Oct 13 2015 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.3.20150930gitb07c6f3
-- rebuild for PHP 7.0.0RC5 new API version
-- new snapshot
-
-* Fri Sep 18 2015 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.2.20150721git6d04f5b
-- F23 rebuild with rh_layout
-
-* Tue Jul 28 2015 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.1.20150721git6d04f5b
-- bump version (as upstream)
-
-* Wed Jul 22 2015 Remi Collet <remi@fedoraproject.org> - 1.0.5-0.4.20150721git6d04f5b
-- rebuild against php 7.0.0beta2
-- sources from github
-
-* Wed Jul  8 2015 Remi Collet <remi@fedoraproject.org> - 1.0.5-0.3
-- rebuild against php 7.0.0beta1
-
-* Wed Jun 24 2015 Remi Collet <remi@fedoraproject.org> - 1.0.5-0.2
-- rebuild for "rh_layout" (php70)
-
-* Thu Mar 26 2015 Remi Collet <remi@fedoraproject.org> - 1.0.5-0.1
-- git snapshot for PHP 7
-- drop runtime dependency on pear, new scriptlets
-
-* Wed Dec 24 2014 Remi Collet <remi@fedoraproject.org> - 1.0.4-4.1
-- Fedora 21 SCL mass rebuild
-
-* Mon Aug 25 2014 Remi Collet <rcollet@redhat.com> - 1.0.4-4
-- improve SCL build
-
-* Wed Apr  9 2014 Remi Collet <remi@fedoraproject.org> - 1.0.4-3
-- add numerical prefix to extension configuration file
-
-* Tue Mar 18 2014 Remi Collet <rcollet@redhat.com> - 1.0.4-2
-- adapt for SCL
-
-* Tue Nov 26 2013 Remi Collet <remi@fedoraproject.org> - 1.0.4-1
-- Update to 1.0.4 (stable)
-
-* Fri Nov 15 2013 Remi Collet <remi@fedoraproject.org> - 1.0.3-1
-- Update to 1.0.3 (stable)
-- install doc in pecl doc_dir
-- install tests in pecl test_dir
-- add --with tests option (not enabled, need pecl/http)
-
-* Tue Aug 20 2013 Remi Collet <remi@fedoraproject.org> - 1.0.2-1
-- Update to 1.0.2 (stable)
-
-* Tue Aug 20 2013 Remi Collet <remi@fedoraproject.org> - 1.0.1-1
-- Update to 1.0.1 (stable)
-
-* Tue Aug 20 2013 Remi Collet <remi@fedoraproject.org> - 1.0.0-1
-- Update to 1.0.0 (stable)
-
-* Sun Jun 16 2013 Remi Collet <remi@fedoraproject.org> - 0.1.0-1
-- initial package, version 0.1.0 (beta)
diff --git a/php-pecl-raphf.spec b/php-pecl-raphf.spec
index c5aa3fc..7658510 100644
--- a/php-pecl-raphf.spec
+++ b/php-pecl-raphf.spec
@@ -3,21 +3,16 @@
 #
 # Fedora spec file for php-pecl-raphf
 #
-# Copyright (c) 2013-2017 Remi Collet
+# Copyright (c) 2013-2018 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}
+%scl_package        php-pecl-raphf
 %endif
-%endif
-
-%{?scl:          %scl_package        php-pecl-raphf}
 
 %global with_zts   0%{?__ztsphp:1}
 %global pecl_name  raphf
@@ -36,11 +31,9 @@ Name:           %{?sub_prefix}php-pecl-%{pecl_name}
 Version:        1.1.2
 Release:        2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:        BSD
-Group:          Development/Languages
 URL:            http://pecl.php.net/package/%{pecl_name}
 Source0:        http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  %{?scl_prefix}php-devel > 5.3
 BuildRequires:  %{?scl_prefix}php-pear
 %if %{with_tests}
@@ -90,7 +83,6 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 
 %package devel
 Summary:       %{name} developer files (header)
-Group:         Development/Libraries
 Requires:      %{name}%{?_isa} = %{version}-%{release}
 Requires:      %{?scl_prefix}php-devel%{?_isa}
 Provides:      %{?scl_prefix}php-pecl-%{pecl_name}-devel = %{version}-%{release}
@@ -147,8 +139,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf %{buildroot}
-
 make -C NTS \
      install INSTALL_ROOT=%{buildroot}
 
@@ -174,7 +164,7 @@ do install -Dpm 644 NTS/$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
@@ -234,12 +224,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
@@ -253,7 +238,6 @@ rm -rf %{buildroot}
 %endif
 
 %files devel
-%defattr(-,root,root,-)
 %doc %{pecl_testdir}/%{pecl_name}
 %{php_incldir}/ext/%{pecl_name}