From 41508f3df7c32ae2b00993087a0374795030f003 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 7 Dec 2015 14:41:55 +0100 Subject: php-pecl-propro: 2.0.0RC1 --- REFLECTION-PHP7 | 31 +++++ php-pecl-propro-dev.spec | 291 ------------------------------------------- php-pecl-propro-php7.spec | 305 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 336 insertions(+), 291 deletions(-) create mode 100644 REFLECTION-PHP7 delete mode 100644 php-pecl-propro-dev.spec create mode 100644 php-pecl-propro-php7.spec diff --git a/REFLECTION-PHP7 b/REFLECTION-PHP7 new file mode 100644 index 0000000..a8c9c45 --- /dev/null +++ b/REFLECTION-PHP7 @@ -0,0 +1,31 @@ +Extension [ extension #83 propro version 2.0.0RC1 ] { + + - Classes [1] { + Class [ final class php\PropertyProxy ] { + + - Constants [0] { + } + + - Static properties [0] { + } + + - Static methods [0] { + } + + - Properties [0] { + } + + - Methods [1] { + Method [ public method __construct ] { + + - Parameters [3] { + Parameter #0 [ &$object ] + Parameter #1 [ $member ] + Parameter #2 [ php\PropertyProxy or NULL $parent ] + } + } + } + } + } +} + diff --git a/php-pecl-propro-dev.spec b/php-pecl-propro-dev.spec deleted file mode 100644 index cf69d4a..0000000 --- a/php-pecl-propro-dev.spec +++ /dev/null @@ -1,291 +0,0 @@ -# remirepo spec file for php-pecl-propro -# with SCL compatibility, from: -# -# Fedora spec file for php-pecl-propro -# -# Copyright (c) 2013-2015 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 -%endif - -%{?scl: %scl_package php-pecl-raphf} -%{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d} -%{!?php_incldir: %global php_incldir %{_includedir}/php} -%{!?__pecl: %global __pecl %{_bindir}/pecl} -%{!?__php: %global __php %{_bindir}/php} - -%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%{?__ztsphp:1} -%global pecl_name propro -%if "%{php_version}" < "5.6" -%global ini_name %{pecl_name}.ini -%else -%global ini_name 40-%{pecl_name}.ini -%endif - -# PHP 7 package from phpng branch -# git clone git@git.php.net:/pecl/php/propro.git -# cd propro; git checkout phpng; pecl package - -Summary: Property proxy -Name: %{?sub_prefix}php-pecl-%{pecl_name} -Version: 2.0.0 -Release: 0.1.%{gh_date}git%{gh_short}%{?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: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: %{?scl_prefix}php-devel > 5.3 -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 "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} -# Other third party repo stuff -Obsoletes: php53-pecl-%{pecl_name} -Obsoletes: php53u-pecl-%{pecl_name} -Obsoletes: php54-pecl-%{pecl_name} -Obsoletes: php54w-pecl-%{pecl_name} -%if "%{php_version}" > "5.5" -Obsoletes: php55u-pecl-%{pecl_name} -Obsoletes: php55w-pecl-%{pecl_name} -%endif -%if "%{php_version}" > "5.6" -Obsoletes: php56u-pecl-%{pecl_name} -Obsoletes: php56w-pecl-%{pecl_name} -%endif -%if "%{php_version}" > "7.0" -Obsoletes: php70u-pecl-%{pecl_name} -Obsoletes: php70w-pecl-%{pecl_name} -%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} - -%description devel -These are the files needed to compile programs using %{name}. - - -%prep -%setup -qc -mv %{gh_project}-%{gh_commit} NTS -mv NTS/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 -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 install -Dpm 644 NTS/tests/$i %{buildroot}%{pecl_testdir}/%{pecl_name}/tests/$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 - - -# 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 - - -%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 - - -%clean -rm -rf %{buildroot} - - -%files -%defattr(-,root,root,-) -%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 Oct 13 2015 Remi Collet - 2.0.0-0.1.20150930git55c3639 -- rebuild for PHP 7.0.0RC5 new API version -- new snapshot - -* Fri Sep 18 2015 Remi Collet - 1.0.1-0.5.20150615gitd9cb4d6 -- F23 rebuild with rh_layout - -* Wed Jul 22 2015 Remi Collet - 1.0.1-0.4.20150615gitd9cb4d6 -- rebuild against php 7.0.0beta2 -- sources from github - -* Wed Jul 8 2015 Remi Collet - 1.0.1-0.3 -- rebuild against php 7.0.0beta1 - -* Wed Jun 24 2015 Remi Collet - 1.0.1-0.2 -- rebuild for "rh_layout" (php70) - -* Thu Mar 26 2015 Remi Collet - 1.0.1-0.1 -- git snapshot for PHP 7 -- drop runtime dependency on pear, new scriptlets - -* Wed Dec 24 2014 Remi Collet - 1.0.0-4.1 -- Fedora 21 SCL mass rebuild - -* Mon Aug 25 2014 Remi Collet - 1.0.0-4 -- improve SCL build - -* Wed Apr 9 2014 Remi Collet - 1.0.0-3 -- add numerical prefix to extension configuration file - -* Fri Nov 29 2013 Remi Collet - 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 - 1.0.0-1 -- Update to 1.0.0 - -* Sun Jun 16 2013 Remi Collet - 0.1.0-1 -- initial package diff --git a/php-pecl-propro-php7.spec b/php-pecl-propro-php7.spec new file mode 100644 index 0000000..889040c --- /dev/null +++ b/php-pecl-propro-php7.spec @@ -0,0 +1,305 @@ +# remirepo spec file for php-pecl-propro +# with SCL compatibility, from: +# +# Fedora spec file for php-pecl-propro +# +# Copyright (c) 2013-2015 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 +%endif + +%{?scl: %scl_package php-pecl-raphf} +%{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d} +%{!?php_incldir: %global php_incldir %{_includedir}/php} +%{!?__pecl: %global __pecl %{_bindir}/pecl} +%{!?__php: %global __php %{_bindir}/php} + +%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 + +# PHP 7 package from phpng branch +# git clone git@git.php.net:/pecl/php/propro.git +# cd propro; git checkout phpng; pecl package + +Summary: Property proxy +Name: %{?sub_prefix}php-pecl-%{pecl_name} +Version: 2.0.0 +%if 0%{?ghdate} +Release: 0.1.%{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: 0.2.%{prever}%{?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 + +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 "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} +# Other third party repo stuff +Obsoletes: php53-pecl-%{pecl_name} +Obsoletes: php53u-pecl-%{pecl_name} +Obsoletes: php54-pecl-%{pecl_name} +Obsoletes: php54w-pecl-%{pecl_name} +%if "%{php_version}" > "5.5" +Obsoletes: php55u-pecl-%{pecl_name} +Obsoletes: php55w-pecl-%{pecl_name} +%endif +%if "%{php_version}" > "5.6" +Obsoletes: php56u-pecl-%{pecl_name} +Obsoletes: php56w-pecl-%{pecl_name} +%endif +%if "%{php_version}" > "7.0" +Obsoletes: php70u-pecl-%{pecl_name} +Obsoletes: php70w-pecl-%{pecl_name} +%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} + +%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 + +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 +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 + + +# 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 + + +%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 + + +%clean +rm -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +%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 +* Mon Dec 7 2015 Remi Collet - 2.0.0-0.2.RC1 +- Update to 2.0.0RC1 (beta) + +* Tue Oct 13 2015 Remi Collet - 2.0.0-0.1.20150930git55c3639 +- rebuild for PHP 7.0.0RC5 new API version +- new snapshot + +* Fri Sep 18 2015 Remi Collet - 1.0.1-0.5.20150615gitd9cb4d6 +- F23 rebuild with rh_layout + +* Wed Jul 22 2015 Remi Collet - 1.0.1-0.4.20150615gitd9cb4d6 +- rebuild against php 7.0.0beta2 +- sources from github + +* Wed Jul 8 2015 Remi Collet - 1.0.1-0.3 +- rebuild against php 7.0.0beta1 + +* Wed Jun 24 2015 Remi Collet - 1.0.1-0.2 +- rebuild for "rh_layout" (php70) + +* Thu Mar 26 2015 Remi Collet - 1.0.1-0.1 +- git snapshot for PHP 7 +- drop runtime dependency on pear, new scriptlets + +* Wed Dec 24 2014 Remi Collet - 1.0.0-4.1 +- Fedora 21 SCL mass rebuild + +* Mon Aug 25 2014 Remi Collet - 1.0.0-4 +- improve SCL build + +* Wed Apr 9 2014 Remi Collet - 1.0.0-3 +- add numerical prefix to extension configuration file + +* Fri Nov 29 2013 Remi Collet - 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 - 1.0.0-1 +- Update to 1.0.0 + +* Sun Jun 16 2013 Remi Collet - 0.1.0-1 +- initial package -- cgit