From 1a7dfc6cbda7a2eb39e010d0175d23242ac65ce5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 14 Jun 2017 15:24:28 +0200 Subject: switch the spec --- php-pecl-ssh2.spec | 108 +++++++++++++++++++++++++++++------------------------ 1 file changed, 60 insertions(+), 48 deletions(-) (limited to 'php-pecl-ssh2.spec') diff --git a/php-pecl-ssh2.spec b/php-pecl-ssh2.spec index f9294b7..a519b6e 100644 --- a/php-pecl-ssh2.spec +++ b/php-pecl-ssh2.spec @@ -10,40 +10,41 @@ # 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-ssh2 %endif -%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} -%global pecl_name ssh2 -%if "%{php_version}" < "5.6" -%global ini_name %{pecl_name}.ini -%else -%global ini_name 40-%{pecl_name}.ini -%endif +# See https://github.com/php/pecl-networking-ssh2/commits/master +%global gh_commit 50d97a52c39166d59e59222a20e841f3f3ce594d +%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) +#global gh_date 20160113 +%global gh_owner php +%global gh_project pecl-networking-ssh2 +%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} +%global pecl_name ssh2 +%global ini_name 40-%{pecl_name}.ini Name: %{?sub_prefix}php-pecl-ssh2 -Version: 0.13 -Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 1.0 +%if 0%{?gh_date} +Release: 0.2.%{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}/%{gh_project}-%{version}%{?prever}-%{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/ssh2-%{version}.tgz +%endif Summary: Bindings for the libssh2 library %global buildver %(pkg-config --silence-errors --modversion libssh2 2>/dev/null || echo 65536) +Patch0: %{pecl_name}-php7013.patch + License: PHP Group: Development/Languages URL: http://pecl.php.net/package/ssh2 -Source0: http://pecl.php.net/get/ssh2-%{version}.tgz -Source2: php-pecl-ssh2-0.10-README -Patch0: %{pecl_name}-php5628.patch - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libssh2-devel >= 1.2 -BuildRequires: %{?scl_prefix}php-devel < 7 +BuildRequires: %{?scl_prefix}php-devel > 7 BuildRequires: %{?scl_prefix}php-pear Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} @@ -51,9 +52,9 @@ Requires: %{?scl_prefix}php(api) = %{php_core_api} Requires: libssh2%{?_isa} >= %{buildver} %{?_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_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} @@ -62,17 +63,19 @@ Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{rele %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff -Obsoletes: php53-pecl-%{pecl_name} <= %{version} +Obsoletes: php53-pecl-%{pecl_name} <= %{version} Obsoletes: php53u-pecl-%{pecl_name} <= %{version} -Obsoletes: php54-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 %endif @@ -95,26 +98,35 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %prep %setup -c -q +%if 0%{?gh_date} +mv %{gh_project}-%{gh_commit} NTS +%{__php} -r ' + $pkg = simplexml_load_file("NTS/package.xml"); + $pkg->date = substr("%{gh_date}",0,4)."-".substr("%{gh_date}",4,2)."-".substr("%{gh_date}",6,2); + $pkg->version->release = "%{version}dev"; + $pkg->stability->release = "devel"; + $pkg->asXML("package.xml"); +' +%else +mv %{pecl_name}-%{version} NTS +%endif # Don't install/register tests sed -e 's/role="test"/role="src"/' \ %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \ -i package.xml -mv %{pecl_name}-%{version} NTS cd NTS %patch0 -p1 -b .php7013 extver=$(sed -n '/#define PHP_SSH2_VERSION/{s/.* "//;s/".*$//;p}' php_ssh2.h) -if test "x${extver}" != "x%{version}"; then - : Error: Upstream version is now ${extver}, expecting %{version}. +if test "x${extver}" != "x%{version}%{?gh_date:-dev}"; then + : Error: Upstream version is now ${extver}, expecting %{version}%{?gh_date:-dev}. : Update the pdover macro and rebuild. exit 1 fi cd .. -cp %{SOURCE2} README - cat > %{ini_name} << 'EOF' ; Enable ssh2 extension module extension=ssh2.so @@ -141,8 +153,6 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} - make -C NTS install INSTALL_ROOT=%{buildroot} # Install XML package description @@ -157,8 +167,6 @@ install -Dpm644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} %endif # Documentation -install -Dpm 644 README %{buildroot}%{pecl_docdir}/%{pecl_name}/README - 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 @@ -190,6 +198,9 @@ fi # posttrans as pear can be installed after us %posttrans +%if 0%{?gh_date} +echo -e "\n** %{name} is an experimental package, built from a development sources snapshot **\n" +%endif if [ -x %{__pecl} ] ; then %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : fi @@ -201,14 +212,9 @@ fi %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{?_licensedir:%license NTS/LICENSE} -%doc %{pecl_docdir}/%{pecl_name} +%{!?_licensedir:%doc %{pecl_docdir}/%{pecl_name}} %{pecl_xmldir}/%{name}.xml %config(noreplace) %{php_inidir}/%{ini_name} @@ -221,14 +227,20 @@ rm -rf %{buildroot} %changelog -* Thu Nov 10 2016 Remi Collet - 0.13-3 -- add patch for parse_url change in PHP 5.6.28 +* Thu Dec 1 2016 Remi Collet - 1.0-5 +- rebuild with PHP 7.1.0 GA + +* Thu Nov 10 2016 Remi Collet - 1.0-4 +- add patch for parse_url change in PHP 7.0.13 + +* Wed Sep 14 2016 Remi Collet - 1.0-2 +- rebuild for PHP 7.1 new API version -* Sun Jun 12 2016 Remi Collet - 0.13-1 -- update to 0.13 +* Sun Jun 12 2016 Remi Collet - 1.0-1 +- update to 1.0 -* Tue Mar 8 2016 Remi Collet - 0.12-7 -- adapt for F24 +* Wed Jan 13 2016 Remi Collet - 0.13-0.1.20160113git50d97a5 +- update to 0.13-dev, git snapshot, for PHP 7 * Tue Jun 23 2015 Remi Collet - 0.12-6 - allow build against rh-php56 (as more-php56) -- cgit