Hello community, here is the log from the commit of package deluge for openSUSE:Factory checked in at 2019-06-19 21:06:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deluge (Old) and /work/SRC/openSUSE:Factory/.deluge.new.4811 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deluge" Wed Jun 19 21:06:27 2019 rev:10 rq:708880 version:2.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/deluge/deluge.changes 2018-07-09 13:29:29.398714919 +0200 +++ /work/SRC/openSUSE:Factory/.deluge.new.4811/deluge.changes 2019-06-19 21:08:48.534533362 +0200 @@ -1,0 +2,8 @@ +Sun Jun 9 14:43:36 UTC 2019 - Alexei Sorokin <[email protected]> + +- Update to version 2.0.2: + * See /usr/share/doc/packages/deluge/CHANGELOG.md +- Rebase deluge-suse-geoip-location.patch, + deluge-update_7z_binary.patch. + +------------------------------------------------------------------- Old: ---- deluge-1.3.15-fix-preferences.patch deluge-1.3.15.tar.xz New: ---- deluge-2.0.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deluge.spec ++++++ --- /var/tmp/diff_new_pack.yiJxEy/_old 2019-06-19 21:08:50.058534758 +0200 +++ /var/tmp/diff_new_pack.yiJxEy/_new 2019-06-19 21:08:50.058534758 +0200 @@ -1,7 +1,7 @@ # # spec file for package deluge # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,74 +12,97 @@ # 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/ # +%define _version 2.0 Name: deluge -Version: 1.3.15 +Version: 2.0.2 Release: 0 Summary: BitTorrent Client License: SUSE-GPL-3.0-with-openssl-exception Group: Productivity/Networking/File-Sharing -Url: http://deluge-torrent.org/ -Source: http://download.deluge-torrent.org/source/%{name}-%{version}.tar.xz +URL: https://deluge-torrent.org/ +Source: http://download.deluge-torrent.org/source/%{_version}/%{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE deluge-suse-geoip-location.patch -- Point to the right GeoIP.dat location. Patch0: %{name}-suse-geoip-location.patch # PATCH-FIX-UPSTREAM deluge-update_7z_binary.patch Patch1: %{name}-update_7z_binary.patch -# PATCH-FIX-UPSTREAM deluge-1.3.15-fix-preferences.patch -Patch2: %{name}-1.3.15-fix-preferences.patch BuildRequires: fdupes BuildRequires: gettext +BuildRequires: gobject-introspection-devel BuildRequires: hicolor-icon-theme BuildRequires: intltool -BuildRequires: python-devel -BuildRequires: python-setuptools +BuildRequires: python3-Twisted >= 17.1 +BuildRequires: python3-devel +BuildRequires: python3-libtorrent-rasterbar >= 1.1.1 +BuildRequires: python3-setuptools +BuildRequires: python3-wheel BuildRequires: update-desktop-files -Requires: python-Mako -Requires: python-Twisted >= 8.1 -Requires: python-chardet -Requires: python-gtk >= 2.12 -Requires: python-libtorrent-rasterbar >= 0.14 -Requires: python-pyOpenSSL -Requires: python-setuptools -Requires: python-xdg +Requires: python3-Mako +Requires: python3-Twisted >= 17.1 +Requires: python3-gobject +Requires: python3-gobject-Gdk +Requires: python3-gobject-cairo +Requires: python3-libtorrent-rasterbar >= 1.1.1 +Requires: python3-pyOpenSSL +Requires: python3-rencode +Requires: python3-setuptools +Requires: python3-six +Requires: python3-xdg +Requires: python3-zope.interface Requires: xdg-utils Recommends: %{name}-lang -Recommends: python-GeoIP -Recommends: python-notify -Recommends: python-pygame -Recommends: python-service_identity -Recommends: python-setproctitle +Recommends: python3-GeoIP +Recommends: python3-Pillow +Recommends: python3-chardet +Recommends: python3-dbus-python +Recommends: python3-distro +Recommends: python3-notify +Recommends: python3-pygame +Recommends: python3-service_identity +Recommends: python3-setproctitle BuildArch: noarch +%if %{?suse_version} > 1510 +BuildRequires: python3-slimit +%endif %description Deluge is a Free Software, cross-platform BitTorrent client on -Python and Gtk2 with multiple user interfaces in client/server +Python and Gtk3 with multiple user interfaces in client/server model. %lang_package %prep -%setup -q -%patch0 -p1 -%patch1 -%patch2 -p1 +%autosetup -p1 %build -python2 setup.py build +python3 setup.py build %install -python2 setup.py install \ +python3 setup.py install \ --root=%{buildroot} --prefix=%{_prefix} -mv -f %{buildroot}%{python_sitelib}/%{name}/i18n/ %{buildroot}%{_datadir}/locale/ -ln -s %{_datadir}/locale %{buildroot}%{python_sitelib}/%{name}/i18n +%fdupes %{buildroot}%{python3_sitelib}/ -%fdupes %{buildroot}%{python_sitelib}/ +mv %{buildroot}%{python3_sitelib}/%{name}/i18n %{buildroot}%{_datadir}/locale %find_lang %{name} +pushd %{buildroot}%{_datadir}/locale/ +mkdir %{buildroot}%{python3_sitelib}/%{name}/i18n/ +ls | while read -r f; do + if ( echo "$f" | grep -q '\.py$' ); then + mv -f "$f" %{buildroot}%{python3_sitelib}/%{name}/i18n/ + else + ln -s "%{_datadir}/locale/$f" \ + "%{buildroot}%{python3_sitelib}/%{name}/i18n/$f" + fi +done +popd + +%if %{?suse_version} < 1500 %post %desktop_database_post %icon_theme_cache_post @@ -87,19 +110,21 @@ %postun %desktop_database_postun %icon_theme_cache_postun +%endif %files -%defattr(-,root,root) -%doc AUTHORS ChangeLog LICENSE README +%license LICENSE +%doc AUTHORS CHANGELOG.md README.md %{_bindir}/%{name}* -%{python_sitelib}/%{name}/ -%{python_sitelib}/%{name}-* +%{python3_sitelib}/%{name}/ +%{python3_sitelib}/%{name}-* %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.* +%{_datadir}/icons/hicolor/*/apps/%{name}-panel.* %{_datadir}/pixmaps/%{name}.* +%{_datadir}/appdata/%{name}.appdata.xml %{_mandir}/man1/%{name}*.1%{?ext_man} %files lang -f %{name}.lang -%defattr(-,root,root) %changelog ++++++ deluge-1.3.15.tar.xz -> deluge-2.0.2.tar.xz ++++++ ++++ 686469 lines of diff (skipped) ++++++ deluge-suse-geoip-location.patch ++++++ --- /var/tmp/diff_new_pack.yiJxEy/_old 2019-06-19 21:08:52.594537084 +0200 +++ /var/tmp/diff_new_pack.yiJxEy/_new 2019-06-19 21:08:52.594537084 +0200 @@ -1,11 +1,11 @@ --- a/deluge/core/preferencesmanager.py +++ b/deluge/core/preferencesmanager.py -@@ -138,7 +138,7 @@ DEFAULT_PREFS = { - "random_outgoing_ports": True, - "peer_tos": "0x00", - "rate_limit_ip_overhead": True, -- "geoip_db_location": "/usr/share/GeoIP/GeoIP.dat", -+ "geoip_db_location": "/var/lib/GeoIP/GeoIP.dat", - "cache_size": 512, - "cache_expiry": 60 - } +@@ -121,7 +121,7 @@ DEFAULT_PREFS = { + }, + 'peer_tos': '0x00', + 'rate_limit_ip_overhead': True, +- 'geoip_db_location': '/usr/share/GeoIP/GeoIP.dat', ++ 'geoip_db_location': '/var/lib/GeoIP/GeoIP.dat', + 'cache_size': 512, + 'cache_expiry': 60, + 'auto_manage_prefer_seeds': False, ++++++ deluge-update_7z_binary.patch ++++++ --- /var/tmp/diff_new_pack.yiJxEy/_old 2019-06-19 21:08:52.598537087 +0200 +++ /var/tmp/diff_new_pack.yiJxEy/_new 2019-06-19 21:08:52.602537092 +0200 @@ -1,20 +1,20 @@ ---- deluge/plugins/extractor/extractor/core.py.orig 2013-08-18 21:12:21.698045802 +0300 -+++ deluge/plugins/extractor/extractor/core.py 2013-08-18 21:12:39.143827700 +0300 -@@ -76,7 +76,7 @@ +--- a/deluge/plugins/Extractor/deluge_extractor/core.py ++++ b/deluge/plugins/Extractor/deluge_extractor/core.py +@@ -64,7 +64,7 @@ if windows_check(): EXTRACT_COMMANDS = dict.fromkeys(exts_7z, [win_7z_exe, switch_7z]) break else: -- required_cmds=["unrar", "unzip", "tar", "unxz", "unlzma", "7zr", "bunzip2"] -+ required_cmds=["unrar", "unzip", "tar", "unxz", "unlzma", "7z", "bunzip2"] - ## Possible future suport: +- required_cmds = ['unrar', 'unzip', 'tar', 'unxz', 'unlzma', '7zr', 'bunzip2'] ++ required_cmds = ['unrar', 'unzip', 'tar', 'unxz', 'unlzma', '7z', 'bunzip2'] + # Possible future suport: # gunzip: gz (cmd will delete original archive) - ## the following do not extract to dest dir -@@ -92,7 +92,7 @@ - ".tar.bz2": ["tar", "-xjf"], ".tbz": ["tar", "-xjf"], - ".tar.lzma": ["tar", "--lzma -xf"], ".tlz": ["tar", "--lzma -xf"], - ".tar.xz": ["tar", "--xz -xf"], ".txz": ["tar", "--xz -xf"], -- ".7z": ["7zr", "x"], -+ ".7z": ["7z", "x"], + # the following do not extract to dest dir +@@ -84,7 +84,7 @@ else: + '.tlz': ['tar', '--lzma -xf'], + '.tar.xz': ['tar', '--xz -xf'], + '.txz': ['tar', '--xz -xf'], +- '.7z': ['7zr', 'x'], ++ '.7z': ['7z', 'x'], } # Test command exists and if not, remove. - for cmd in required_cmds: + for command in required_cmds:
