From 7af4d1712fd145a4a4fa96ee22b2dbc27ecefca5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 1 Aug 2017 10:32:12 +0200 Subject: switch --- php-pecl-yac.spec | 101 +++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 74 insertions(+), 27 deletions(-) (limited to 'php-pecl-yac.spec') diff --git a/php-pecl-yac.spec b/php-pecl-yac.spec index 4a148af..b3a70e0 100644 --- a/php-pecl-yac.spec +++ b/php-pecl-yac.spec @@ -10,16 +10,16 @@ # 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-yac %endif -%{?scl: %scl_package php-yac} - -%global with_zts 0%{?__ztsphp:1} +%global gh_commit 7e5a9edfcfb6ad064c165a0b6abf8d11218fe4b5 +%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) +%global gh_owner laruence +%global gh_project yac +#global gh_date 20150908 +%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global pecl_name yac %global with_tests %{!?_without_tests:1}%{?_without_tests:0} %if "%{php_version}" < "5.6" @@ -31,16 +31,20 @@ Summary: Lockless user data cache Name: %{?sub_prefix}php-pecl-%{pecl_name} -Version: 0.9.2 +Version: 2.0.1 +%if 0%{?gh_date:1} +Release: 0.8.%{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}.tgz +%endif License: PHP Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} -Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: %{?scl_prefix}php-devel > 5.2 +BuildRequires: %{?scl_prefix}php-devel > 7 BuildRequires: %{?scl_prefix}php-pear %if %{with_fastlz} BuildRequires: fastlz-devel @@ -56,8 +60,10 @@ 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 @@ -65,13 +71,19 @@ Obsoletes: php53-pecl-%{pecl_name} <= %{version} Obsoletes: php53u-pecl-%{pecl_name} <= %{version} Obsoletes: php54-pecl-%{pecl_name} <= %{version} Obsoletes: php54w-pecl-%{pecl_name} <= %{version} -%if "%{php_version}" > "5.5" Obsoletes: php55u-pecl-%{pecl_name} <= %{version} Obsoletes: php55w-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "5.6" 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 @@ -97,7 +109,12 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %prep %setup -qc +%if 0%{?gh_date:1} +mv %{gh_project}-%{gh_commit} NTS +mv NTS/package.xml . +%else mv %{pecl_name}-%{version} NTS +%endif # Don't install (register) the tests sed -e 's/role="test"/role="src"/' \ @@ -112,8 +129,8 @@ rm -r compressor/fastlz # Check version as upstream often forget to update this extver=$(sed -n '/#define PHP_YAC_VERSION/{s/.* "//;s/".*$//;p}' php_yac.h) -if test "x${extver}" != "x%{version}%{?prever}"; then - : Error: Upstream YAC version is ${extver}, expecting %{version}%{?prever}. +if test "x${extver}" != "x%{version}%{?prever}%{?gh_date:-dev}"; then + : Error: Upstream YAC version is ${extver}, expecting %{version}%{?prever}%{?gh_date:-dev}. exit 1 fi cd .. @@ -161,7 +178,6 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} # Install the NTS stuff make -C NTS install INSTALL_ROOT=%{buildroot} install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} @@ -176,12 +192,14 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} %endif # Documentation -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 +for i in README.md $(grep 'role="doc"' package.xml | sed -e 's/^.*name="//;s/".*$//') +do [ -f NTS/$i ] && install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done %check +sed -e 's/Catchable/%s/' -i ?TS/tests/005.phpt + cd NTS : Minimal load test for NTS extension @@ -241,12 +259,7 @@ fi %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{?_licensedir:%license NTS/LICENSE} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -261,11 +274,44 @@ rm -rf %{buildroot} %changelog -* Wed Mar 9 2016 Remi Collet - 0.9.2-4 +* 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 + +* Sat Jul 2 2016 Remi Collet - 2.0.1-1 +- update to 2.0.1 (php 7) +- sources from pecl + +* Sun Mar 6 2016 Remi Collet - 2.0.0-2 - adapt for F24 -* Tue Jun 23 2015 Remi Collet - 0.9.2-3 -- allow build against rh-php56 (as more-php56) +* Tue Oct 27 2015 Remi Collet - 2.0.0-1 +- update to 2.0.0 (php 7) + +* Tue Oct 13 2015 Remi Collet - 0.9.3-0.6.20150908gita406e46 +- rebuild for PHP 7.0.0RC5 new API version +- new snapshot + +* Fri Sep 18 2015 Remi Collet - 0.9.3-0.5.20150717git74fa8e2 +- F23 rebuild with rh_layout + +* Wed Jul 22 2015 Remi Collet - 0.9.3-0.4.20150717git74fa8e2 +- rebuild against php 7.0.0beta2 + +* Wed Jul 8 2015 Remi Collet - 0.9.3-0.3.20150701git85f6e35 +- rebuild against php 7.0.0beta1 + +* Wed Jun 24 2015 Remi Collet - 0.9.3-0.2.20150616git1d26cd4 +- rebuild for "rh_layout" (php70) + +* Tue Jun 16 2015 Remi Collet - 0.9.3-0.1.20150616git1d26cd4 +- update to 0.9.3-dev for PHP 7 +- sources from github * Sun Mar 1 2015 Remi Collet - 0.9.2-2 - drop runtime dependency on pear, new scriplets @@ -302,3 +348,4 @@ rm -rf %{buildroot} * Sat Mar 23 2013 Remi Collet - 0.1.0-0.1.git57fe00d - initial package, version 0.1.0 (experimental) + -- cgit