[s3ql] python3 work, some deps are missing

Marcel Wysocki maci at fedoraproject.org
Wed Sep 25 05:47:54 UTC 2013


commit f2b29ac899ccfd712437acec423ccf03505414b5
Author: maci <maci at satgnu.net>
Date:   Wed Sep 25 07:47:39 2013 +0200

    python3 work, some deps are missing

 .gitignore |    1 +
 s3ql.spec  |   44 +++++++++++++++++++++++---------------------
 sources    |    2 +-
 3 files changed, 25 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 612677f..839b073 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /s3ql-1.13.2.tar.bz2
+/s3ql-2.4.tar.bz2
diff --git a/s3ql.spec b/s3ql.spec
index df0dd7f..6d5c244 100644
--- a/s3ql.spec
+++ b/s3ql.spec
@@ -1,32 +1,32 @@
-%filter_provides_in %{python_sitearch}/.*\.so$ 
+%filter_provides_in %{python3_sitearch}/.*\.so$ 
 %filter_setup
 
 Name:               s3ql
-Version:            1.13.2
-Release:            2%{?dist}
+Version:            2.4
+Release:            1%{?dist}
 Summary:            Full-Featured File System for Online Data Storage
 Source0:            http://s3ql.googlecode.com/files/%{name}-%{version}.tar.bz2
 URL:                http://code.google.com/p/s3ql/
 Group:              System Environment/Base
 License:            GPLv3
 
-BuildRequires:      python-setuptools
+BuildRequires:      python3-setuptools
 BuildRequires:      pycryptopp
-BuildRequires:      python-apsw >= 3.7.0
-BuildRequires:      python-llfuse >= 0.37
+BuildRequires:      python3-apsw >= 3.7.0
+BuildRequires:      python3-llfuse >= 0.39
 BuildRequires:      pyliblzma
-BuildRequires:      python-sphinx
-BuildRequires:      Cython
-BuildRequires:      python2-devel
+BuildRequires:      python3-sphinx
+BuildRequires:      python3-Cython
+BuildRequires:      python3-devel
 BuildRequires:      sqlite-devel
 BuildRequires:      python-unittest2
-BuildRequires:      pytest
+BuildRequires:      python3-pytest
 
 Requires:           pyliblzma
 Requires:           pycryptopp
-Requires:           python-apsw >= 3.7.0
-Requires:           python-llfuse >= 0.37
-Requires:           python-setuptools
+Requires:           python3-apsw >= 3.7.0
+Requires:           python3-llfuse >= 0.38
+Requires:           python3-setuptools
 
 
 %description
@@ -55,7 +55,7 @@ rm -rf src/%{name}.egg-info
 
 
 %build
-PYTHONDONTWRITEBYTECODE= %__python ./setup.py build
+PYTHONDONTWRITEBYTECODE= %__python3 ./setup.py build
 
 %check
 # we can't test those, they use fuse and require the fuse
@@ -63,10 +63,10 @@ PYTHONDONTWRITEBYTECODE= %__python ./setup.py build
 # chrooted package build environment where we don't run
 # as root:
 rm tests/t4* tests/t5*
-%__python ./setup.py test
+%__python3 ./setup.py test
 
 %install
-%__python ./setup.py install \
+%__python3 ./setup.py install \
     --prefix="%{_prefix}" \
     --root="%{buildroot}"
 
@@ -82,11 +82,11 @@ for x in contrib/*.py; do
 done
 install -D -m0755 contrib/s3ql_backup.sh "%{buildroot}%{_bindir}/s3ql_backup"
 
-find "%{buildroot}%{python_sitearch}" -type f -name '*.py' -exec %__chmod 0644 {} \;
+find "%{buildroot}%{python3_sitearch}" -type f -name '*.py' -exec %__chmod 0644 {} \;
 # remove shebangs
-find "%{buildroot}%{python_sitearch}" -type f -name '*.py' -exec %__sed -i -e '/^#!\//, 1d' {} \;
+find "%{buildroot}%{python3_sitearch}" -type f -name '*.py' -exec %__sed -i -e '/^#!\//, 1d' {} \;
 # recompile to fix mtimes
-%__python -c 'import compileall; compileall.compile_dir("%{buildroot}%{python_sitearch}/",ddir="%{python_sitearch}/",force=True)'
+%__python3 -c 'import compileall; compileall.compile_dir("%{buildroot}%{python3_sitearch}/",ddir="%{python3_sitearch}/",force=True)'
 
 %__perl -p -i -e 's,^(%{_mandir}/man\d/.+\.\d),${1}%{ext_man},' files.lst
 
@@ -97,10 +97,12 @@ find "%{buildroot}%{python_sitearch}" -type f -name '*.py' -exec %__sed -i -e '/
 %doc Changes.txt LICENSE
 %{_bindir}/*
 %{_mandir}/man1/*
-%{python_sitearch}/%{name}*
-
+%{python3_sitearch}/%{name}*
 
 %changelog
+* Tue Sep 24 2013 Marcel Wysocki <maci at satgnu.net> - 2.4-1
+- updated to version 2.4, all python3
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.13.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 8c3b039..b4e2752 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-37bcac4a6ac61b987a207e1ff5286ef1  s3ql-1.13.2.tar.bz2
+d6041d2fe83f93bff750ff0075f3ed1b  s3ql-2.4.tar.bz2


More information about the scm-commits mailing list