[php-guzzlehttp-guzzle] Updated to 4.1.4 (BZ #1124226)

[Shawn Iwinski]

commit 802dc9a2585fd922205c5238b3296fa9ff051787
Author: Shawn Iwinski <siwinski at redhat.com>
Date:   Wed Jul 30 15:23:10 2014 -0400

    Updated to 4.1.4 (BZ #1124226)
    
    - Added %license usage

 .gitignore                 |    1 +
 php-guzzlehttp-guzzle.spec |   40 ++++++++++++++++++++++++++++++----------
 sources                    |    2 +-
 3 files changed, 32 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 98f226b..f09a603 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /php-guzzlehttp-guzzle-4.1.2-095cf4db559bebc78d967890eb93280d8ceb5a08.tar.gz
+/php-guzzlehttp-guzzle-4.1.4-5ae164dae6e65784286a698800190bc094407f7c.tar.gz
diff --git a/php-guzzlehttp-guzzle.spec b/php-guzzlehttp-guzzle.spec
index 61cbe14..f777f52 100644
--- a/php-guzzlehttp-guzzle.spec
+++ b/php-guzzlehttp-guzzle.spec
@@ -1,15 +1,26 @@
+#
+# RPM spec file for php-guzzlehttp-guzzle
+#
+# Copyright (c) 2014 Shawn Iwinski <shawn.iwinski at gmail.com>
+#
+# License: MIT
+# http://opensource.org/licenses/MIT
+#
+# Please preserve changelog entries
+#
+
 %global github_owner     guzzle
 %global github_name      guzzle
-%global github_version   4.1.2
-%global github_commit    095cf4db559bebc78d967890eb93280d8ceb5a08
+%global github_version   4.1.4
+%global github_commit    5ae164dae6e65784286a698800190bc094407f7c
 
 %global composer_vendor  guzzlehttp
 %global composer_project guzzle
 
 # "php": ">=5.4.0"
 %global php_min_ver      5.4.0
-# "guzzlehttp/streams": "~1.0"
-%global streams_min_ver  1.0
+# "guzzlehttp/streams": "~1.4"
+%global streams_min_ver  1.4
 %global streams_max_ver  2.0
 # "psr/log": "~1.0"
 %global psr_log_min_ver  1.0
@@ -41,7 +52,7 @@ BuildRequires: php-composer(psr/log) <  %{psr_log_max_ver}
 BuildRequires: php-phpunit-PHPUnit
 BuildRequires: php-curl
 BuildRequires: php-json
-# For tests: phpcompatinfo (computed from version 4.1.2)
+# For tests: phpcompatinfo (computed from version 4.1.4)
 BuildRequires: php-date
 BuildRequires: php-filter
 BuildRequires: php-libxml
@@ -57,8 +68,9 @@ Requires:      php(language) >= %{php_min_ver}
 Requires:      php-composer(guzzlehttp/streams) >= %{streams_min_ver}
 Requires:      php-composer(guzzlehttp/streams) <  %{streams_max_ver}
 Requires:      php-json
-# phpcompatinfo (computed from version 4.1.2)
+# composer.json: optional
 Requires:      php-curl
+# phpcompatinfo (computed from version 4.1.4)
 Requires:      php-date
 Requires:      php-filter
 Requires:      php-libxml
@@ -121,9 +133,6 @@ mkdir vendor
 cat > vendor/autoload.php <<'AUTOLOAD'
 <?php
 
-require_once '%{_datadir}/php/GuzzleHttp/Stream/functions.php';
-require_once __DIR__ . '/../src/functions.php';
-
 spl_autoload_register(function ($class) {
     $src = str_replace(array('\\', '_'), '/', $class).'.php';
     if (!@include_once $src) {
@@ -132,21 +141,32 @@ spl_autoload_register(function ($class) {
         @include_once $psr4_src;
     }
 });
+
+require_once '%{_datadir}/php/GuzzleHttp/Stream/functions.php';
+require_once __DIR__ . '/../src/functions.php';
 AUTOLOAD
 
 # Create PHPUnit config w/ colors turned off
 sed 's/colors\s*=\s*"true"/colors="false"/' phpunit.xml.dist > phpunit.xml
 
 %{_bindir}/phpunit --include-path="./src:./tests" -d date.timezone="UTC"
+%else
+: Tests skipped
 %endif
 
 
 %files
-%doc LICENSE *.md composer.json
+%{!?_licensedir:%global license %%doc}
+%license LICENSE
+%doc *.md composer.json
 %{_datadir}/php/GuzzleHttp/*
 
 
 %changelog
+* Wed Jul 30 2014 Shawn Iwinski <shawn.iwinski at gmail.com> - 4.1.4-1
+- Updated to 4.1.4 (BZ #1124226)
+- Added %%license usage
+
 * Sun Jun 29 2014 Shawn Iwinski <shawn.iwinski at gmail.com> - 4.1.2-1
 - Updated to 4.1.2
 
diff --git a/sources b/sources
index abdf4df..5198515 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-92df018801e28472188454cfd7deb9df  php-guzzlehttp-guzzle-4.1.2-095cf4db559bebc78d967890eb93280d8ceb5a08.tar.gz
+561876c144c35208ec80152c017f96f6  php-guzzlehttp-guzzle-4.1.4-5ae164dae6e65784286a698800190bc094407f7c.tar.gz