[php-aws-sdk] update to 2.4.5

[Joseph Marrero]

commit 15f3748cf57e6029e160148cac6ef5f88efbb68c
Author: Joseph Marrero <jmarrero at fedoraproject.org>
Date:   Mon Sep 9 19:18:41 2013 -0400

    update to 2.4.5

 .gitignore                       |    1 +
 php-aws-sdk-unbundle-sfyaml.diff |   11 --------
 php-aws-sdk.spec                 |   49 +++++++++++++++----------------------
 sources                          |    2 +-
 4 files changed, 22 insertions(+), 41 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e2500ab..b086fb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /sdk-1.6.2.tgz
+/sdk-2.4.5.tgz
diff --git a/php-aws-sdk.spec b/php-aws-sdk.spec
index 061067f..af5fdbe 100644
--- a/php-aws-sdk.spec
+++ b/php-aws-sdk.spec
@@ -3,18 +3,14 @@
 %global channelname pear.amazonwebservices.com
 
 Name:		php-aws-sdk
-Version:	1.6.2
-Release:	6%{?dist}
+Version:	2.4.5
+Release:	2%{?dist}
 Summary:	Amazon Web Services framework for PHP
 
-#The entire source code is ASL 2.0 except lib/cachecore/ and lib/requestcore/ which are BSD and lib/dom/ which is MIT
-License:	ASL 2.0 and BSD and MIT
+License:	ASL 2.0
 URL:		http://aws.amazon.com/sdkforphp/
 Source0:	http://pear.amazonwebservices.com/get/sdk-%{version}.tgz
 
-# integration patches
-Patch10:	%{name}-unbundle-sfyaml.diff
-
 BuildArch:	noarch
 BuildRequires:	php-pear(PEAR)
 BuildRequires:	php-channel(%{channelname})
@@ -42,7 +38,7 @@ Requires:	php-pcre
 Requires:	php-session
 Requires:	php-sqlite3
 Requires:	php-pear(pear.symfony-project.com/YAML)
-
+Requires:	php-guzzle-Guzzle
 Provides:	php-pear(%{pear_name}) = %{version}
 Provides:	php-pear(%{channelname}/%{pear_name}) = %{version}
 
@@ -51,35 +47,27 @@ Amazon Web Services SDK for PHP enables developers to build solutions for
 Amazon Simple Storage Service (Amazon S3), Amazon Elastic Compute Cloud 
 (Amazon EC2), Amazon SimpleDB, and more.
 
-
 %prep
 %setup -q -c
 [ -f package2.xml ] || mv package.xml package2.xml
 
 # fix doc roles
 sed -e '/_samples/s/role="php"/role="doc"/' \
-	-e '/lib\/yaml/d' \
-	-e '/sdk.class.php/s/md5sum="[0-9,a-z]\{32\}"//' \
-	-e '/_docs/s/role="php"/role="doc"/' \
-	-e '/_compatibility_test/s/role="php"/role="doc"/' \
-	-e '/_sql/s/role="php"/role="doc"/' \
-	-e '/LICENSE/s/role="php"/role="doc"/' \
-	-e '/README/s/role="php"/role="doc"/' \
-	package2.xml >%{pear_name}-%{version}/%{name}.xml
-
-
-cd %{pear_name}-%{version}
-# unbundle
-rm -rf lib/yaml
-
-%patch10
-
-
+        -e '/sdk.class.php/s/md5sum="[0-9,a-z]\{32\}"//' \
+        -e '/_docs/s/role="php"/role="doc"/' \
+        -e '/_compatibility_test/s/role="php"/role="doc"/' \
+        -e '/_sql/s/role="php"/role="doc"/' \
+        -e '/LICENSE/s/role="php"/role="doc"/' \
+        -e '/README/s/role="php"/role="doc"/' \
+        package2.xml >%{pear_name}-%{version}/%{name}.xml
+
+#remove aws.phar
+rm %{pear_name}-%{version}/aws.phar
 %build
 # Empty build section, most likely nothing required.
 
-
 %install
+
 cd %{pear_name}-%{version}
 %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
@@ -107,15 +95,18 @@ fi
 
 
 %files
-%doc %{pear_docdir}/%{pear_name}
 %{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/AWSSDKforPHP/
 
 
 %changelog
+* Mon Sep 09 2013 Joseph Marrero <jmarrero at fedoraproject.org> - 2.4.5-2
+- add guzzle dependency.
+- remove aws.phar file
+* Thu Sep 05 2013 Joseph Marrero <jmarrero at fedoraproject.org> - 2.4.5-1
+- Update to 2.4.5
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
 * Wed May 08 2013 Gregor Tätzner <brummbq at fedoraproject.org> - 1.6.2-5
 - unbundle sfyaml
 - fix requires
diff --git a/sources b/sources
index 071e109..641e81f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-82614299b4b72724f9f2760bb1fbd79d  sdk-1.6.2.tgz
+c69acf76977ec754853ea243987c110e  sdk-2.4.5.tgz