[packages/s3cmd] Version: 1.6.1

jajcus jajcus at pld-linux.org
Sun Sep 18 20:41:56 CEST 2016


commit ecdfdce374fe880e2e84728bd3151b2816c81eff
Author: Jacek Konieczny <jajcus at jajcus.net>
Date:   Sun Sep 18 20:41:46 2016 +0200

    Version: 1.6.1

 file-magic.patch | 19 +++++++++++++++++++
 s3cmd.spec       | 21 ++++++++++-----------
 2 files changed, 29 insertions(+), 11 deletions(-)
---
diff --git a/s3cmd.spec b/s3cmd.spec
index 5282a9f..a898321 100644
--- a/s3cmd.spec
+++ b/s3cmd.spec
@@ -1,15 +1,16 @@
 Summary:	S3cmd tool for Amazon Simple Storage Service (S3)
 Summary(pl.UTF-8):	Narzędzie s3cmd do obsługi Amazon Simple Storage Service (S3)
 Name:		s3cmd
-Version:	1.0.1
+Version:	1.6.1
 Release:	1
 License:	GPL v2
 Group:		Applications
 Source0:	http://downloads.sourceforge.net/s3tools/%{name}-%{version}.tar.gz
-# Source0-md5:	dc62becc03a3e6100843611ebe2707c2
+# Source0-md5:	d7477e7000a98552932d23e279d69a11
+Patch0:		file-magic.patch
 URL:		http://s3tools.org/s3cmd
 BuildRequires:	python
-BuildRequires:	python-devel
+BuildRequires:	python-setuptools
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.219
 Requires:	python-modules
@@ -32,26 +33,24 @@ treści Amazon CloudFront.
 %prep
 %setup -q
 
+%patch0 -p1
+
 %build
-%{__python} setup.py build
+%py_build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__python} setup.py install \
-	--optimize=2 \
-	--root=$RPM_BUILD_ROOT
-
-%py_postclean
+%py_install
 
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/packages/%{name}
+rm -r $RPM_BUILD_ROOT%{_docdir}/packages
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README NEWS
+%doc README.md NEWS
 %attr(755,root,root) %{_bindir}/s3cmd
 %{py_sitescriptdir}/S3
 %{py_sitescriptdir}/s3cmd-%{version}-py*.egg-info
diff --git a/file-magic.patch b/file-magic.patch
new file mode 100644
index 0000000..8b14bdf
--- /dev/null
+++ b/file-magic.patch
@@ -0,0 +1,19 @@
+diff -dur s3cmd-1.6.1.orig/s3cmd.egg-info/requires.txt s3cmd-1.6.1/s3cmd.egg-info/requires.txt
+--- s3cmd-1.6.1.orig/s3cmd.egg-info/requires.txt	2016-01-20 19:13:39.000000000 +0100
++++ s3cmd-1.6.1/s3cmd.egg-info/requires.txt	2016-09-18 20:28:31.186914202 +0200
+@@ -1,2 +1,2 @@
+ python-dateutil
+-python-magic
++file-magic
+diff -dur s3cmd-1.6.1.orig/setup.py s3cmd-1.6.1/setup.py
+--- s3cmd-1.6.1.orig/setup.py	2016-01-20 19:01:08.000000000 +0100
++++ s3cmd-1.6.1/setup.py	2016-09-18 20:28:54.377099309 +0200
+@@ -102,7 +102,7 @@
+         'Topic :: Utilities',
+     ],
+ 
+-    install_requires = ["python-dateutil", "python-magic"]
++    install_requires = ["python-dateutil", "file-magic"]
+     )
+ 
+ # vim:et:ts=4:sts=4:ai
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/s3cmd.git/commitdiff/ecdfdce374fe880e2e84728bd3151b2816c81eff



More information about the pld-cvs-commit mailing list