From 52465804bcfe8254ebde3ead708671dded285d53 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Dec 26 2018 08:09:12 +0000
Subject: v1.0.0


---

diff --git a/.gitignore b/.gitignore
index 8dd0933..8fc97c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ clog
 /smbclient-0.8.0RC1.tgz
 /smbclient-0.8.0.tgz
 /smbclient-0.9.0.tgz
+/smbclient-1.0.0.tgz
diff --git a/60.patch b/60.patch
deleted file mode 100644
index 50f68a9..0000000
--- a/60.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 596eaa47642633a4dc80f26f6bfbd95b536e57d1 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Wed, 27 Jun 2018 13:22:09 +0200
-Subject: [PATCH] fix for PHP 7.3 because of API change, and array_init always
- succeeds
-
----
- smbclient.c | 30 ++++++------------------------
- 1 file changed, 6 insertions(+), 24 deletions(-)
-
-diff --git a/smbclient.c b/smbclient.c
-index b110c06..81ebd5a 100644
---- a/smbclient.c
-+++ b/smbclient.c
-@@ -889,10 +889,7 @@ PHP_FUNCTION(smbclient_readdir)
- 		}
- 		RETURN_FALSE;
- 	}
--	if (array_init(return_value) != SUCCESS) {
--		php_error(E_WARNING, "Couldn't initialize array");
--		RETURN_FALSE;
--	}
-+	array_init(return_value);
- #if PHP_MAJOR_VERSION >= 7
- 	add_assoc_string(return_value, "type", type_to_string(dirent->smbc_type));
- 	add_assoc_stringl(return_value, "comment", dirent->comment, dirent->commentlen);
-@@ -1108,10 +1105,7 @@ PHP_FUNCTION(smbclient_stat)
- 		}
- 		RETURN_FALSE;
- 	}
--	if (array_init(return_value) != SUCCESS) {
--		php_error(E_WARNING, "Couldn't initialize array");
--		RETURN_FALSE;
--	}
-+	array_init(return_value);
- 	add_index_long(return_value, 0, statbuf.st_dev);
- 	add_index_long(return_value, 1, statbuf.st_ino);
- 	add_index_long(return_value, 2, statbuf.st_mode);
-@@ -1170,10 +1164,7 @@ PHP_FUNCTION(smbclient_fstat)
- 		}
- 		RETURN_FALSE;
- 	}
--	if (array_init(return_value) != SUCCESS) {
--		php_error(E_WARNING, "Couldn't initialize array");
--		RETURN_FALSE;
--	}
-+	array_init(return_value);
- 	add_index_long(return_value, 0, statbuf.st_dev);
- 	add_index_long(return_value, 1, statbuf.st_ino);
- 	add_index_long(return_value, 2, statbuf.st_mode);
-@@ -1608,10 +1599,7 @@ PHP_FUNCTION(smbclient_listxattr)
- 	 * Because this list is static, we can get away with using a fixed
- 	 * buffer size.*/
- 	if (smbc_listxattr(state->ctx, url, values, sizeof(values)) >= 0) {
--		if (array_init(return_value) != SUCCESS) {
--			php_error(E_WARNING, "Couldn't initialize array");
--			RETURN_FALSE;
--		}
-+		array_init(return_value);
- 		/* Each attribute is null-separated, the list itself terminates
- 		 * with an empty element (i.e. two null bytes in a row). */
- 		for (s = c = values; c < values + sizeof(values); c++) {
-@@ -1986,10 +1974,7 @@ PHP_FUNCTION(smbclient_statvfs)
- 		}
- 		RETURN_FALSE;
- 	}
--	if (array_init(return_value) != SUCCESS) {
--		php_error(E_WARNING, "Couldn't initialize array");
--		RETURN_FALSE;
--	}
-+	array_init(return_value);
- 	add_assoc_long(return_value, "bsize",   st.f_bsize);
- 	add_assoc_long(return_value, "frsize",  st.f_frsize);
- 	add_assoc_long(return_value, "blocks",  st.f_blocks);
-@@ -2031,10 +2016,7 @@ PHP_FUNCTION(smbclient_fstatvfs)
- 		}
- 		RETURN_FALSE;
- 	}
--	if (array_init(return_value) != SUCCESS) {
--		php_error(E_WARNING, "Couldn't initialize array");
--		RETURN_FALSE;
--	}
-+	array_init(return_value);
- 	add_assoc_long(return_value, "bsize",   st.f_bsize);
- 	add_assoc_long(return_value, "frsize",  st.f_frsize);
- 	add_assoc_long(return_value, "blocks",  st.f_blocks);
diff --git a/php-smbclient.spec b/php-smbclient.spec
index a50723b..4ffb070 100644
--- a/php-smbclient.spec
+++ b/php-smbclient.spec
@@ -20,8 +20,8 @@
 %global with_tests 0%{?_with_tests:1}
 
 Name:           php-smbclient
-Version:        0.9.0
-Release:        8%{?dist}
+Version:        1.0.0
+Release:        1%{?dist}
 Summary:        PHP wrapper for libsmbclient
 
 Group:          Development/Languages
@@ -32,8 +32,6 @@ Source0:        http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
 Source2:        %{pecl_name}-phpunit.xml
 %endif
 
-Patch0:         https://patch-diff.githubusercontent.com/raw/eduardok/libsmbclient-php/pull/60.patch
-
 BuildRequires:  php-devel
 BuildRequires:  php-pear
 BuildRequires:  libsmbclient-devel > 3.6
@@ -72,8 +70,6 @@ sed -e 's/role="test"/role="src"/' \
     -i package.xml
 
 cd NTS
-%patch0 -p1 -b .pr60
-
 # Check extension version
 ver=$(sed -n '/define PHP_SMBCLIENT_VERSION/{s/.* "//;s/".*$//;p}' php_smbclient.h)
 if test "$ver" != "%{version}%{?prever}"; then
@@ -166,6 +162,9 @@ cp %{SOURCE2} phpunit.xml
 
 
 %changelog
+* Wed Dec 26 2018 Remi Collet <remi@remirepo.net> - 1.0.0-1
+- update to 1.0.0
+
 * Thu Oct 11 2018 Remi Collet <remi@remirepo.net> - 0.9.0-8
 - Rebuild for https://fedoraproject.org/wiki/Changes/php73
 - add patch for PHP 7.3 from
diff --git a/sources b/sources
index 21a515a..c416e9c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (smbclient-0.9.0.tgz) = 53a01fcd09b7c687d292dfc7604a0d2139302fcb74bc4b2bd41089e4cc926305ce67dbac4e92e38d2f814000e66a2e7c11f36d15948121fca22af43251a32c59
+SHA512 (smbclient-1.0.0.tgz) = f68dd24a229bbd8ccb06c08584e9a277cc864f062e3d308dffb136a9bfef9407f0930b022efd362b78ffa489c2770d79f69fa30f0799430813929df973e042e8