From 8d5345ee99bbe57efced6bfbaac2e41e30b3cddd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 17 Feb 2018 10:36:42 +0100 Subject: cleanup --- php-pecl-propro.spec | 150 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 96 insertions(+), 54 deletions(-) (limited to 'php-pecl-propro.spec') diff --git a/php-pecl-propro.spec b/php-pecl-propro.spec index fa205c6..bff4ded 100644 --- a/php-pecl-propro.spec +++ b/php-pecl-propro.spec @@ -9,36 +9,39 @@ # # Please, preserve the changelog entries # + +# we don't want -z defs linker flag +%undefine _strict_symbol_defs_build + %if 0%{?scl:1} -%if "%{scl}" == "rh-php56" -%global sub_prefix more-php56- -%else %global sub_prefix %{scl_prefix} -%endif +%scl_package php-pecl-propro %endif -%{?scl: %scl_package php-pecl-raphf} - -%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 -#global prever RC1 +%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 +%global ini_name 40-%{pecl_name}.ini Summary: Property proxy 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;')}} +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} -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-devel > 7 BuildRequires: %{?scl_prefix}php-pear Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} @@ -47,24 +50,32 @@ Requires: %{?scl_prefix}php(api) = %{php_core_api} 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 "%{?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} -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} +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}" > "5.6" -Obsoletes: php56u-pecl-%{pecl_name} -Obsoletes: php56w-pecl-%{pecl_name} +%if "%{php_version}" > "7.2" +Obsoletes: php72u-pecl-%{pecl_name} <= %{version} +Obsoletes: php72w-pecl-%{pecl_name} <= %{version} %endif %endif @@ -94,17 +105,22 @@ These are the files needed to compile programs using %{name}. %prep -%setup -q -c +%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}"; then - : Error: Upstream extension version is ${extver}, expecting %{version}%{?prever}. - exit 1 +if test "x${extver}" != "x%{version}%{?prever:-%{prever}}"; then + : Error: Upstream extension version is ${extver}, expecting %{version}%{?prever:-%{prever}}. + #exit 1 fi cd .. @@ -121,6 +137,8 @@ EOF %build +%{?dtsenable} + cd NTS %{_bindir}/phpize %configure \ @@ -137,7 +155,7 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} +%{?dtsenable} make -C NTS install INSTALL_ROOT=%{buildroot} @@ -154,14 +172,15 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} # Test & Documentation for i in $(grep 'role="test"' package.xml | sed -e 's/^.*name="//;s/".*$//') -do install -Dpm 644 NTS/$i %{buildroot}%{pecl_testdir}/%{pecl_name}/$i +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 +%if 0%{?fedora} < 24 && 0%{?rhel} < 8 # when pear installed alone, after us %triggerin -- %{?scl_prefix}php-pear if [ -x %{__pecl} ] ; then @@ -213,16 +232,10 @@ 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 - %config(noreplace) %{php_inidir}/%{ini_name} %{php_extdir}/%{pecl_name}.so @@ -232,7 +245,6 @@ rm -rf %{buildroot} %endif %files devel -%defattr(-,root,root,-) %doc %{pecl_testdir}/%{pecl_name} %{php_incldir}/ext/%{pecl_name} @@ -242,18 +254,48 @@ rm -rf %{buildroot} %changelog -* Tue Mar 8 2016 Remi Collet - 1.0.2-2 +* Tue Jul 18 2017 Remi Collet - 2.0.1-4 +- rebuild for PHP 7.2.0beta1 new API + +* Thu Dec 1 2016 Remi Collet - 2.0.1-3 +- rebuild with PHP 7.1.0 GA + +* Wed Sep 14 2016 Remi Collet - 2.0.1-2 +- rebuild for PHP 7.1 new API version + +* Wed May 25 2016 Remi Collet - 2.0.1-1 +- Update to 2.0.1 (stable) + +* Sat Mar 5 2016 Remi Collet - 2.0.0-2 - adapt for F24 -- fix license management -* Tue Jan 19 2016 Remi Collet - 1.0.2-1 -- Update to 1.0.2 (stable) +* Tue Jan 19 2016 Remi Collet - 2.0.0-1 +- Update to 2.0.0 (stable) + +* Mon Dec 7 2015 Remi Collet - 2.0.0-0.2.RC1 +- Update to 2.0.0RC1 (beta) +- sources from pecl tarball + +* 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 -* Mon Dec 7 2015 Remi Collet - 1.0.2-0.1.RC1 -- Update to 1.0.2RC1 (beta) +* Wed Jun 24 2015 Remi Collet - 1.0.1-0.2 +- rebuild for "rh_layout" (php70) -* Sun Jun 21 2015 Remi Collet - 1.0.0-5 -- allow build against rh-php56 (as more-php56) +* 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 -- cgit