v6.3.3 from Fedora:

* Mon Apr 23 2018 Shawn Iwinski <shawn@iwin.ski> - 6.3.3-1
 Update to 6.3.3 (RHBZ #1560991)
- Update get source script to save source in same directory
- Add range version dependencies for Fedora >= 27 || RHEL >= 8
- Add composer.json to rep

2 files changed, 35 insertions, 24 deletions

diff --git a/composer.json b/composer.json
index 65687a5..1f328e3 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
     },
     "require-dev": {
         "ext-curl": "*",
-        "phpunit/phpunit": "^4.0 || ^5.0",
+        "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
         "psr/log": "^1.0"
     },
     "autoload": {
@@ -38,7 +38,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "6.2-dev"
+            "dev-master": "6.3-dev"
         }
     }
 }
diff --git a/php-guzzlehttp-guzzle6.spec b/php-guzzlehttp-guzzle6.spec
index 147d443..725588a 100644
--- a/php-guzzlehttp-guzzle6.spec
+++ b/php-guzzlehttp-guzzle6.spec
@@ -2,7 +2,7 @@
 #
 # Fedora spec file for php-guzzlehttp-guzzle6
 #
-# Copyright (c) 2015-2017 Shawn Iwinski <shawn@iwin.ski>
+# Copyright (c) 2015-2018 Shawn Iwinski <shawn@iwin.ski>
 #
 # License: MIT
 # http://opensource.org/licenses/MIT
@@ -12,8 +12,8 @@
 
 %global github_owner     guzzle
 %global github_name      guzzle
-%global github_version   6.3.0
-%global github_commit    f4db5a78a5ea468d4831de7f0bf9d9415e348699
+%global github_version   6.3.3
+%global github_commit    407b0cb880ace85c9b63c5f9551db498cb2d50ba
 
 %global composer_vendor  guzzlehttp
 %global composer_project guzzle
@@ -39,7 +39,7 @@
 
 Name:          php-%{composer_vendor}-%{composer_project}6
 Version:       %{github_version}
-Release:       3%{?github_release}%{?dist}
+Release:       1%{?github_release}%{?dist}
 Summary:       PHP HTTP client library
 
 Group:         Development/Libraries
@@ -51,29 +51,30 @@ URL:           http://guzzlephp.org
 Source0:       %{name}-%{github_version}-%{github_commit}.tar.gz
 Source1:       %{name}-get-source.sh
 
-# [ClientInterface] Fix VERSION for 6.3.0 release
-# https://github.com/guzzle/guzzle/pull/1864
-# https://github.com/guzzle/guzzle/pull/1864.patch
-Patch0:        %{name}-upstream-pull-1864.patch
-
 BuildArch:     noarch
 # Library version value and autoloader check
 BuildRequires: php-cli
 ## composer.json
 BuildRequires: php(language) >= %{php_min_ver}
-BuildRequires: php-composer(guzzlehttp/promises) >= %{promises_min_ver}
+BuildRequires: php-composer(phpunit/phpunit)
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires: (php-composer(guzzlehttp/promises) >= %{promises_min_ver} with php-composer(guzzlehttp/promises) < %{promises_max_ver})
+BuildRequires: (php-composer(guzzlehttp/psr7) >= %{psr7_min_ver} with php-composer(guzzlehttp/psr7) < %{psr7_max_ver})
+BuildRequires: (php-composer(psr/log) >= %{psr_log_min_ver} with php-composer(psr/log) < %{psr_log_max_ver})
+%else
 BuildRequires: php-composer(guzzlehttp/promises) <  %{promises_max_ver}
-BuildRequires: php-composer(guzzlehttp/psr7) >= %{psr7_min_ver}
+BuildRequires: php-composer(guzzlehttp/promises) >= %{promises_min_ver}
 BuildRequires: php-composer(guzzlehttp/psr7) <  %{psr7_max_ver}
-BuildRequires: php-composer(phpunit/phpunit)
-BuildRequires: php-composer(psr/log) >= %{psr_log_min_ver}
+BuildRequires: php-composer(guzzlehttp/psr7) >= %{psr7_min_ver}
 BuildRequires: php-composer(psr/log) <  %{psr_log_max_ver}
+BuildRequires: php-composer(psr/log) >= %{psr_log_min_ver}
+%endif
 ## Autoloader
 BuildRequires: php-composer(fedora/autoloader)
 # Tests
 %if %{with_tests}
 BuildRequires: nodejs
-## phpcompatinfo (computed from version 6.3.0)
+## phpcompatinfo (computed from version 6.3.3)
 BuildRequires: php-curl
 BuildRequires: php-date
 BuildRequires: php-filter
@@ -88,14 +89,21 @@ BuildRequires: php-zlib
 Requires:      ca-certificates
 # composer.json
 Requires:      php(language) >= %{php_min_ver}
-Requires:      php-composer(guzzlehttp/promises) >= %{promises_min_ver}
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires:      (php-composer(guzzlehttp/promises) >= %{promises_min_ver} with php-composer(guzzlehttp/promises) < %{promises_max_ver})
+Requires:      (php-composer(guzzlehttp/psr7) >= %{psr7_min_ver} with php-composer(guzzlehttp/psr7) < %{psr7_max_ver})
+# composer.json: optional
+Requires:      (php-composer(psr/log) >= %{psr_log_min_ver} with php-composer(psr/log) < %{psr_log_max_ver})
+%else
 Requires:      php-composer(guzzlehttp/promises) <  %{promises_max_ver}
-Requires:      php-composer(guzzlehttp/psr7) >= %{psr7_min_ver}
+Requires:      php-composer(guzzlehttp/promises) >= %{promises_min_ver}
 Requires:      php-composer(guzzlehttp/psr7) <  %{psr7_max_ver}
+Requires:      php-composer(guzzlehttp/psr7) >= %{psr7_min_ver}
 # composer.json: optional
-Requires:      php-composer(psr/log) >= %{psr_log_min_ver}
 Requires:      php-composer(psr/log) <  %{psr_log_max_ver}
-# phpcompatinfo (computed from version 6.3.0)
+Requires:      php-composer(psr/log) >= %{psr_log_min_ver}
+%endif
+# phpcompatinfo (computed from version 6.3.3)
 Requires:      php-curl
 Requires:      php-date
 Requires:      php-filter
@@ -129,9 +137,6 @@ Autoloader: %{phpdir}/GuzzleHttp6/autoload.php
 %prep
 %setup -qn %{github_name}-%{github_commit}
 
-: [ClientInterface] Fix VERSION for 6.3.0 release
-%patch0 -p1
-
 
 %build
 : Create common autoloader
@@ -144,9 +149,9 @@ cat <<'AUTOLOAD' | tee src/autoload.php
 require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
 
 \Fedora\Autoloader\Autoload::addPsr4('GuzzleHttp\\', __DIR__);
-require_once __DIR__.'/functions_include.php';
 
 \Fedora\Autoloader\Dependencies::required([
+    __DIR__.'/functions_include.php',
     '%{phpdir}/GuzzleHttp/Promise/autoload.php',
     '%{phpdir}/GuzzleHttp/Psr7/autoload.php',
     '%{phpdir}/Psr/Log/autoload.php',
@@ -204,6 +209,12 @@ exit $RETURN_CODE
 
 
 %changelog
+* Mon Apr 23 2018 Shawn Iwinski <shawn@iwin.ski> - 6.3.3-1
+- Update to 6.3.3 (RHBZ #1560991)
+- Update get source script to save source in same directory
+- Add range version dependencies for Fedora >= 27 || RHEL >= 8
+- Add composer.json to repo
+
 * Fri Jul 07 2017 Shawn Iwinski <shawn@iwin.ski> - 6.3.0-3
 - Fix %%check to fail when upstream tests fail