From 29fabb5c9b3e89f456b6db466bb1d31ce4e5bd34 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Fri, 10 Feb 2017 18:02:43 +0100
Subject: php-smbclient: switch the specs

---
 php-smbclient.spec | 43 ++++++++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 17 deletions(-)

(limited to 'php-smbclient.spec')

diff --git a/php-smbclient.spec b/php-smbclient.spec
index 1dc067b..0498b10 100644
--- a/php-smbclient.spec
+++ b/php-smbclient.spec
@@ -7,23 +7,19 @@
 # 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-smbclient
+%else
+%global pkg_name   %{name}
 %endif
 
-%global gh_commit  8b9587df1a0859074eae6133c5210451d6527e38
+%global gh_commit  18570160a5cb427ed4d55a3a4dc4431d2bea6949
 %global gh_short   %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner   eduardok
 %global gh_project libsmbclient-php
-#global gh_date    20150909
+%global gh_date    20161104
 #global prever     RC1
 
-%{?scl:          %scl_package         php-smbclient}
-%{!?scl:         %global pkg_name     %{name}}
-
 %global pecl_name  smbclient
 %global with_zts   0%{?__ztsphp:1}
 %if "%{php_version}" < "5.6"
@@ -35,17 +31,20 @@
 %global with_tests 0%{?_with_tests:1}
 
 Name:           %{?sub_prefix}php-smbclient
-Version:        0.8.0
+Version:        0.9.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;')}}
+%else
 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%{?ghdate}
-Source0:        %{pkg_name}-%{version}-%{gh_short}.tgz
-# git snapshot as upstream doesn't provide test suite
-Source1:        makesrc.sh
+%if 0%{?gh_date}
+Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz
 %else
 Source0:        http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
 %endif
@@ -53,6 +52,8 @@ 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
@@ -122,7 +123,7 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 
 %prep
 %setup -q -c
-%if 0%{?ghdate}
+%if 0%{?gh_date}
 mv %{gh_project}-%{gh_commit} NTS
 mv NTS/package.xml .
 %else
@@ -135,10 +136,12 @@ 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}"; then
-   : Error: Upstream VERSION version is ${ver}, expecting %{version}%{?prever}.
+if test "$ver" != "%{version}%{?prever}%{?gh_date:-dev}"; then
+   : Error: Upstream VERSION version is ${ver}, expecting %{version}%{?prever}%{?gh_date:-dev}.
    exit 1
 fi
 cd ..
@@ -248,6 +251,12 @@ fi
 
 
 %changelog
+* Thu Dec  1 2016 Remi Collet <remi@fedoraproject.org> - 0.9.0-0.2.20161104git1857016
+- rebuild with PHP 7.1.0 GA
+
+* Tue Nov  8 2016 Remi Collet <remi@fedoraproject.org> - 0.9.0-0.1.20161104git1857016
+- update to 0.9.0-dev for stream performance
+
 * Wed Sep 14 2016 Remi Collet <remi@fedoraproject.org> - 0.8.0-2
 - rebuild for PHP 7.1 new API version
 
-- 
cgit