cleanupphp5

3 files changed, 2 insertions, 362 deletions

diff --git a/REFLECTION-PHP7 b/REFLECTION-PHP7
deleted file mode 100644
index 7833992..0000000
--- a/REFLECTION-PHP7
+++ /dev/null
@@ -1,31 +0,0 @@
-Extension [ <persistent> extension #72 propro version 2.0.1 ] {
-
-  - Classes [1] {
-    Class [ <internal:propro> final class php\PropertyProxy ] {
-
-      - Constants [0] {
-      }
-
-      - Static properties [0] {
-      }
-
-      - Static methods [0] {
-      }
-
-      - Properties [0] {
-      }
-
-      - Methods [1] {
-        Method [ <internal:propro, ctor> public method __construct ] {
-
-          - Parameters [3] {
-            Parameter #0 [ <required> &$object ]
-            Parameter #1 [ <required> $member ]
-            Parameter #2 [ <optional> php\PropertyProxy or NULL $parent ]
-          }
-        }
-      }
-    }
-  }
-}
-
diff --git a/php-pecl-propro-php7.spec b/php-pecl-propro-php7.spec
deleted file mode 100644
index 21db2d9..0000000
--- a/php-pecl-propro-php7.spec
+++ /dev/null
@@ -1,315 +0,0 @@
-# remirepo spec file for php-pecl-propro
-# with SCL compatibility, from:
-#
-# Fedora spec file for php-pecl-propro
-#
-# 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-propro
-%endif
-
-%global gh_commit   55c3639a82f5e3dad0bb2e913e55ba929c624e34
-%global gh_short    %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_owner    m6w6
-%global gh_project  ext-propro
-#global gh_date     20150930
-%global with_zts    0%{!?_without_zts:%{?__ztsphp:1}}
-#global prever      RC1
-%global pecl_name   propro
-%if "%{php_version}" < "5.6"
-%global ini_name    %{pecl_name}.ini
-%else
-%global ini_name    40-%{pecl_name}.ini
-%endif
-
-Summary:        Property proxy
-Name:           %{?sub_prefix}php-pecl-%{pecl_name}
-Version:        2.0.1
-%if 0%{?ghdate}
-Release:        0.3.%{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:        4%{?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}
-
-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
-A reusable split-off of pecl_http's property proxy 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%{?ghdate}
-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_PROPRO_VERSION/{s/.* "//;s/".*$//;p}' php_propro.h)
-if test "x${extver}" != "x%{version}%{?prever:-%{prever}}"; then
-   : Error: Upstream extension version is ${extver}, expecting %{version}%{?prever:-%{prever}}.
-   #exit 1
-fi
-cd ..
-
-%if %{with_zts}
-# Duplicate source tree for NTS / ZTS build
-cp -pr NTS ZTS
-%endif
-
-# Create configuration file
-cat > %{ini_name} << 'EOF'
-; Enable %{pecl_name} extension module
-extension=%{pecl_name}.so
-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
-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
-# Minimal load test for NTS extension
-cd NTS
-%{__php} --no-php-ini \
-    --define extension_dir=modules \
-    --define extension=%{pecl_name}.so \
-    --modules | grep %{pecl_name}
-
-# Upstream test suite
-TEST_PHP_EXECUTABLE=%{__php} \
-TEST_PHP_ARGS="-n -d extension_dir=$PWD/modules -d extension=%{pecl_name}.so" \
-NO_INTERACTION=1 \
-REPORT_EXIT_STATUS=1 \
-%{__php} -n run-tests.php
-
-%if %{with_zts}
-# Minimal load test for ZTS extension
-cd ../ZTS
-%{__ztsphp} --no-php-ini \
-    --define extension_dir=modules \
-    --define extension=%{pecl_name}.so \
-    --modules | grep %{pecl_name}
-
-# Upstream test suite
-TEST_PHP_EXECUTABLE=%{__ztsphp} \
-TEST_PHP_ARGS="-n -d extension_dir=$PWD/modules -d extension=%{pecl_name}.so" \
-NO_INTERACTION=1 \
-REPORT_EXIT_STATUS=1 \
-%{__ztsphp} -n run-tests.php
-%endif
-
-
-%files
-%{?_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
-%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.1-4
-- rebuild for PHP 7.2.0beta1 new API
-
-* Thu Dec  1 2016 Remi Collet <remi@fedoraproject.org> - 2.0.1-3
-- rebuild with PHP 7.1.0 GA
-
-* Wed Sep 14 2016 Remi Collet <remi@fedoraproject.org> - 2.0.1-2
-- rebuild for PHP 7.1 new API version
-
-* Wed May 25 2016 Remi Collet <remi@fedoraproject.org> - 2.0.1-1
-- Update to 2.0.1 (stable)
-
-* 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.2.RC1
-- Update to 2.0.0RC1 (beta)
-- sources from pecl tarball
-
-* Tue Oct 13 2015 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.1.20150930git55c3639
-- rebuild for PHP 7.0.0RC5 new API version
-- new snapshot
-
-* Fri Sep 18 2015 Remi Collet <remi@fedoraproject.org> - 1.0.1-0.5.20150615gitd9cb4d6
-- F23 rebuild with rh_layout
-
-* Wed Jul 22 2015 Remi Collet <remi@fedoraproject.org> - 1.0.1-0.4.20150615gitd9cb4d6
-- rebuild against php 7.0.0beta2
-- sources from github
-
-* Wed Jul  8 2015 Remi Collet <remi@fedoraproject.org> - 1.0.1-0.3
-- rebuild against php 7.0.0beta1
-
-* Wed Jun 24 2015 Remi Collet <remi@fedoraproject.org> - 1.0.1-0.2
-- rebuild for "rh_layout" (php70)
-
-* Thu Mar 26 2015 Remi Collet <remi@fedoraproject.org> - 1.0.1-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.0-4.1
-- Fedora 21 SCL mass rebuild
-
-* Mon Aug 25 2014 Remi Collet <rcollet@redhat.com> - 1.0.0-4
-- improve SCL build
-
-* Wed Apr  9 2014 Remi Collet <remi@fedoraproject.org> - 1.0.0-3
-- add numerical prefix to extension configuration file
-
-* Fri Nov 29 2013 Remi Collet <rcollet@redhat.com> - 1.0.0-2
-- adapt for SCL
-- install doc in pecl doc_dir
-- install tests in pecl test_dir
-
-* Tue Aug 20 2013 Remi Collet <remi@fedoraproject.org> - 1.0.0-1
-- Update to 1.0.0
-
-* Sun Jun 16 2013 Remi Collet <remi@fedoraproject.org> - 0.1.0-1
-- initial package
diff --git a/php-pecl-propro.spec b/php-pecl-propro.spec
index fa205c6..7835662 100644
--- a/php-pecl-propro.spec
+++ b/php-pecl-propro.spec
@@ -10,15 +10,10 @@
 # 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-raphf
 %endif
 
-%{?scl:          %scl_package        php-pecl-raphf}
-
 %global with_zts  0%{?__ztsphp:1}
 %global pecl_name propro
 %if "%{php_version}" < "5.6"
@@ -33,11 +28,9 @@ Name:           %{?sub_prefix}php-pecl-%{pecl_name}
 Version:        1.0.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
 
@@ -137,8 +130,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf %{buildroot}
-
 make -C NTS install INSTALL_ROOT=%{buildroot}
 
 # install config file
@@ -161,7 +152,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
@@ -213,12 +204,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