Hello community, here is the log from the commit of package gajim for openSUSE:Factory checked in at 2018-03-22 12:02:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gajim (Old) and /work/SRC/openSUSE:Factory/.gajim.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gajim" Thu Mar 22 12:02:39 2018 rev:17 rq:588844 version:1.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/gajim/gajim.changes 2017-12-15 14:06:35.425126107 +0100 +++ /work/SRC/openSUSE:Factory/.gajim.new/gajim.changes 2018-03-22 12:08:35.862188202 +0100 @@ -1,0 +2,36 @@ +Mon Mar 17 19:32:02 UTC 2018 - [email protected] + +- Update to version 1.0.0: + * Ported to GTK+3 / Python3. + * Integrate HTTPUpload. + * Add Navigation buttons in History Window. + * Improvements for HiDPI Screens. + * Depend on the python keyring package for password storage. + * Lots of refactoring. + * New Emoji support. + * New Chat Window design. + * New StartChat Window (Ctrl+N). + * New ServerInfo Window. + * AccountWindow Redesign. + * Move some encryption code out into Plugins (see PGP Plugin, + Esessions Plugin). + * Add mam:1 and mam:2 support (mam:0 was removed). + * Add MAM for MUCs support. + * Add support for showing XEP-0084 Avatars. + * Add support for geo: URIs. + * Add xmpp URI handling directly in Gajim. + * Remove Gajim-Remote. + * Remove XEP-0012 (Last Activity). + * Remove XEP-0136 (Message Archiving). + * Add XEP-0156 (Discovering Alternative XMPP Connection Methods). + * Add XEP-0319 (Last User Interaction in Presence). + * Add XEP-0368 (SRV records for XMPP over TLS). + * Add XEP-0380 (Explicit Message Encryption). + * Add Jingle FT:5 support. + * Lots of other small bugfixes. +- Rebase gajim-do_not_ship_certificate.patch.in. +- Update requirements and recommendations: + also require things that are not strictly required if they are + harmless and definitely available. + +------------------------------------------------------------------- Old: ---- gajim-0.16.9.tar.bz2 New: ---- gajim-1.0.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gajim.spec ++++++ --- /var/tmp/diff_new_pack.kMih9d/_old 2018-03-22 12:08:36.862152359 +0100 +++ /var/tmp/diff_new_pack.kMih9d/_new 2018-03-22 12:08:36.862152359 +0100 @@ -1,7 +1,7 @@ # # spec file for package gajim # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -16,54 +16,61 @@ # -%define _version 0.16 +%define _version 1.0 Name: gajim -Version: 0.16.9 +Version: 1.0.0 Release: 0 -Summary: XMPP client written in Python and Gtk2 -License: GPL-3.0 +Summary: XMPP client written in Python and Gtk3 +License: GPL-3.0-only Group: Productivity/Networking/Talk/Clients Url: https://gajim.org/ Source: https://gajim.org/downloads/%{_version}/%{name}-%{version}.tar.bz2 # PATCH-FIX-OPENSUSE gajim-do_not_ship_certificate.patch.in [email protected] -- do not package PEM certificate Source1: gajim-do_not_ship_certificate.patch.in -BuildRequires: autoconf -BuildRequires: automake BuildRequires: fdupes +BuildRequires: gobject-introspection-devel BuildRequires: hicolor-icon-theme -BuildRequires: intltool -BuildRequires: libtool BuildRequires: p11-kit-devel BuildRequires: pkgconfig -BuildRequires: python-devel +BuildRequires: python3 +BuildRequires: python3-nbxmpp >= 0.6.4 +BuildRequires: python3-setuptools BuildRequires: update-desktop-files -BuildRequires: pkgconfig(glib-2.0) Requires: ca-certificates-mozilla -Requires: dbus-1-python -Requires: python-gnupg -Requires: python-gtk >= 2.2 -Requires: python-nbxmpp >= 0.6.1 -Requires: python-pyOpenSSL >= 0.12 -Requires: python-pyasn1 -Requires: python-xml +Requires: python3-docutils +Requires: python3-nbxmpp >= 0.6.4 +Requires: python3-pyOpenSSL >= 0.12 +Requires: python3-pyasn1 +Requires: python3-pycurl +Requires: python3-xml Recommends: %{name}-lang -# nslookup for SRV support. -Recommends: bind-utils -Recommends: gtkspell +# Correct JID parsing. +Recommends: python3-precis-i18n # End-to-end encryption. -Recommends: python-pycrypto +Recommends: python3-pycrypto # zeroconf support. Suggests: dbus-1-glib -# KWallet support. -Suggests: kwalletcli +Suggests: python3-avahi # Idle module. Suggests: libXss1 -Suggests: python-avahi -# Audio/Video Chat -Suggests: python-farstream-0_1 -# GNOME Keyring support. -Suggests: python-gnomekeyring BuildArch: noarch +%if 0%{?suse_version} >= 1500 +Requires: python3-Pillow +Requires: python3-dbus-python +Requires: python3-idna +Requires: python3-keyring +# GPG encryption. +Recommends: python3-python-gnupg +%else +Requires: dbus-1-python3 +# WebP avatars. +Recommends: python3-Pillow +# GPG encryption. +Recommends: python3-gnupg +Recommends: python3-idna +# Password storage. +Recommends: python3-keyring +%endif %description Gajim is a Jabber/XMPP client. It works with MATE and GNOME, but does @@ -92,35 +99,28 @@ %prep %setup -q -sed -i '/^_Keywords/d' data/%{name}.desktop.in.in +sed -i '/^Keywords/d' data/org.gajim.Gajim.desktop.in # Do not package PEM certificate -sed 's,@TRUSTDIR_STATIC@,%{trustdir_static},' %{S:1} | patch -F0 -p1 --no-backup-if-mismatch +sed 's|@TRUSTDIR_STATIC@|%{trustdir_static}|' %{SOURCE1} | patch -F0 -p1 --no-backup-if-mismatch +rm gajim/data/plugins/plugin_installer/*.pem %build -export PYTHON=python2 -autoreconf -fi -%configure \ - --prefix=%{_prefix} \ - --enable-site-packages -make %{?_smp_mflags} V=1 +python3 setup.py build %install -%make_install -dirname $(find %{buildroot}%{python_sitelib} -name '*.py') | sort -u | while read dir; do - pushd "$dir" - # Fix python-bytecode-inconsistent-mtime (hacky). - rm -f *.pyc *.pyo - touch -c *.py - %py_compile . - popd -done +python3 setup.py install \ + --root=%{buildroot} --prefix=%{_prefix} + +mkdir -p %{buildroot}%{_datadir}/ +mv %{buildroot}{%{python3_sitelib}/%{name}/data,%{_datadir}/%{name}}/ +ln -s %{_datadir}/%{name} %{buildroot}%{python3_sitelib}/%{name}/data -%suse_update_desktop_file -r %{name} Network InstantMessaging +%suse_update_desktop_file -r org.gajim.Gajim Network InstantMessaging %fdupes %{buildroot}%{_prefix}/ %find_lang %{name} -%if 0%{?suse_version} <= 1320 +%if 0%{?suse_version} < 1500 %post %desktop_database_post %icon_theme_cache_post @@ -131,16 +131,21 @@ %endif %files -%defattr(-,root,root) -%doc AUTHORS ChangeLog COPYING README THANKS* +%if 0%{?suse_version} >= 1500 +%license COPYING +%else +%doc COPYING +%endif %{_bindir}/%{name}* %{_datadir}/%{name}/ -%{python_sitelib}/%{name}/ -%{_datadir}/applications/%{name}*.desktop -%{_datadir}/icons/hicolor/*/*/* +%{python3_sitelib}/%{name}/ +%{python3_sitelib}/%{name}-* +%{_datadir}/applications/*%{name}*.desktop +%{_datadir}/icons/hicolor/*/apps/*%{name}*.* +%dir %{_datadir}/metainfo/ +%{_datadir}/metainfo/*%{name}*.appdata.xml %{_mandir}/man?/%{name}*%{?ext_man} %files lang -f %{name}.lang -%defattr(-,root,root) %changelog ++++++ gajim-0.16.9.tar.bz2 -> gajim-1.0.0.tar.bz2 ++++++ ++++ 1046660 lines of diff (skipped) ++++++ gajim-do_not_ship_certificate.patch.in ++++++ --- /var/tmp/diff_new_pack.kMih9d/_old 2018-03-22 12:08:43.909899731 +0100 +++ /var/tmp/diff_new_pack.kMih9d/_new 2018-03-22 12:08:43.913899587 +0100 @@ -1,22 +1,11 @@ ---- gajim-0.16.8/plugins/plugin_installer/plugin_installer.py.orig 2017-06-04 13:59:59.000000000 +0200 -+++ gajim-0.16.8/plugins/plugin_installer/plugin_installer.py 2017-07-04 19:15:19.058374436 +0200 -@@ -146,7 +146,7 @@ - if secure is True and hasattr(ssl, 'create_default_context'): - if 'cafile' in inspect.getargspec(ssl.create_default_context).args: - ssl_args['context'] = ssl.create_default_context( -- cafile=self.local_file_path('DST_Root_CA_X3.pem')) -+ cafile='@TRUSTDIR_STATIC@/DST_Root_CA_X3.pem') - else: - log.warning('Your python version does not ' - 'support HTTPS CA pinning') ---- gajim-0.16.8/plugins/Makefile.am.orig 2017-06-04 00:39:47.000000000 +0200 -+++ gajim-0.16.8/plugins/Makefile.am 2017-07-04 20:00:48.764903471 +0200 -@@ -7,7 +7,7 @@ - - pluginsdirs = ${sort ${dir ${wildcard ${srcdir}/*/ ${srcdir}/*/*/}}} - --pluginsfiles = $(wildcard ${p}/*.py ${p}/manifest.ini ${p}/*.ui ${p}/*.png ${p}/*.pem) -+pluginsfiles = $(wildcard ${p}/*.py ${p}/manifest.ini ${p}/*.ui ${p}/*.png) - - nobase_gajimplugins_DATA = $(foreach p, ${pluginsdirs}, $(pluginsfiles)) - +--- a/gajim/data/plugins/plugin_installer/plugin_installer.py ++++ b/gajim/data/plugins/plugin_installer/plugin_installer.py +@@ -467,7 +467,7 @@ class DownloadAsync(threading.Thread): + ssl_args = {} + if self.secure: + ssl_args['context'] = ssl.create_default_context( +- cafile=self.plugin.local_file_path('DST_Root_CA_X3.pem')) ++ cafile='@TRUSTDIR_STATIC@/DST_Root_CA_X3.pem') + else: + ssl_args['context'] = ssl.create_default_context() + ssl_args['context'].check_hostname = False
