[s3cmd/infrastructure] update to 1.5.0-beta1 plus upstream fixes

[Matt Domsch]

commit 387263f66e847000908863311b09dbea9ad96b76
Author: Matt Domsch <matt at domsch.com>
Date:   Sun Feb 2 21:14:03 2014 -0600

    update to 1.5.0-beta1 plus upstream fixes
    
    mdomsch has assumed the role of upstream co-maintainer, and has pulled
    in these fixes to the upstream master branch.

 .gitignore |    1 +
 s3cmd.spec |   16 +++++++++++-----
 sources    |    2 +-
 3 files changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 93d7a4c..2b4f5ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /s3cmd-1.1.0-beta3-11e5755e.tar.xz
 /s3cmd-1.5.0-alpha3-b1ae0fbe.tar.xz
 /s3cmd-1.5.0-alpha3-a122d97.tar.xz
+/s3cmd-1.5.0-ec742180.tar.gz
diff --git a/s3cmd.spec b/s3cmd.spec
index e558410..1729bbd 100644
--- a/s3cmd.spec
+++ b/s3cmd.spec
@@ -1,9 +1,11 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define git a122d97
+%global commit ec7421801238671ab9f87a24fd6dc4153db3fe40
+%global shortcommit ec742180
+
 Name:           s3cmd
 Version:        1.5.0
-Release:        0.2.git%{git}%{?dist}
+Release:        0.3.git%{shortcommit}%{?dist}
 Summary:        Tool for accessing Amazon Simple Storage Service
 
 Group:          Applications/Internet
@@ -11,8 +13,9 @@ License:        GPLv2
 URL:            http://s3tools.logix.cz/s3cmd
 # git clone  git at github.com:mdomsch/s3cmd.git
 # git checkout -b origin/merge
-# git archive --format tar --prefix s3cmd-1.1.0-beta3-2dfe4a65/ HEAD | xz -c > s3cmd-1.1.0-beta3-2dfe4a65.tar.xz
-Source0:        s3cmd-1.5.0-alpha3-%{git}.tar.xz
+#git archive --format tar --prefix s3cmd-1.1.0-beta3-2dfe4a65/ HEAD | gzip -c > s3cmd-1.1.0-beta1-2dfe4a65.tar.gz
+
+Source0:        https://github.com/s3tools/s3cmd/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -33,7 +36,7 @@ command line client.
 
 
 %prep
-%setup -q -n s3cmd-1.5.0-alpha3-%{git}
+%setup -q -n s3cmd-%{commit}
 
 %build
 
@@ -61,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Feb 02 2014 Matt Domsch <mdomsch at fedoraproject.org> - 1.5.0-0.3.git
+- upstream 1.5.0-beta1 plus newer upstream fixes
+
 * Wed May 29 2013 Matt Domsch <mdomsch at fedoraproject.org> - 1.5.0-0.2.gita122d97
 - more upstream bugfixes
 - drop pyxattr dep, that codepath got dropped in this release
diff --git a/sources b/sources
index d97981d..d8467d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2cd43dc2dfe200c9ba1a4ec5caf140a5  s3cmd-1.5.0-alpha3-a122d97.tar.xz
+5f559fd2bd49c836c02300681548c9f8  s3cmd-1.5.0-ec742180.tar.gz