[php-aws-sdk] Updated to 2.6.15 (BZ #1126610)
Shawn Iwinski
siwinski at fedoraproject.org
Fri Aug 15 13:59:05 UTC 2014
commit 512e81d86b642ab033571a9e730f3bdb9638ca75
Author: Shawn Iwinski <shawn.iwinski at gmail.com>
Date: Fri Aug 15 09:58:29 2014 -0400
Updated to 2.6.15 (BZ #1126610)
- PEAR install changed to Composer-ish install
.gitignore | 1 +
php-aws-sdk.spec | 195 +++++++++++++++++++++++++++++++-----------------------
sources | 2 +-
3 files changed, 114 insertions(+), 84 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7cabcef..61b156a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/sdk-2.5.2.tgz
/sdk-2.5.3.tgz
/sdk-2.6.1.tgz
+/php-aws-sdk-2.6.15-4eaf38f0297533d48f013be7e1ffa1cb2c912e2f.tar.gz
diff --git a/php-aws-sdk.spec b/php-aws-sdk.spec
index 2532959..de57206 100644
--- a/php-aws-sdk.spec
+++ b/php-aws-sdk.spec
@@ -1,107 +1,120 @@
-%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%global pear_name %(echo %{name} | sed -e 's/^php-aws-//' -e 's/-/_/g')
-%global channelname pear.amazonwebservices.com
-
-Name: php-aws-sdk
-Version: 2.6.1
-Release: 3%{?dist}
-Summary: Amazon Web Services framework for PHP
-
-License: ASL 2.0
-URL: http://aws.amazon.com/sdkforphp/
-Source0: http://pear.amazonwebservices.com/get/sdk-%{version}.tgz
-
-BuildArch: noarch
-BuildRequires: php-pear(PEAR)
-BuildRequires: php-channel(%{channelname})
-
-Requires(post): %{__pear}
-Requires(postun): %{__pear}
-
-Requires: php-common >= 5.2
-Requires: php-pear(PEAR)
-Requires: php-channel(%{channelname})
-Requires: php-pdo
-Requires: php-reflection
-Requires: php-spl
-Requires: php-simplexml
-Requires: php-ctype
-Requires: php-curl
-Requires: php-date
-Requires: php-dom
-Requires: php-hash
-Requires: php-json
-Requires: php-libxml
-Requires: php-mbstring
-Requires: php-openssl
-Requires: php-pcre
-Requires: php-session
-Requires: php-sqlite3
-Requires: php-Monolog
-Requires: php-Monolog-dynamo
-Requires: php-symfony-yaml
-Requires: php-guzzle-Guzzle >= 3.7.0
-Requires: php-guzzle-Guzzle < 3.9.9
-Provides: php-pear(%{pear_name}) = %{version}
-Provides: php-pear(%{channelname}/%{pear_name}) = %{version}
+#
+# RPM spec file for php-aws-sdk
+#
+# Copyright (c) 2013-2014 Joseph Marrero <jmarrero at fedoraproject.org>
+# Gregor Tätzner <brummbq at fedoraproject.org>
+# Shawn Iwinski <shawn.iwinski at gmail.com>
+#
+# License: MIT
+# http://opensource.org/licenses/MIT
+#
+# Please preserve changelog entries
+#
+
+%global github_owner aws
+%global github_name aws-sdk-php
+%global github_version 2.6.15
+%global github_commit 4eaf38f0297533d48f013be7e1ffa1cb2c912e2f
+
+%global composer_vendor aws
+%global composer_project aws-sdk-php
+
+%global pear_channel pear.amazonwebservices.com
+%global pear_name sdk
+
+# "php": ">=5.3.3"
+%global php_min_ver 5.3.3
+# "guzzle/guzzle": ">=3.7.0,<=3.9.9"
+%global guzzle_min_ver 3.7.0
+%global guzzle_max_ver 3.9.9
+
+Name: php-aws-sdk
+Version: %{github_version}
+Release: 1%{?dist}
+Summary: Amazon Web Services framework for PHP
+
+Group: Development/Libraries
+License: ASL 2.0
+URL: http://aws.amazon.com/sdk-for-php/
+Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz
+
+BuildArch: noarch
+
+# composer.json
+Requires: php(language) >= %{php_min_ver}
+Requires: php-guzzle-Guzzle >= %{guzzle_min_ver}
+Requires: php-guzzle-Guzzle < %{guzzle_max_ver}
+# composer.json: optional
+Requires: php-composer(doctrine/cache)
+Requires: php-composer(monolog/monolog)
+Requires: php-openssl
+Requires: php-symfony-yaml
+# phpcompatinfo (computed from version 2.6.15)
+Requires: php-curl
+Requires: php-date
+Requires: php-hash
+Requires: php-json
+Requires: php-openssl
+Requires: php-pcre
+Requires: php-reflection
+Requires: php-session
+Requires: php-simplexml
+Requires: php-spl
+
+# Composer
+Provides: php-composer(%{composer_vendor}/%{composer_project}) = %{version}
+# PEAR
+Provides: php-pear(%{pear_channel}/%{pear_name}) = %{version}
%description
-Amazon Web Services SDK for PHP enables developers to build solutions for
-Amazon Simple Storage Service (Amazon S3), Amazon Elastic Compute Cloud
+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 '/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
+%setup -qn %{github_name}-%{github_commit}
+
+# Fix rpmlint issues:
+# W: spurious-executable-perm /usr/share/doc/php-aws-sdk/composer.json
+# E: script-without-shebang /usr/share/php/Aws/DynamoDb/Model/BatchRequest/WriteRequestBatchTransfer.php
+chmod a-x composer.json src/Aws/DynamoDb/Model/BatchRequest/WriteRequestBatchTransfer.php
+
%build
# Empty build section, most likely nothing required.
-%install
-cd %{pear_name}-%{version}
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
+%install
+mkdir -pm 0755 %{buildroot}%{_datadir}/php
+cp -pr src/* %{buildroot}%{_datadir}/php/
-# Clean up unnecessary files
-rm $RPM_BUILD_ROOT%{pear_phpdir}/AWSSDKforPHP/aws.phar
-%if 0%{?rhel}
-rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
-%else
-rm -rf $RPM_BUILD_ROOT%{pear_metadir}/.??*
-%endif
-# Install XML package description
-mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+%check
+# Tests skipped because "Guzzle\Tests\GuzzleTestCase" is not provided by the
+# php-guzzle-Guzzle package
%post
-%{__pear} install --nodeps --soft --force --register-only \
- %{pear_xmldir}/%{name}.xml >/dev/null || :
-
-%postun
-if [ $1 -eq 0 ] ; then
- %{__pear} uninstall --nodeps --ignore-errors --register-only \
- %{pear_name} >/dev/null || :
+# Unregister PEAR pkg (ignore errors if it was not registered)
+if [ -x %{_bindir}/pear ]; then
+ %{_bindir}/pear uninstall --nodeps --ignore-errors --register-only \
+ %{pear_channel}/%{pear_name} >/dev/null || :
fi
%files
-%{pear_xmldir}/%{name}.xml
-%{pear_phpdir}/AWSSDKforPHP/
+%{!?_licensedir:%global license %%doc}
+%license LICENSE.md
+%doc CHANGELOG.md README.md UPGRADING.md composer.json
+%{_datadir}/php/Aws
%changelog
+* Fri Aug 15 2014 Shawn Iwinski <shawn.iwinski at gmail.com> - 2.6.15-1
+- Updated to 2.6.15 (BZ #1126610)
+- PEAR install changed to Composer-ish install
+
* Mon Aug 04 2014 Shawn Iwinski <shawn.iwinski at gmail.com> - 2.6.1-3
- Fix php-guzzle-Guzzle max version (3.9.0 => 3.9.9)
@@ -110,44 +123,60 @@ fi
* Sun May 04 2014 Joseph Marrero <jmarrero at fedoraproject.org> - 2.6.1-1
- Update to latest upstream release
+
* Sun Mar 16 2014 Joseph Marrero <jmarrero at fedoraproject.org> - 2.5.3-1
- Update to latest upstream release
+
* Fri Feb 21 2014 Joseph Marrero <jmarrero at fedoraproject.org> - 2.5.2-1
- Update to latest upstream release
+
* Fri Jan 03 2014 Joseph Marrero <jmarrero at fedoraproject.org> - 2.5.0-5
- Remove the aws.phar with other uneaded files on %%install
+
* Fri Jan 03 2014 Joseph Marrero <jmarrero at fedoraproject.org> - 2.5.0-4
- Keep the aws.phar file for workaround on install
+
* Thu Jan 02 2014 Joseph Marrero <jmarrero at fedoraproject.org> - 2.5.0-3
- Fix file installation
+
* Mon Dec 30 2013 Joseph Marrero <jmarrero at fedoraproject.org> - 2.5.0-2
- add php-Monolog-dynamo dependency
- update naming on dependency php-symfony-yaml
- fix max version require on guzzle dependency
+
* Sun Dec 29 2013 Joseph Marrero <jmarrero at fedoraproject.org> - 2.5.0-1
- update to latest upstrean version
+
* Mon Nov 18 2013 Joseph Marrero <jmarrero at fedoraproject.org> - 2.4.10-1
- update to latest upstream version
- add php-symfony2-Yaml(version2) and php-Monolog
- remove dependency php-symfony2-YAML(version1)
- set version contraint for php-guzzle-Guzzle dependency
+
* 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
- mark doc in package.xml
+
* Wed May 01 2013 Joseph Marrero <jmarrero at fedoraproject.org> - 1.6.2-4
- Add dependencies
- Add license clarification
+
* Tue Apr 30 2013 Joseph Marrero <jmarrero at fedoraproject.org> - 1.6.2-3
-- Fix Source, remove empty folder _doc
+- Fix Source, remove empty folder _doc
+
* Mon Apr 29 2013 Joseph Marrero <jmarrero at fedoraproject.org> - 1.6.2-2
- Fix License, Fix Description, move doc files
+
* Mon Apr 29 2013 Joseph Marrero <jmarrero at fedoraproject.org> - 1.6.2-1
- initial package
diff --git a/sources b/sources
index 292d74d..bbdf2ac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c25a07cb8fbea4fcd6eff7142fd7a12e sdk-2.6.1.tgz
+d9e190c2fd278423625ed030fde6897c php-aws-sdk-2.6.15-4eaf38f0297533d48f013be7e1ffa1cb2c912e2f.tar.gz
More information about the scm-commits
mailing list