[pyftpdlib] - Update to 1.4.0 - Update spec file - Enable the test suite
Athmane Madjoudj
athmane at fedoraproject.org
Wed Dec 24 19:57:15 UTC 2014
commit c1acb8c96567e5a6a16b45e064b192c6948d0673
Author: Athmane Madjoudj <athmane at fedoraproject.org>
Date: Wed Dec 24 20:56:34 2014 +0100
- Update to 1.4.0
- Update spec file
- Enable the test suite
.gitignore | 1 +
pyftpdlib.spec | 45 +++++++++++++++++++++++----------------------
sources | 4 +---
3 files changed, 25 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fb5e444..e89b121 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
pyftpdlib-0.5.2.tar.gz
/pyftpdlib-0.6.0.tar.gz
/pyftpdlib-0.7.0.tar.gz
+/release-1.4.0.tar.gz
diff --git a/pyftpdlib.spec b/pyftpdlib.spec
index 21f69b8..43e3bd2 100644
--- a/pyftpdlib.spec
+++ b/pyftpdlib.spec
@@ -1,20 +1,15 @@
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
Name: pyftpdlib
-Version: 0.7.0
-Release: 5%{?dist}
+Version: 1.4.0
+Release: 1%{?dist}
Summary: Python FTP server library
Group: Development/Languages
License: MIT
-URL: http://code.google.com/p/pyftpdlib
-Source0: http://pyftpdlib.googlecode.com/files/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+URL: https://github.com/giampaolo/pyftpdlib
+Source0: https://github.com/giampaolo/pyftpdlib/archive/release-%{version}.tar.gz
BuildArch: noarch
-BuildRequires: python-devel
-BuildRequires: python-nose
-BuildRequires: python-setuptools
+BuildRequires: python-devel python-nose python-setuptools pysendfile
Requires: pysendfile
%description
@@ -24,31 +19,37 @@ pyftpdlib is currently the most complete RFC-959 FTP server implementation
available for Python programming language.
%prep
-%setup -q
-# Fix spurious-executable-perm warning
-find CREDITS HISTORY LICENSE README demo/ test/ -type f -exec chmod 0644 {} \;
-# Fix wrong-script-end-of-line-encoding warning
-sed -i 's/\r//' CREDITS HISTORY LICENSE README demo/* test/* pyftpdlib/ftpserver.py
+%setup -q -n pyftpdlib-release-%{version}
+
+# Remove exec bit from demo
+chmod -x demo/*
+
%build
%{__python} setup.py build
%install
-rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}
-# Fix non-executable-script error
-chmod 0755 %{buildroot}%{python_sitelib}/%{name}/ftpserver.py
-%clean
-rm -rf %{buildroot}
+# Remove shebang from libs
+sed -i '1{\@^#!/usr/bin/env python at d}' %{buildroot}%{python_sitelib}/%{name}/*.py
+sed -i '1{\@^#!/usr/bin/env python at d}' %{buildroot}%{python_sitelib}/%{name}/contrib/*.py
+
+%check
+PYTHONPATH=. %{__python} test/test_ftpd.py
+PYTHONPATH=. %{__python} test/test_contrib.py
%files
-%defattr(-,root,root,-)
-%doc CREDITS HISTORY LICENSE README demo/ test/
+%doc CREDITS HISTORY.rst LICENSE README.rst demo/
%{python_sitelib}/pyftpdlib
%{python_sitelib}/pyftpdlib-%{version}-*.egg-info
%changelog
+* Wed Dec 24 2014 Athmane Madjoudj <athmane at fedoraproject.org> 1.4.0-1
+- Update to 1.4.0
+- Update spec file
+- Enable the test suite
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index 3d18f51..dcf9e0d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-7da8e0e4abb13c6c30714ef53bd57226 pyftpdlib-0.5.2.tar.gz
-51f76e01b1514b35c0c25d98e28fec87 pyftpdlib-0.6.0.tar.gz
-b80ddda9bd75d3568076b04937e49696 pyftpdlib-0.7.0.tar.gz
+43ef0dd20d65443d296dc27f128a6998 release-1.4.0.tar.gz
More information about the scm-commits
mailing list