Hello community, here is the log from the commit of package duplicity for openSUSE:Factory checked in at 2018-08-29 12:27:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/duplicity (Old) and /work/SRC/openSUSE:Factory/.duplicity.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "duplicity" Wed Aug 29 12:27:08 2018 rev:42 rq:632078 version:0.7.18.1 Changes: -------- --- /work/SRC/openSUSE:Factory/duplicity/duplicity.changes 2018-08-24 17:11:07.442572071 +0200 +++ /work/SRC/openSUSE:Factory/.duplicity.new/duplicity.changes 2018-08-29 12:27:12.343660151 +0200 @@ -1,0 +2,19 @@ +Tue Aug 28 13:18:58 UTC 2018 - mplus...@suse.com + +- Cleanup spec file a bit +- Use modern python macros +- Drop no-longer needed duplicity-rpmlintrc +- Reduce duplicities +- Split lang subpackage + +------------------------------------------------------------------- +Tue Aug 28 11:35:14 UTC 2018 - mvet...@suse.com + +- Update to 0.7.18: + * Fixed bug #1788558 + Treat None as zero when printing log. + * Revert fix for bug #1788599. + Was causing problems with directory names +- Update duplicity-remove_shebang.patch + +------------------------------------------------------------------- Old: ---- duplicity-0.7.18.tar.gz duplicity-rpmlintrc New: ---- duplicity-0.7.18.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ duplicity.spec ++++++ --- /var/tmp/diff_new_pack.45Gtt7/_old 2018-08-29 12:27:12.879661330 +0200 +++ /var/tmp/diff_new_pack.45Gtt7/_new 2018-08-29 12:27:12.883661338 +0200 @@ -12,35 +12,31 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: duplicity -Version: 0.7.18 +Version: 0.7.18.1 Release: 0 Summary: Encrypted bandwidth-efficient backup using the rsync algorithm License: GPL-3.0-or-later Group: Productivity/Archiving/Backup -Url: http://duplicity.nongnu.org/ +URL: http://duplicity.nongnu.org/ Source: https://code.launchpad.net/%{name}/0.7-series/%{version}/+download/%{name}-%{version}.tar.gz -Source99: duplicity-rpmlintrc Patch1: duplicity-remove_shebang.patch -BuildRequires: python-devel -BuildRequires: python-setuptools +BuildRequires: %{python_module devel} +BuildRequires: %{python_module setuptools} +BuildRequires: fdupes +BuildRequires: librsync-devel >= 0.9.6 +BuildRequires: python-rpm-macros Requires: gpg +Requires: python2-fasteners +Requires: python2-lockfile +Recommends: %{name}-lang Recommends: lftp -Requires: python-fasteners -Requires: python-lockfile -Recommends: python-boto -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} > 1210 -BuildRequires: librsync-devel >= 0.9.6 -%else -BuildRequires: librsync >= 0.9.6 -%endif +Recommends: python2-boto3 %description Duplicity incrementally backs up files and directories by encrypting @@ -55,26 +51,32 @@ permissions, directories, symbolic links, fifos, etc., but not hard links. +%lang_package + %prep %setup -q %patch1 -p1 %build -python setup.py build +%python2_build %install -python setup.py install --prefix=/usr --root=%{buildroot} --record-rpm=files.lst +%python2_install rm -rf %{buildroot}%{_datadir}/doc/duplicity-%{version} perl -n -i -e 'print unless m,(%{_bindir}|%{_mandir}|%{_datadir}/doc|%{_datadir}/locale|%{python_sitearch}/testing),' files.lst %find_lang %{name} -cat %{name}.lang files.lst > rpmfiles.lst +%fdupes %{buildroot}%{python2_sitearch} -%files -f rpmfiles.lst -%defattr(-,root,root) -%doc CHANGELOG COPYING README +%files +%license COPYING +%doc CHANGELOG README %{_bindir}/duplicity %{_bindir}/rdiffdir -%doc %{_mandir}/man1/duplicity.1%{ext_man} -%doc %{_mandir}/man1/rdiffdir.1%{ext_man} +%{python2_sitearch}/duplicity +%{python2_sitearch}/duplicity-%{version}-py%{py2_ver}.egg-info +%{_mandir}/man1/duplicity.1%{?ext_man} +%{_mandir}/man1/rdiffdir.1%{?ext_man} + +%files lang -f %{name}.lang %changelog ++++++ duplicity-0.7.18.tar.gz -> duplicity-0.7.18.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/duplicity-0.7.18/CHANGELOG new/duplicity-0.7.18.1/CHANGELOG --- old/duplicity-0.7.18/CHANGELOG 2018-08-21 21:57:45.000000000 +0200 +++ new/duplicity-0.7.18.1/CHANGELOG 2018-08-27 16:13:39.000000000 +0200 @@ -1,3 +1,11 @@ +New in v0.7.18.1 (2018/08/27) +----------------------------- +* Fixed bug #1788558 + - Treat None as zero when printing log. +* Revert fix for bug #1788599. + - Was causing problems with directory names + + New in v0.7.18 (2018/08/21) --------------------------- * Fixed bug #1756550 Online html man page is showing a 0 byte file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/duplicity-0.7.18/Changelog.GNU new/duplicity-0.7.18.1/Changelog.GNU --- old/duplicity-0.7.18/Changelog.GNU 2018-08-21 22:09:27.000000000 +0200 +++ new/duplicity-0.7.18.1/Changelog.GNU 2018-08-27 16:22:31.000000000 +0200 @@ -1,5 +1,16 @@ 2018-08-21 Kenneth Loafman <kenn...@loafman.com> + * Prep for 0.7.18.1 + +2018-08-21 Kenneth Loafman <kenn...@loafman.com> + + * Fixed bug #1788558 + - Treat None as zero when printing log. + * Revert fix for bug #1788599. + - Was causing problems with directory names + +2018-08-21 Kenneth Loafman <kenn...@loafman.com> + * Fix a 2to3 error in ssh_paramiko_backend.py * Merged in lp:~duplicity-team/duplicity/po-updates * Prep for 0.7.18 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/duplicity-0.7.18/bin/duplicity new/duplicity-0.7.18.1/bin/duplicity --- old/duplicity-0.7.18/bin/duplicity 2018-08-21 22:16:03.000000000 +0200 +++ new/duplicity-0.7.18.1/bin/duplicity 2018-08-27 16:26:05.000000000 +0200 @@ -2,7 +2,7 @@ # -*- Mode:Python; indent-tabs-mode:nil; tab-width:4 -*- # # duplicity -- Encrypted bandwidth efficient backup -# Version 0.7.18 released August 21, 2018 +# Version 0.7.18.1 released August 27, 2018 # # Copyright 2002 Ben Escoto <b...@emerose.org> # Copyright 2007 Kenneth Loafman <kenn...@loafman.com> @@ -65,15 +65,6 @@ if '--pydevd' in sys.argv or os.getenv('PYDEVD', None): - # The following is for starting remote debugging in Eclipse with Pydev. - # Adjust the path to your location and version of Eclipse and Pydev. - if platform.platform().startswith('Linux'): - pysrc = "/opt/liclipse/plugins/org.python.pydev_5.7.0.201704111135/pysrc" - elif platform.platform().startswith('Darwin'): - pysrc = "/Applications/LiClipse.app/Contents/liclipse/plugins/org.python.pydev_5.7.0.201704111135/pysrc" - else: - raise Exception("Platform %s not supported by pydevd." % platform.platform()) - sys.path.append(pysrc) import pydevd # @UnresolvedImport pydevd.settrace() # In a dev environment the path is screwed so fix it. @@ -333,8 +324,10 @@ size = info['size'] if size == orig_size: break - log.Notice(_("Remote filesize %d for %s does not match local size %d, retrying.") % (size, - util.escape(dest_filename), orig_size)) + log.Notice(_("Remote filesize %d for %s does not match local size %d, retrying.") % + (0 if size is None else size, + util.escape(dest_filename), + orig_size)) time.sleep(1 + (attempt * 0.5)) if size is None: return # error querying file @@ -1295,7 +1288,7 @@ log Python, duplicity, and system versions """ log.Log(u'=' * 80, verbosity) - log.Log(u"duplicity 0.7.18 (August 21, 2018)", verbosity) + log.Log(u"duplicity 0.7.18.1 (August 27, 2018)", verbosity) log.Log(u"Args: %s" % util.ufn(' '.join(sys.argv)), verbosity) log.Log(u' '.join(platform.uname()), verbosity) log.Log(u"%s %s" % (sys.executable or sys.platform, sys.version), verbosity) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/duplicity-0.7.18/bin/duplicity.1 new/duplicity-0.7.18.1/bin/duplicity.1 --- old/duplicity-0.7.18/bin/duplicity.1 2018-08-21 22:16:03.000000000 +0200 +++ new/duplicity-0.7.18.1/bin/duplicity.1 2018-08-27 16:26:05.000000000 +0200 @@ -1,4 +1,4 @@ -.TH DUPLICITY 1 "August 21, 2018" "Version 0.7.18" "User Manuals" \" -*- nroff -*- +.TH DUPLICITY 1 "August 27, 2018" "Version 0.7.18.1" "User Manuals" \" -*- nroff -*- .\" disable justification (adjust text to left margin only) .\" command line examples stay readable through that .ad l diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/duplicity-0.7.18/bin/rdiffdir new/duplicity-0.7.18.1/bin/rdiffdir --- old/duplicity-0.7.18/bin/rdiffdir 2018-08-21 22:16:03.000000000 +0200 +++ new/duplicity-0.7.18.1/bin/rdiffdir 2018-08-27 16:26:05.000000000 +0200 @@ -1,6 +1,6 @@ #!/usr/bin/env python2 # rdiffdir -- Extend rdiff functionality to directories -# Version 0.7.18 released August 21, 2018 +# Version 0.7.18.1 released August 27, 2018 # # Copyright 2002 Ben Escoto <b...@emerose.org> # Copyright 2007 Kenneth Loafman <kenn...@loafman.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/duplicity-0.7.18/bin/rdiffdir.1 new/duplicity-0.7.18.1/bin/rdiffdir.1 --- old/duplicity-0.7.18/bin/rdiffdir.1 2018-08-21 22:16:03.000000000 +0200 +++ new/duplicity-0.7.18.1/bin/rdiffdir.1 2018-08-27 16:26:05.000000000 +0200 @@ -1,4 +1,4 @@ -.TH RDIFFDIR 1 "August 21, 2018" "Version 0.7.18" "User Manuals" \" -*- nroff -*- +.TH RDIFFDIR 1 "August 27, 2018" "Version 0.7.18.1" "User Manuals" \" -*- nroff -*- .\" disable justification (adjust text to left margin only) .\" command line examples stay readable through that .ad l diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/duplicity-0.7.18/duplicity/backends/b2backend.py new/duplicity-0.7.18.1/duplicity/backends/b2backend.py --- old/duplicity-0.7.18/duplicity/backends/b2backend.py 2018-08-11 17:50:35.000000000 +0200 +++ new/duplicity-0.7.18.1/duplicity/backends/b2backend.py 2018-08-23 22:18:11.000000000 +0200 @@ -24,7 +24,6 @@ import os import hashlib -from urllib import quote_plus import duplicity.backend from duplicity.errors import BackendException, FatalBackendException @@ -109,7 +108,7 @@ Download remote_filename to local_path """ log.Log("Get: %s -> %s" % (self.path + remote_filename, local_path.name), log.INFO) - self.bucket.download_file_by_name(quote_plus(self.path + remote_filename), + self.bucket.download_file_by_name(self.path + remote_filename, b2.download_dest.DownloadDestLocalFile(local_path.name)) def _put(self, source_path, remote_filename): @@ -117,7 +116,7 @@ Copy source_path to remote_filename """ log.Log("Put: %s -> %s" % (source_path.name, self.path + remote_filename), log.INFO) - self.bucket.upload_local_file(source_path.name, quote_plus(self.path + remote_filename), + self.bucket.upload_local_file(source_path.name, self.path + remote_filename, content_type='application/pgp-encrypted', progress_listener=progress_listener_factory()) @@ -133,7 +132,7 @@ Delete filename from remote server """ log.Log("Delete: %s" % self.path + filename, log.INFO) - file_version_info = self.file_info(quote_plus(self.path + filename)) + file_version_info = self.file_info(self.path + filename) self.bucket.delete_file_version(file_version_info.id_, file_version_info.file_name) def _query(self, filename): @@ -141,7 +140,7 @@ Get size info of filename """ log.Log("Query: %s" % self.path + filename, log.INFO) - file_version_info = self.file_info(quote_plus(self.path + filename)) + file_version_info = self.file_info(self.path + filename) return {'size': file_version_info.size if file_version_info is not None and file_version_info.size is not None else -1} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/duplicity-0.7.18/duplicity/globals.py new/duplicity-0.7.18.1/duplicity/globals.py --- old/duplicity-0.7.18/duplicity/globals.py 2018-08-21 22:16:03.000000000 +0200 +++ new/duplicity-0.7.18.1/duplicity/globals.py 2018-08-27 16:26:05.000000000 +0200 @@ -27,7 +27,7 @@ # The current version of duplicity -version = "0.7.18" +version = "0.7.18.1" # Prefix for all files (appended before type-specific prefixes) file_prefix = "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/duplicity-0.7.18/po/duplicity.pot new/duplicity-0.7.18.1/po/duplicity.pot --- old/duplicity-0.7.18/po/duplicity.pot 2018-08-21 17:58:07.000000000 +0200 +++ new/duplicity-0.7.18.1/po/duplicity.pot 2018-08-21 22:16:02.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: Kenneth Loafman <kenn...@loafman.com>\n" -"POT-Creation-Date: 2018-08-21 10:58-0500\n" +"POT-Creation-Date: 2018-08-21 15:16-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <l...@li.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/duplicity-0.7.18/setup.py new/duplicity-0.7.18.1/setup.py --- old/duplicity-0.7.18/setup.py 2018-08-21 22:16:03.000000000 +0200 +++ new/duplicity-0.7.18.1/setup.py 2018-08-27 16:26:05.000000000 +0200 @@ -28,7 +28,7 @@ from setuptools.command.sdist import sdist from distutils.command.build_scripts import build_scripts -version_string = "0.7.18" +version_string = "0.7.18.1" if sys.version_info[:2] < (2, 6) or sys.version_info[:2] > (2, 7): print("Sorry, duplicity requires version 2.6 or 2.7 of python.") ++++++ duplicity-remove_shebang.patch ++++++ --- /var/tmp/diff_new_pack.45Gtt7/_old 2018-08-29 12:27:13.091661796 +0200 +++ /var/tmp/diff_new_pack.45Gtt7/_new 2018-08-29 12:27:13.091661796 +0200 @@ -1,27 +1,27 @@ -diff -urEbwB duplicity-0.7.18/bin/duplicity duplicity-0.7.18.new/bin/duplicity ---- duplicity-0.7.18/bin/duplicity 2018-08-21 22:16:03.000000000 +0200 -+++ duplicity-0.7.18.new/bin/duplicity 2018-08-23 12:49:07.655467794 +0200 +diff -urEbwB duplicity-0.7.18.1/bin/duplicity duplicity-0.7.18.1.new/bin/duplicity +--- duplicity-0.7.18.1/bin/duplicity 2018-08-27 16:26:05.000000000 +0200 ++++ duplicity-0.7.18.1.new/bin/duplicity 2018-08-28 13:37:58.679257849 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 -+#!/usr/bin/python ++#!/usr/bin/python # -*- Mode:Python; indent-tabs-mode:nil; tab-width:4 -*- # # duplicity -- Encrypted bandwidth efficient backup -diff -urEbwB duplicity-0.7.18/bin/rdiffdir duplicity-0.7.18.new/bin/rdiffdir ---- duplicity-0.7.18/bin/rdiffdir 2018-08-21 22:16:03.000000000 +0200 -+++ duplicity-0.7.18.new/bin/rdiffdir 2018-08-23 12:49:22.655540899 +0200 +diff -urEbwB duplicity-0.7.18.1/bin/rdiffdir duplicity-0.7.18.1.new/bin/rdiffdir +--- duplicity-0.7.18.1/bin/rdiffdir 2018-08-27 16:26:05.000000000 +0200 ++++ duplicity-0.7.18.1.new/bin/rdiffdir 2018-08-28 13:37:45.455198928 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 -+#!/usr/bin/python ++#!/usr/bin/python # rdiffdir -- Extend rdiff functionality to directories - # Version 0.7.18 released August 21, 2018 + # Version 0.7.18.1 released August 27, 2018 # -diff -urEbwB duplicity-0.7.18/duplicity/compilec.py duplicity-0.7.18.new/duplicity/compilec.py ---- duplicity-0.7.18/duplicity/compilec.py 2017-08-06 18:25:09.000000000 +0200 -+++ duplicity-0.7.18.new/duplicity/compilec.py 2018-08-23 12:50:17.731809338 +0200 +diff -urEbwB duplicity-0.7.18.1/duplicity/compilec.py duplicity-0.7.18.1.new/duplicity/compilec.py +--- duplicity-0.7.18.1/duplicity/compilec.py 2017-08-06 18:25:09.000000000 +0200 ++++ duplicity-0.7.18.1.new/duplicity/compilec.py 2018-08-28 13:38:22.435363690 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 -+#!/usr/bin/python ++#!/usr/bin/python # -*- Mode:Python; indent-tabs-mode:nil; tab-width:4 -*- # # Copyright 2002 Ben Escoto <b...@emerose.org>