From e623b5ca3a767058501fbcbc52eade5ddbec1b7a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 8 Nov 2016 13:31:24 +0100 Subject: php-smbclient: dup the spec --- php-smbclient.spec | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) (limited to 'php-smbclient.spec') diff --git a/php-smbclient.spec b/php-smbclient.spec index df2e564..dcd1c0a 100644 --- a/php-smbclient.spec +++ b/php-smbclient.spec @@ -14,11 +14,11 @@ %endif %endif -%global gh_commit 18570160a5cb427ed4d55a3a4dc4431d2bea6949 +%global gh_commit 8b9587df1a0859074eae6133c5210451d6527e38 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner eduardok %global gh_project libsmbclient-php -%global gh_date 20161104 +#global gh_date 20150909 #global prever RC1 %{?scl: %scl_package php-smbclient} @@ -35,20 +35,17 @@ %global with_tests 0%{?_with_tests:1} Name: %{?sub_prefix}php-smbclient -Version: 0.9.0 -%if 0%{?gh_date} -Release: 0.1.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} -%else +Version: 0.8.0 Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} -%endif - Summary: PHP wrapper for libsmbclient Group: Development/Languages License: BSD URL: https://github.com/eduardok/libsmbclient-php -%if 0%{?gh_date} -Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz +%if 0%{?ghdate} +Source0: %{pkg_name}-%{version}-%{gh_short}.tgz +# git snapshot as upstream doesn't provide test suite +Source1: makesrc.sh %else Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz %endif @@ -56,8 +53,6 @@ Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz Source2: %{gh_project}-phpunit.xml %endif -Patch0: %{pecl_name}-zts.patch - BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-pear BuildRequires: libsmbclient-devel > 3.6 @@ -127,7 +122,7 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %prep %setup -q -c -%if 0%{?gh_date} +%if 0%{?ghdate} mv %{gh_project}-%{gh_commit} NTS mv NTS/package.xml . %else @@ -140,12 +135,10 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS -%patch0 -p1 -b .zts - # Check extension version ver=$(sed -n '/define PHP_SMBCLIENT_VERSION/{s/.* "//;s/".*$//;p}' php_smbclient.h) -if test "$ver" != "%{version}%{?prever}%{?gh_date:-dev}"; then - : Error: Upstream VERSION version is ${ver}, expecting %{version}%{?prever}%{?gh_date:-dev}. +if test "$ver" != "%{version}%{?prever}"; then + : Error: Upstream VERSION version is ${ver}, expecting %{version}%{?prever}. exit 1 fi cd .. @@ -255,9 +248,6 @@ fi %changelog -* Tue Nov 8 2016 Remi Collet - 0.9.0-0.1.20161104git1857016 -- update to 0.9.0-dev for stream performance - * Wed Sep 14 2016 Remi Collet - 0.8.0-2 - rebuild for PHP 7.1 new API version -- cgit